diff --git a/app/build.gradle b/app/build.gradle index 53f2f0b7..c9387a8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { applicationId 'com.stevenschoen.putionew' minSdkVersion 21 targetSdkVersion 27 - versionCode 128 - versionName '4.2.1' + versionCode 129 + versionName '4.3.0' multiDexEnabled true kapt { @@ -65,13 +65,14 @@ dependencies { implementation "com.android.support:cardview-v7:$supportLibVersion" implementation "com.android.support:mediarouter-v7:$supportLibVersion" implementation 'com.android.support.constraint:constraint-layout:1.1.0' - implementation 'com.google.firebase:firebase-core:11.8.0' - implementation 'com.google.android.gms:play-services-cast-framework:11.8.0' - implementation 'com.crashlytics.sdk.android:crashlytics:2.9.2' + def playServicesVersion = "11.8.0" + implementation "com.google.firebase:firebase-core:$playServicesVersion" + implementation "com.google.android.gms:play-services-cast-framework:$playServicesVersion" + implementation 'com.crashlytics.sdk.android:crashlytics:2.9.3' implementation 'com.jakewharton.timber:timber:4.7.0' implementation 'commons-io:commons-io:2.6' implementation 'net.danlew:android.joda:2.9.9.4' - implementation 'io.reactivex.rxjava2:rxjava:2.1.10' + implementation 'io.reactivex.rxjava2:rxjava:2.1.14' def rxLifecycleVersion = "2.2.1" implementation "com.trello.rxlifecycle2:rxlifecycle:$rxLifecycleVersion" implementation "com.trello.rxlifecycle2:rxlifecycle-components:$rxLifecycleVersion" @@ -90,7 +91,7 @@ dependencies { implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" - implementation 'com.google.code.gson:gson:2.8.2' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.aurelhubert:ahbottomnavigation:2.2.0' @@ -98,7 +99,7 @@ dependencies { implementation "nz.bradcampbell:paperparcel:$paperParcelVersion" implementation "nz.bradcampbell:paperparcel-kotlin:$paperParcelVersion" kapt "nz.bradcampbell:paperparcel-compiler:$paperParcelVersion" - implementation 'com.google.android.exoplayer:exoplayer:2.8.0' + implementation 'com.google.android.exoplayer:exoplayer:2.8.1' def roomVersion = "1.1.0" implementation "android.arch.persistence.room:runtime:$roomVersion" kapt "android.arch.persistence.room:compiler:$roomVersion" diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt index c287a5a8..582dfbb2 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt @@ -129,6 +129,6 @@ class FileSelectionFragment : RxFragment() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - outState.putInt(STATE_AMOUNT_SELECTED, amountSelected.value) + outState.putInt(STATE_AMOUNT_SELECTED, amountSelected.value!!) } } diff --git a/app/src/main/java/com/stevenschoen/putionew/transfers/add/DestinationPickerFragment.kt b/app/src/main/java/com/stevenschoen/putionew/transfers/add/DestinationPickerFragment.kt index debac115..e892cafa 100644 --- a/app/src/main/java/com/stevenschoen/putionew/transfers/add/DestinationPickerFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/transfers/add/DestinationPickerFragment.kt @@ -20,7 +20,7 @@ class DestinationPickerFragment : RxFragment() { private lateinit var destinationSubject: BehaviorSubject val destination: PutioFile - get() = destinationSubject.value + get() = destinationSubject.value!! override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.kt b/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.kt index 2c411088..3e5f7a6a 100644 --- a/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.kt +++ b/app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.kt @@ -74,7 +74,7 @@ class TvActivity : FragmentActivity() { super.onAttachFragment(fragment) if (fragment is TvFolderFragment) { fragment.onFolderSelected = { folder -> - folders.onNext(folders.value.plus(folder)) + folders.onNext(folders.value!! + folder) } } } @@ -85,7 +85,7 @@ class TvActivity : FragmentActivity() { if (displayedFolders.size > 1) { val lastFolderFragment = supportFragmentManager.findFragmentByTag(makeFolderFragTag(displayedFolders.last())) if (lastFolderFragment != null && lastFolderFragment is TvFolderFragment) { - folders.onNext(folders.value.dropLast(1)) + folders.onNext(folders.value!!.dropLast(1)) } } else { super.onBackPressed()