Skip to content

Commit

Permalink
Upgraded versions
Browse files Browse the repository at this point in the history
  • Loading branch information
gustavkarlsson committed May 3, 2019
1 parent c680800 commit 2133172
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 31 deletions.
9 changes: 7 additions & 2 deletions app/build.gradle
Expand Up @@ -25,6 +25,11 @@ android {
compileSdkVersion compilesdk_version
buildToolsVersion build_tools_version

compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}

sourceSets {
main.java.srcDirs += "src/main/kotlin"
production.java.srcDirs += "src/production/kotlin"
Expand Down Expand Up @@ -138,12 +143,12 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version"

// Google Play Services
implementation "com.google.android.gms:play-services-gcm:$google_play_services_version"
implementation "com.google.android.gms:play-services-gcm:$google_play_services_gcm_version"

// Navigation
implementation "android.arch.navigation:navigation-fragment:$navigation_version"
implementation "android.arch.navigation:navigation-ui:$navigation_version"
implementation "android.arch.navigation:navigation-ui-ktx:$ktx_navigation_ui_version"
implementation "android.arch.navigation:navigation-ui-ktx:$navigation_version"

// Rx misc
implementation "io.reactivex.rxjava2:rxandroid:$rxandroid_version"
Expand Down
Expand Up @@ -30,7 +30,7 @@ class FactorBottomSheetDialogFragment : BottomSheetDialogFragment() {
}
}

