Skip to content

Commit

Permalink
Upgrade libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
DSteve595 committed May 28, 2018
1 parent 19646c8 commit d4ddbe9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
17 changes: 9 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand All @@ -90,15 +91,15 @@ 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'
def paperParcelVersion = "2.0.6"
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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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!!)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class DestinationPickerFragment : RxFragment() {
private lateinit var destinationSubject: BehaviorSubject<PutioFile>

val destination: PutioFile
get() = destinationSubject.value
get() = destinationSubject.value!!

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/tv/TvActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand All @@ -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()
Expand Down

0 comments on commit d4ddbe9

Please sign in to comment.