From 22b2d090de0081209c7e35c4fc6d326d3c65891c Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 8 Jul 2020 13:51:53 -0500 Subject: [PATCH] Update dependencies and licenses --- app/build.gradle.kts | 12 +++--- app/licenses.yml | 24 ++++++++++++ app/src/main/assets/licenses.json | 56 ++++++++++++++++++++++++++++ build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 8 ++-- 5 files changed, 91 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7048b018a..6773819fe 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -139,8 +139,8 @@ val genericImplementation by configurations val googleplayImplementation by configurations dependencies { - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.5") - implementation("com.gitlab.bitfireAT:dav4jvm:2.1") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.9") + implementation("com.gitlab.bitfireAT:dav4jvm:2.1.1") implementation("com.gitlab.bitfireAT:ical4android:a675c7194b") implementation("com.gitlab.bitfireAT:cert4android:1488e39a66") @@ -174,7 +174,7 @@ dependencies { implementation("com.google.android.material:material:1.1.0") implementation("androidx.annotation:annotation:1.1.0") implementation("androidx.constraintlayout:constraintlayout:2.0.0-beta4") - implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0") + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.google.android.apps.dashclock:dashclock-api:2.0.0") @@ -190,11 +190,11 @@ 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-rev20200129-1.30.9") - implementation("com.google.apis:google-api-services-drive:v3-rev20200413-1.30.9") + 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("androidx.work:work-runtime:${Versions.work}") implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.0.0") - implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.2.1") + implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0") implementation("com.etesync:journalmanager:1.1.0") implementation("com.github.QuadFlask:colorpicker:0.0.15") @@ -206,7 +206,7 @@ dependencies { googleplayImplementation("com.google.firebase:firebase-config-ktx:${Versions.remote_config}") googleplayImplementation("com.google.android.gms:play-services-location:17.0.0") googleplayImplementation("com.google.android.gms:play-services-maps:17.0.0") - googleplayImplementation("com.google.android.libraries.places:places:2.2.0") + googleplayImplementation("com.google.android.libraries.places:places:2.3.0") googleplayImplementation("com.android.billingclient:billing:1.2.2") androidTestImplementation("com.google.dagger:hilt-android-testing:${Versions.hilt}") diff --git a/app/licenses.yml b/app/licenses.yml index 5377ab05c..025e526f4 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -732,3 +732,27 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://developer.android.com/jetpack/androidx +- artifact: androidx.fragment:fragment-ktx:+ + name: fragment-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx +- artifact: androidx.activity:activity-ktx:+ + name: activity-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx +- artifact: androidx.collection:collection-ktx:+ + name: collection-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://developer.android.com/tools/extras/support-library.html +- artifact: androidx.lifecycle:lifecycle-livedata-core-ktx:+ + name: lifecycle-livedata-core-ktx + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: https://developer.android.com/jetpack/androidx diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index d7f2a4346..3e7b42788 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -1744,6 +1744,62 @@ "normalizedLicense": "apache2", "url": "https://developer.android.com/jetpack/androidx", "libraryName": "lifecycle-runtime-ktx" + }, + { + "artifactId": { + "name": "fragment-ktx", + "group": "androidx.fragment", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/jetpack/androidx", + "libraryName": "fragment-ktx" + }, + { + "artifactId": { + "name": "activity-ktx", + "group": "androidx.activity", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/jetpack/androidx", + "libraryName": "activity-ktx" + }, + { + "artifactId": { + "name": "collection-ktx", + "group": "androidx.collection", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "http://developer.android.com/tools/extras/support-library.html", + "libraryName": "collection-ktx" + }, + { + "artifactId": { + "name": "lifecycle-livedata-core-ktx", + "group": "androidx.lifecycle", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. 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://developer.android.com/jetpack/androidx", + "libraryName": "lifecycle-livedata-core-ktx" } ] } \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 17e270eee..cc609038b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:4.0.0") classpath("com.google.gms:google-services:4.3.3") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.1.1") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.0") 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 3f0f931a3..d17bfb72f 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -7,14 +7,14 @@ object Versions { const val leakcanary = "2.4" const val room = "2.2.5" const val crashlytics = "2.10.1" - const val analytics = "17.4.3" + const val analytics = "17.4.4" const val remote_config = "19.1.4" - const val okhttp = "4.6.0" - const val flipper = "0.46.0" + const val okhttp = "4.7.2" + const val flipper = "0.49.0" const val mockito = "3.3.3" const val androidx_test = "1.2.0" const val make_it_easy = "4.0.1" - const val hilt = "2.28-alpha" + const val hilt = "2.28.1-alpha" const val hilt_androidx = "1.0.0-alpha01" const val lifecycle = "2.2.0" } \ No newline at end of file