From e67d608bb803b5d2950377f41c9de559480001c0 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Fri, 20 Dec 2019 21:31:41 +0100 Subject: [PATCH] upgrade dependencies (#1596) --- app/build.gradle | 22 +++++++++++----------- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0c4ab184e..0386f0df3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -93,39 +93,39 @@ project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { } ext.lifecycleVersion = "2.1.0" -ext.roomVersion = '2.2.1' +ext.roomVersion = '2.2.3' ext.retrofitVersion = '2.6.0' ext.okhttpVersion = '4.2.2' ext.glideVersion = '4.10.0' -ext.daggerVersion = '2.25.2' +ext.daggerVersion = '2.25.3' // if libraries are changed here, they should also be changed in LicenseActivity dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "androidx.core:core-ktx:1.2.0-beta01" + implementation "androidx.core:core-ktx:1.2.0-rc01" implementation "androidx.appcompat:appcompat:1.1.0" implementation "androidx.fragment:fragment-ktx:1.1.0" implementation "androidx.browser:browser:1.2.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - implementation "androidx.recyclerview:recyclerview:1.0.0" - implementation "androidx.exifinterface:exifinterface:1.0.0" + implementation "androidx.recyclerview:recyclerview:1.1.0" + implementation "androidx.exifinterface:exifinterface:1.1.0" implementation "androidx.cardview:cardview:1.0.0" implementation "androidx.preference:preference:1.1.0" - implementation "androidx.sharetarget:sharetarget:1.0.0-beta01" + implementation "androidx.sharetarget:sharetarget:1.0.0-rc01" implementation "androidx.emoji:emoji:1.0.0" implementation "androidx.emoji:emoji-appcompat:1.0.0" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion" implementation "androidx.lifecycle:lifecycle-reactivestreams:$lifecycleVersion" implementation "androidx.constraintlayout:constraintlayout:1.1.3" - implementation "androidx.paging:paging-runtime-ktx:2.1.0" - implementation "androidx.viewpager2:viewpager2:1.0.0-rc01" + implementation "androidx.paging:paging-runtime-ktx:2.1.1" + implementation "androidx.viewpager2:viewpager2:1.0.0" implementation "androidx.room:room-runtime:$roomVersion" implementation "androidx.room:room-rxjava2:$roomVersion" kapt "androidx.room:room-compiler:$roomVersion" - implementation "com.google.android.material:material:1.1.0-beta01" + implementation "com.google.android.material:material:1.1.0-rc01" implementation "com.squareup.retrofit2:retrofit:$retrofitVersion" implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion" @@ -139,7 +139,7 @@ dependencies { implementation "com.github.bumptech.glide:glide:$glideVersion" implementation "com.github.bumptech.glide:okhttp3-integration:$glideVersion" - implementation "io.reactivex.rxjava2:rxjava:2.2.13" + implementation "io.reactivex.rxjava2:rxjava:2.2.16" implementation "io.reactivex.rxjava2:rxandroid:2.1.1" implementation "io.reactivex.rxjava2:rxkotlin:2.4.0" @@ -172,7 +172,7 @@ dependencies { testImplementation "androidx.test.ext:junit:1.1.1" testImplementation "org.robolectric:robolectric:4.3.1" - testImplementation "org.mockito:mockito-inline:3.1.0" + testImplementation "org.mockito:mockito-inline:3.2.4" testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" androidTestImplementation("androidx.test.espresso:espresso-core:3.1.1", { diff --git a/build.gradle b/build.gradle index 265660c6f..9d9a324e0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.3.61' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta07' - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta08' + classpath 'com.android.tools.build:gradle:3.5.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ee69dd68d..1ba7206f8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists