From af5f8ee97288d0f03947d4fc67429e253f2964af Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 8 Sep 2020 13:18:34 -0500 Subject: [PATCH] Update third party dependencies --- app/build.gradle.kts | 20 ++++++++++---------- app/licenses.yml | 6 ------ app/src/main/assets/licenses.json | 14 -------------- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 14 +++++++------- 5 files changed, 18 insertions(+), 38 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 540ee82d5..1de70f0c4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,7 +5,7 @@ plugins { kotlin("android") kotlin("kapt") id("com.cookpad.android.plugin.license-tools") version "1.2.2" - id("com.github.ben-manes.versions") version "0.28.0" + id("com.github.ben-manes.versions") version "0.31.0" id("com.vanniktech.android.junit.jacoco") version "0.16.0" id("dagger.hilt.android.plugin") } @@ -142,10 +142,10 @@ val genericImplementation by configurations val googleplayImplementation by configurations dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.9") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.10") implementation("com.gitlab.bitfireAT:dav4jvm:2.1.1") implementation("com.gitlab.bitfireAT:ical4android:b520b3f2b2") - implementation("com.gitlab.bitfireAT:cert4android:1488e39a66") + implementation("com.gitlab.bitfireAT:cert4android:767d1f9759") implementation("com.github.dmfs.opentasks:opentasks-provider:1.2.4") { exclude("com.github.dmfs.opentasks", "opentasks-contract") } @@ -174,12 +174,12 @@ dependencies { debugImplementation("com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}") implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}") - implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.2") + implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3") implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}") implementation("com.google.code.gson:gson:2.8.6") implementation("com.google.android.material:material:1.2.1") implementation("androidx.annotation:annotation:1.1.0") - implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta4") + implementation("androidx.constraintlayout:constraintlayout:2.0.1") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") @@ -196,13 +196,13 @@ dependencies { implementation("com.wdullaer:materialdatetimepicker:4.2.3") implementation("me.leolin:ShortcutBadger:1.1.22@aar") implementation("com.google.apis:google-api-services-tasks:v1-rev20200516-1.30.10") - implementation("com.google.apis:google-api-services-drive:v3-rev20200609-1.30.9") - implementation("com.google.auth:google-auth-library-oauth2-http:0.20.0") + implementation("com.google.apis:google-api-services-drive:v3-rev20200813-1.30.10") + implementation("com.google.auth:google-auth-library-oauth2-http:0.21.1") implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.0.0") implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0") - implementation("com.etesync:journalmanager:1.1.0") + implementation("com.etesync:journalmanager:1.1.1") implementation("com.github.QuadFlask:colorpicker:0.0.15") // https://github.com/mapbox/mapbox-gl-native-android/issues/316 @@ -228,11 +228,11 @@ dependencies { androidTestImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}") androidTestImplementation("androidx.test:runner:${Versions.androidx_test}") androidTestImplementation("androidx.test:rules:${Versions.androidx_test}") - androidTestImplementation("androidx.test.ext:junit:1.1.1") + androidTestImplementation("androidx.test.ext:junit:1.1.2") androidTestImplementation("androidx.annotation:annotation:1.1.0") testImplementation("junit:junit:4.13") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.8") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.9") testImplementation("com.natpryce:make-it-easy:${Versions.make_it_easy}") testImplementation("androidx.test:core:${Versions.androidx_test}") testImplementation("org.mockito:mockito-core:${Versions.mockito}") diff --git a/app/licenses.yml b/app/licenses.yml index b4e1afe96..53904f8b6 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -555,12 +555,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: https://www.apache.org/licenses/LICENSE-2.0 url: https://conscrypt.org/ -- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+ - name: org.jetbrains.kotlin:kotlin-stdlib-jdk8 - copyrightHolder: JetBrains s.r.o. - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://kotlinlang.org/ - artifact: org.jetbrains.kotlinx:kotlinx-coroutines-android:+ name: kotlinx-coroutines-android copyrightHolder: JetBrains s.r.o. diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index fd4ae2afa..1b0e42cdf 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1312,20 +1312,6 @@ "url": "https://conscrypt.org/", "libraryName": "org.conscrypt:conscrypt-android" }, - { - "artifactId": { - "name": "kotlin-stdlib-jdk8", - "group": "org.jetbrains.kotlin", - "version": "+" - }, - "copyrightHolder": "JetBrains s.r.o.", - "copyrightStatement": "Copyright © JetBrains s.r.o. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "https://kotlinlang.org/", - "libraryName": "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - }, { "artifactId": { "name": "kotlinx-coroutines-android", diff --git a/build.gradle.kts b/build.gradle.kts index f1416f585..15217899b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:4.0.1") classpath("com.google.gms:google-services:4.3.3") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.0") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 14d15ed8d..8224051e0 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -2,19 +2,19 @@ object Versions { const val kotlin = "1.4.0" const val targetSdk = 29 const val minSdk = 23 - const val butterknife = "10.2.1" - const val work = "2.3.4" + const val butterknife = "10.2.3" + const val work = "2.4.0" const val leakcanary = "2.4" const val room = "2.2.5" const val crashlytics = "17.2.1" const val analytics = "17.5.0" const val remote_config = "19.2.0" - const val okhttp = "4.7.2" - const val flipper = "0.52.1" + const val okhttp = "4.8.1" + const val flipper = "0.55.0" const val mockito = "3.3.3" - const val androidx_test = "1.2.0" + const val androidx_test = "1.3.0" const val make_it_easy = "4.0.1" - const val hilt = "2.28.1-alpha" - const val hilt_androidx = "1.0.0-alpha01" + const val hilt = "2.28.3-alpha" + const val hilt_androidx = "1.0.0-alpha02" const val lifecycle = "2.2.0" } \ No newline at end of file