From 6a8a1bca3f6cd006b61d796c671c09d080457575 Mon Sep 17 00:00:00 2001 From: Steven Schoen Date: Mon, 7 Jan 2019 14:55:23 -0800 Subject: [PATCH] Upgrade dependencies --- app/build.gradle | 25 +++++++++---------- .../putionew/account/AccountFragment.kt | 4 +-- .../putionew/files/FileDetailsFragment.kt | 6 ++--- .../putionew/files/FileListFragment.kt | 4 +-- .../putionew/files/FileSelectionFragment.kt | 4 +-- .../putionew/files/FilesFragment.kt | 4 +-- .../putionew/files/FolderFragment.kt | 2 +- .../putionew/files/RenameFragment.kt | 2 +- .../putionew/files/SearchFragment.kt | 2 +- .../putionew/transfers/TransfersFragment.kt | 4 +-- .../add/DestinationPickerFragment.kt | 4 +-- build.gradle | 4 +-- 12 files changed, 32 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index eed227cf..fbf03bdd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,8 +35,8 @@ android { applicationId 'com.stevenschoen.putionew' minSdkVersion 21 targetSdkVersion 27 - versionCode 136 - versionName '4.5 beta 1' + versionCode 137 + versionName '4.5.0' multiDexEnabled true kapt { @@ -111,30 +111,29 @@ dependencies { def playServicesVersion = "16.1.2" implementation "com.google.android.gms:play-services-cast-framework:$playServicesVersion" implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' - implementation 'com.jakewharton.timber:timber:4.7.0' + implementation 'com.jakewharton.timber:timber:4.7.1' implementation 'commons-io:commons-io:2.6' - implementation 'net.danlew:android.joda:2.9.9.4' - implementation 'io.reactivex.rxjava2:rxjava:2.2.2' - def rxLifecycleVersion = "2.2.1" - implementation "com.trello.rxlifecycle2:rxlifecycle:$rxLifecycleVersion" - implementation "com.trello.rxlifecycle2:rxlifecycle-components:$rxLifecycleVersion" - implementation "com.trello.rxlifecycle2:rxlifecycle-kotlin:$rxLifecycleVersion" - def rxBindingVersion = "2.1.1" + implementation 'net.danlew:android.joda:2.10.1' + implementation 'io.reactivex.rxjava2:rxjava:2.2.5' + def rxLifecycleVersion = "3.0.0" + implementation "com.trello.rxlifecycle3:rxlifecycle-components:$rxLifecycleVersion" + implementation "com.trello.rxlifecycle3:rxlifecycle-kotlin:$rxLifecycleVersion" + implementation "com.trello.rxlifecycle3:rxlifecycle:$rxLifecycleVersion" + def rxBindingVersion = "2.2.0" implementation "com.jakewharton.rxbinding2:rxbinding:$rxBindingVersion" implementation "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxBindingVersion" implementation "com.jakewharton.rxbinding2:rxbinding-appcompat-v7:$rxBindingVersion" implementation "com.jakewharton.rxbinding2:rxbinding-design:$rxBindingVersion" implementation "com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:$rxBindingVersion" implementation "com.jakewharton.rxbinding2:rxbinding-leanback-v17:$rxBindingVersion" - def okHttpVersion = "3.10.0" + def okHttpVersion = "3.12.1" implementation "com.squareup.okhttp3:okhttp:$okHttpVersion" implementation "com.squareup.okhttp3:logging-interceptor:$okHttpVersion" - def retrofitVersion = "2.4.0" + def retrofitVersion = "2.5.0" 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.5' - implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.google.android.exoplayer:exoplayer:2.9.3' def roomVersion = '2.0.0' diff --git a/app/src/main/java/com/stevenschoen/putionew/account/AccountFragment.kt b/app/src/main/java/com/stevenschoen/putionew/account/AccountFragment.kt index d0345ee6..97583b32 100644 --- a/app/src/main/java/com/stevenschoen/putionew/account/AccountFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/account/AccountFragment.kt @@ -10,8 +10,8 @@ import androidx.core.net.toUri import com.stevenschoen.putionew.PutioUtils import com.stevenschoen.putionew.R import com.stevenschoen.putionew.putioApp -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers class AccountFragment : RxFragment() { diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt index a0f63f5f..d4b13001 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt @@ -39,9 +39,9 @@ import com.stevenschoen.putionew.analytics import com.stevenschoen.putionew.model.files.PutioFile import com.stevenschoen.putionew.model.files.PutioMp4Status import com.stevenschoen.putionew.putioApp -import com.trello.rxlifecycle2.android.FragmentEvent -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.android.FragmentEvent +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.BiFunction diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt index cacf4e10..ab3f6278 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt @@ -20,8 +20,8 @@ import com.stevenschoen.putionew.PutioUtils import com.stevenschoen.putionew.R import com.stevenschoen.putionew.model.files.PutioFile import com.stevenschoen.putionew.putioApp -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import java.util.* 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 74ae5e23..d6dfdb53 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt @@ -8,8 +8,8 @@ import android.widget.TextView import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.TooltipCompat import com.stevenschoen.putionew.R -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.subjects.BehaviorSubject diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FilesFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FilesFragment.kt index 01606428..69f4b69d 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FilesFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FilesFragment.kt @@ -17,8 +17,8 @@ import com.stevenschoen.putionew.UIUtils import com.stevenschoen.putionew.analytics import com.stevenschoen.putionew.model.files.PutioFile import com.stevenschoen.putionew.putioApp -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers import kotlinx.android.parcel.IgnoredOnParcel import kotlinx.android.parcel.Parcelize diff --git a/app/src/main/java/com/stevenschoen/putionew/files/FolderFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/FolderFragment.kt index 612cbdeb..ca41913a 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/FolderFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/FolderFragment.kt @@ -20,7 +20,7 @@ import com.stevenschoen.putionew.R import com.stevenschoen.putionew.model.ResponseOrError import com.stevenschoen.putionew.model.files.PutioFile import com.stevenschoen.putionew.putioApp -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers import retrofit2.HttpException diff --git a/app/src/main/java/com/stevenschoen/putionew/files/RenameFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/RenameFragment.kt index 89cb63f0..74580d48 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/RenameFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/RenameFragment.kt @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.stevenschoen.putionew.R import com.stevenschoen.putionew.model.files.PutioFile -import com.trello.rxlifecycle2.components.support.RxAppCompatDialogFragment +import com.trello.rxlifecycle3.components.support.RxAppCompatDialogFragment class RenameFragment : RxAppCompatDialogFragment() { diff --git a/app/src/main/java/com/stevenschoen/putionew/files/SearchFragment.kt b/app/src/main/java/com/stevenschoen/putionew/files/SearchFragment.kt index ba3b6bb1..6271cc38 100644 --- a/app/src/main/java/com/stevenschoen/putionew/files/SearchFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/files/SearchFragment.kt @@ -12,7 +12,7 @@ import com.stevenschoen.putionew.R import com.stevenschoen.putionew.model.ResponseOrError import com.stevenschoen.putionew.model.files.PutioFile import com.stevenschoen.putionew.model.responses.FilesSearchResponse -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.kotlin.bindToLifecycle class SearchFragment : FileListFragment() { diff --git a/app/src/main/java/com/stevenschoen/putionew/transfers/TransfersFragment.kt b/app/src/main/java/com/stevenschoen/putionew/transfers/TransfersFragment.kt index 442705c2..f8edab53 100644 --- a/app/src/main/java/com/stevenschoen/putionew/transfers/TransfersFragment.kt +++ b/app/src/main/java/com/stevenschoen/putionew/transfers/TransfersFragment.kt @@ -25,8 +25,8 @@ import com.stevenschoen.putionew.PutioUtils import com.stevenschoen.putionew.R import com.stevenschoen.putionew.model.ResponseOrError import com.stevenschoen.putionew.model.transfers.PutioTransfer -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable 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 979e027b..3f72c519 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 @@ -10,8 +10,8 @@ import android.widget.TextView import com.stevenschoen.putionew.R import com.stevenschoen.putionew.files.DestinationFolderActivity import com.stevenschoen.putionew.model.files.PutioFile -import com.trello.rxlifecycle2.components.support.RxFragment -import com.trello.rxlifecycle2.kotlin.bindToLifecycle +import com.trello.rxlifecycle3.components.support.RxFragment +import com.trello.rxlifecycle3.kotlin.bindToLifecycle import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.subjects.BehaviorSubject diff --git a/build.gradle b/build.gradle index 40d6d04d..925c8aa5 100644 --- a/build.gradle +++ b/build.gradle @@ -9,10 +9,10 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' - classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0' + classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.2.0' - classpath 'io.fabric.tools:gradle:1.25.4' + classpath 'io.fabric.tools:gradle:1.27.0' } } allprojects {