Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@DSteve595
DSteve595 committed Jan 7, 2019
1 parent 52a6330 commit 6a8a1bc
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 33 deletions.
25 changes: 12 additions & 13 deletions app/build.gradle
View file
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/account/AccountFragment.kt
View file
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/stevenschoen/putionew/files/FileDetailsFragment.kt
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/files/FileListFragment.kt
View file
Expand Up @@ -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.*
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/files/FileSelectionFragment.kt
View file
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/files/FilesFragment.kt
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stevenschoen/putionew/files/FolderFragment.kt
View file
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stevenschoen/putionew/files/RenameFragment.kt
View file
Expand Up @@ -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() {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/stevenschoen/putionew/files/SearchFragment.kt
View file
Expand Up @@ -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<FileListFragment.Callbacks>() {

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/transfers/TransfersFragment.kt
View file
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/stevenschoen/putionew/transfers/add/DestinationPickerFragment.kt
View file
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Expand Up @@ -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 {
Expand Down

0 comments on commit 6a8a1bc

Please sign in to comment.