From 9d4e903c4a72bca631378ea4bc61b195df9007f8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 6 Jul 2020 15:59:49 +0200 Subject: [PATCH] Upgrade some dependencies --- CHANGES.md | 1 + build.gradle | 4 ++-- matrix-sdk-android-rx/build.gradle | 2 +- matrix-sdk-android/build.gradle | 4 +--- multipicker/build.gradle | 2 +- vector/build.gradle | 22 +++++++++++----------- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 20b3b34375..6c6ef72404 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ Build 🧱: - Fix lint false-positive about WorkManger (#1012) - Upgrade build-tools from 3.5.3 to 3.6.6 - Upgrade gradle from 5.4.1 to 5.6.4 + - Upgrade some dependencies Other changes: - diff --git a/build.gradle b/build.gradle index 5f1fa78620..edd6edcd93 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // 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.72' repositories { google() jcenter() @@ -15,7 +15,7 @@ buildscript { classpath "com.airbnb.okreplay:gradle-plugin:1.5.0" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1' - classpath 'com.google.android.gms:oss-licenses-plugin:0.9.5' + classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/matrix-sdk-android-rx/build.gradle b/matrix-sdk-android-rx/build.gradle index c67d10d810..70a05114c2 100644 --- a/matrix-sdk-android-rx/build.gradle +++ b/matrix-sdk-android-rx/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' // Paging - implementation "androidx.paging:paging-runtime-ktx:2.1.0" + implementation "androidx.paging:paging-runtime-ktx:2.1.2" // Logging implementation 'com.jakewharton.timber:timber:4.7.1' diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 422a5dac1d..71b763545c 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -51,7 +51,6 @@ android { } buildTypes { - debug { // Set to true to log privacy or sensible data, such as token buildConfigField "boolean", "LOG_PRIVATE_DATA", project.property("vector.debugPrivateData") @@ -123,7 +122,7 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" implementation "androidx.appcompat:appcompat:1.1.0" - implementation "androidx.core:core-ktx:1.1.0" + implementation "androidx.core:core-ktx:1.3.0" implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version" @@ -205,5 +204,4 @@ dependencies { androidTestImplementation 'net.lachlanmckee:timber-junit-rule:1.0.1' androidTestUtil 'androidx.test:orchestrator:1.2.0' - } diff --git a/multipicker/build.gradle b/multipicker/build.gradle index 8b08a9d3ef..8f2226e884 100644 --- a/multipicker/build.gradle +++ b/multipicker/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.2.0' + implementation 'androidx.core:core-ktx:1.3.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/vector/build.gradle b/vector/build.gradle index f966f441b2..2387a3cf4f 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -262,16 +262,16 @@ android { dependencies { def epoxy_version = '3.11.0' - def fragment_version = '1.2.0' + def fragment_version = '1.2.5' def arrow_version = "0.8.2" def coroutines_version = "1.3.2" def markwon_version = '4.1.2' def big_image_viewer_version = '1.6.2' - def glide_version = '4.10.0' + def glide_version = '4.11.0' def moshi_version = '1.8.0' def daggerVersion = '2.25.4' def autofill_version = "1.0.0" - def work_version = '2.3.3' + def work_version = '2.3.4' def arch_version = '2.1.0' def lifecycle_version = '2.2.0' @@ -285,12 +285,12 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" - implementation "androidx.recyclerview:recyclerview:1.2.0-alpha01" + implementation "androidx.recyclerview:recyclerview:1.2.0-alpha04" implementation 'androidx.appcompat:appcompat:1.1.0' implementation "androidx.fragment:fragment:$fragment_version" implementation "androidx.fragment:fragment-ktx:$fragment_version" - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' - implementation 'androidx.core:core-ktx:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7' + implementation 'androidx.core:core-ktx:1.3.0' implementation "org.threeten:threetenbp:1.4.0:no-tzdb" implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.7.0" @@ -326,17 +326,17 @@ dependencies { implementation "androidx.work:work-runtime-ktx:$work_version" // Paging - implementation "androidx.paging:paging-runtime-ktx:2.1.1" + implementation "androidx.paging:paging-runtime-ktx:2.1.2" // Functional Programming implementation "io.arrow-kt:arrow-core:$arrow_version" // Pref - implementation 'androidx.preference:preference:1.1.0' + implementation 'androidx.preference:preference:1.1.1' // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - implementation 'com.google.android.material:material:1.2.0-alpha03' + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'me.gujun.android:span:1.7' implementation "io.noties.markwon:core:$markwon_version" implementation "io.noties.markwon:html:$markwon_version" @@ -385,7 +385,7 @@ dependencies { // gplay flavor only // Warning: due to the exclude, Android Studio does not propose to upgrade. Uncomment next line to be proposed to upgrade // implementation 'com.google.firebase:firebase-messaging:20.0.0' - gplayImplementation('com.google.firebase:firebase-messaging:20.0.0') { + gplayImplementation('com.google.firebase:firebase-messaging:20.2.1') { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' @@ -394,7 +394,7 @@ dependencies { // OSS License, gplay flavor only gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' - implementation "androidx.emoji:emoji-appcompat:1.0.0" + implementation "androidx.emoji:emoji-appcompat:1.1.0" implementation 'com.github.BillCarsonFr:JsonViewer:0.5'