override fun onCancel(dialog: DialogInterface?) {
override fun onCancel(dialog: DialogInterface) {
onCancelListener?.invoke()
super.onCancel(dialog)
}
Expand Down
Expand Up @@ -6,7 +6,6 @@ import androidx.lifecycle.Lifecycle
import com.google.android.material.snackbar.Snackbar
import com.jakewharton.rxbinding2.support.v7.widget.itemClicks
import com.jakewharton.rxbinding2.view.visibility
import com.jakewharton.rxbinding2.widget.text
import com.uber.autodispose.LifecycleScopeProvider
import com.uber.autodispose.kotlin.autoDisposable
import kotlinx.android.synthetic.main.fragment_main.chance
Expand Down Expand Up @@ -70,12 +69,12 @@ class MainFragment : BaseFragment(R.layout.fragment_main) {
.doOnNext { Timber.d("Updating chanceLevel view: %s", it) }
.map { it.resolve(requireContext()) }
.autoDisposable(scope)
.subscribe(chance.text())
.subscribe(chance::setText)

viewModel.timeSinceUpdate
.doOnNext { Timber.d("Updating timeSinceUpdate view: %s", it) }
.autoDisposable(scope)
.subscribe(timeSinceUpdate.text())
.subscribe(timeSinceUpdate::setText)

viewModel.timeSinceUpdateVisibility
.doOnNext { Timber.d("Updating timeSinceUpdate weather: %s", it) }
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values-sv/strings_factors.xml
Expand Up @@ -21,7 +21,7 @@
<string name="factor_darkness_title_full">Utomhusmörker</string>
<string name="factor_darkness_title_compact">Mörker</string>
<string name="factor_darkness_desc">Eftersom norrsken bara syns i mörker är solens position
himmelen viktig.
himlen viktig.
Det här värdet visar hur mörkt det är ute på nuvarande plats baserat på solens position.
<u>100% mörker är perfekt</u> för att se norrsken.</string>
<u>100\% mörker är perfekt</u> för att se norrsken.</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings_factors.xml
Expand Up @@ -23,5 +23,5 @@
<string name="factor_darkness_desc">Since the aurora is only visible in the dark
the position of the sun is important.
This value shows how dark your current location is based on the sun\'s position.
<u>100% darkness is perfect</u> for aurora sightings.</string>
<u>100\% darkness is perfect</u> for aurora sightings.</string>
</resources>
Expand Up @@ -3,6 +3,7 @@ package se.gustavkarlsson.skylight.android.background.notifications
import android.app.Activity
import android.app.NotificationManager
import android.content.Context
import com.ioki.textref.TextRef
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.whenever
import org.junit.Before
Expand Down Expand Up @@ -42,13 +43,17 @@ internal class AuroraReportNotifierTest {
@Before
fun setUp() {
context = RuntimeEnvironment.application
val chance = Chance(0.5)
val chanceLevel = ChanceLevel.fromChance(chance)
mockNotificationManager = mock()
mockChanceEvaluator = mock()
mockChanceLevelFormatter = mock()
mockChanceLevelFormatter = mock {
whenever(it.format(chanceLevel)).thenReturn(TextRef("some chance"))
}
mockAuroraReport = mock()
mockAnalytics = mock()
activityClass = Activity::class.java
whenever(mockChanceEvaluator.evaluate(any())).thenReturn(Chance(0.5))
whenever(mockChanceEvaluator.evaluate(any())).thenReturn(chance)
impl = AuroraReportNotifier(
context,
mockNotificationManager,
Expand Down
34 changes: 17 additions & 17 deletions build.gradle
Expand Up @@ -5,42 +5,42 @@ buildscript {
target_sdk_version = 28
build_tools_version = "28.0.3"

kotlin_version = "1.3.0"
kotlin_version = "1.3.31"
krate_version = "1.2.0"
retrofit_version = "2.4.0"
multidex_version = "2.0.0"
google_play_services_version = "16.0.0"
android_appcompat_version = "1.0.2"
android_fragment_version = "1.0.0"
multidex_version = "2.0.1"
google_play_services_location_version = "16.0.0"
google_play_services_gcm_version = "16.1.0"
android_appcompat_version = "1.1.0-alpha04"
android_fragment_version = "1.1.0-alpha07"
android_annotation_version = "1.0.0"
android_preference_version = "1.0.0"
android_material_version = "1.1.0-alpha02"
android_material_version = "1.1.0-alpha06"
android_cardview_version = "1.0.0"
android_annotation_version = "1.0.0"
rxbinding_version = "2.1.1"
threetenabp_version = "1.1.0"
rxbinding_version = "2.2.0"
threetenabp_version = "1.2.0"
rxjava_version = "2.2.3"
rxandroid_version = "2.1.0"
rxandroid_version = "2.1.1"
rxkotlin_version = "2.2.0"
gson_version = "2.8.2"
google_services_version = "4.1.0"
firebase_version = "16.0.5"
google_services_version = "4.2.0"
firebase_version = "16.0.8"
fabric_version = "1.25.4"
crashlytics_version = "2.9.6"
crashlytics_version = "2.10.0"
arch_lifecycle_version = "2.0.0"
rxpreferences_version = "2.0.0-RC3"
rxrelay_version = "2.1.0"
android_job_version = "1.2.0"
constraint_layout_version = "2.0.0-alpha2"
constraint_layout_version = "2.0.0-alpha5"
timber_version = "4.7.1"
rxpermissions_version = "0.9.5"
reactive_location_version = "2.1"
solarpositioning_version = "0.0.9"
android_gradle_version = "3.2.1"
android_gradle_version = "3.4.0"
autodispose_version = "0.8.0"
leakcanary_version = "1.6.2"
navigation_version = "1.0.0-alpha07"
ktx_navigation_ui_version = "1.0.0-alpha07"
leakcanary_version = "1.6.3"
navigation_version = "1.0.0"
ktx_core_version = "1.0.1"
koin_version = "1.0.1"
koptional_version = "0.2.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions location/build.gradle
Expand Up @@ -25,8 +25,8 @@ dependencies {
implementation project(":core")

// Google Play Services
implementation "com.google.android.gms:play-services-gcm:$google_play_services_version"
implementation "com.google.android.gms:play-services-location:$google_play_services_version"
implementation "com.google.android.gms:play-services-gcm:$google_play_services_gcm_version"
implementation "com.google.android.gms:play-services-location:$google_play_services_location_version"

// Reactive Location
implementation "pl.charmas.android:android-reactive-location2:${reactive_location_version}@aar"
Expand Down

0 comments on commit 2133172

Please sign in to comment.