diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4e1136d5f..a1dbf725d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -135,6 +135,8 @@ configurations.all { exclude(group = "com.google.code.findbugs") exclude(group = "com.google.errorprone") exclude(group = "com.google.j2objc") + exclude(group = "com.google.http-client", module = "google-http-client-apache-v2") + exclude(group = "com.google.http-client", module = "google-http-client-jackson2") } val genericImplementation by configurations @@ -170,7 +172,7 @@ dependencies { debugImplementation("com.facebook.flipper:flipper:${Versions.flipper}") debugImplementation("com.facebook.flipper:flipper-network-plugin:${Versions.flipper}") - debugImplementation("com.facebook.soloader:soloader:0.9.0") + debugImplementation("com.facebook.soloader:soloader:0.10.1") debugImplementation("com.squareup.leakcanary:leakcanary-android:${Versions.leakcanary}") @@ -193,13 +195,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-rev20200905-1.30.10") - implementation("com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10") - implementation("com.google.auth:google-auth-library-oauth2-http:0.22.0") + implementation("com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0") + implementation("com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0") + implementation("com.google.auth:google-auth-library-oauth2-http:0.23.0") implementation("androidx.work:work-runtime:${Versions.work}") implementation("androidx.work:work-runtime-ktx:${Versions.work}") - implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.1.0") - implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0") + implementation("com.mapbox.mapboxsdk:mapbox-android-core:3.1.1") + implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0") implementation("com.etesync:journalmanager:1.1.1") implementation("com.etebase:client:2.3.2") implementation("com.github.QuadFlask:colorpicker:0.0.15") @@ -231,7 +233,7 @@ dependencies { androidTestImplementation("androidx.annotation:annotation:1.1.0") testImplementation("junit:junit:4.13.1") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.1") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2") 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 24a7b2253..4298ffb54 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -265,12 +265,6 @@ 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: com.fasterxml.jackson.core:jackson-core:+ - name: Jackson-core - copyrightHolder: FasterXML - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: https://github.com/FasterXML/jackson-core - artifact: androidx.cardview:cardview:+ name: Android Support CardView v7 copyrightHolder: Android Open Source Project @@ -434,11 +428,6 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://kotlinlang.org/ -- artifact: com.google.http-client:google-http-client-jackson2:+ - name: Jackson 2 extensions to the Google HTTP Client Library for Java. - copyrightHolder: Google Inc. - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - artifact: com.jakewharton:butterknife:+ name: ButterKnife copyrightHolder: Jake Wharton @@ -871,3 +860,7 @@ 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: com.google.http-client:google-http-client-gson:+ + name: google-http-client-gson + copyrightHolder: Google Inc. + license: The Apache Software License, Version 2.0 diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index fa7342560..295d58678 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -623,20 +623,6 @@ "url": "http://developer.android.com/tools/extras/support-library.html", "libraryName": "Android Support Library collections" }, - { - "artifactId": { - "name": "jackson-core", - "group": "com.fasterxml.jackson.core", - "version": "+" - }, - "copyrightHolder": "FasterXML", - "copyrightStatement": "Copyright © FasterXML. 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://github.com/FasterXML/jackson-core", - "libraryName": "Jackson-core" - }, { "artifactId": { "name": "cardview", @@ -1023,19 +1009,6 @@ "url": "https://kotlinlang.org/", "libraryName": "org.jetbrains.kotlin:kotlin-stdlib-common" }, - { - "artifactId": { - "name": "google-http-client-jackson2", - "group": "com.google.http-client", - "version": "+" - }, - "copyrightHolder": "Google Inc.", - "copyrightStatement": "Copyright © Google Inc. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "libraryName": "Jackson 2 extensions to the Google HTTP Client Library for Java." - }, { "artifactId": { "name": "butterknife", @@ -2074,6 +2047,18 @@ "normalizedLicense": "apache2", "url": "http://developer.android.com/tools/extras/support-library.html", "libraryName": "print" + }, + { + "artifactId": { + "name": "google-http-client-gson", + "group": "com.google.http-client", + "version": "+" + }, + "copyrightHolder": "Google Inc.", + "copyrightStatement": "Copyright © Google Inc. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "normalizedLicense": "apache2", + "libraryName": "google-http-client-gson" } ] } \ No newline at end of file diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt index 066c11fba..85ea68583 100644 --- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt +++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.kt @@ -1,7 +1,7 @@ package com.todoroo.astrid.gtasks.api import com.google.api.client.http.javanet.NetHttpTransport -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.tasks.Tasks import com.google.api.services.tasks.model.Task import com.google.api.services.tasks.model.TaskList @@ -23,7 +23,7 @@ class GtasksInvoker( interceptor: DebugNetworkInterceptor ) : BaseInvoker(credentials, preferences, interceptor) { private val service = - Tasks.Builder(NetHttpTransport(), JacksonFactory(), credentials) + Tasks.Builder(NetHttpTransport(), GsonFactory(), credentials) .setApplicationName(APP_NAME) .build() diff --git a/app/src/main/java/org/tasks/drive/DriveInvoker.kt b/app/src/main/java/org/tasks/drive/DriveInvoker.kt index da4a3c6fe..1a90832e9 100644 --- a/app/src/main/java/org/tasks/drive/DriveInvoker.kt +++ b/app/src/main/java/org/tasks/drive/DriveInvoker.kt @@ -4,7 +4,7 @@ import android.content.Context import android.net.Uri import com.google.api.client.http.InputStreamContent import com.google.api.client.http.javanet.NetHttpTransport -import com.google.api.client.json.jackson2.JacksonFactory +import com.google.api.client.json.gson.GsonFactory import com.google.api.services.drive.Drive import com.google.api.services.drive.model.File import com.todoroo.astrid.gtasks.api.HttpCredentialsAdapter @@ -24,7 +24,7 @@ class DriveInvoker( interceptor: DebugNetworkInterceptor ) : BaseInvoker(credentialsAdapter, preferences, interceptor) { private val service = - Drive.Builder(NetHttpTransport(), JacksonFactory(), credentialsAdapter) + Drive.Builder(NetHttpTransport(), GsonFactory(), credentialsAdapter) .setApplicationName(APP_NAME) .build() diff --git a/build.gradle.kts b/build.gradle.kts index 23ef41255..c22413da3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,8 +7,8 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle:4.1.2") - classpath("com.google.gms:google-services:4.3.4") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0") + classpath("com.google.gms:google-services:4.3.5") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.4.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index b22ed732f..60f5d637f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,4 +4,5 @@ plugins { repositories { mavenCentral() + jcenter() } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7a3ae1386..91500f23b 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,21 +1,21 @@ object Versions { - const val kotlin = "1.4.10" + const val kotlin = "1.4.30" const val targetSdk = 30 const val minSdk = 23 const val butterknife = "10.2.3" const val work = "2.5.0" const val leakcanary = "2.6" const val room = "2.2.5" - const val crashlytics = "17.2.2" - const val analytics = "18.0.0" - const val remote_config = "20.0.0" + const val crashlytics = "17.3.1" + const val analytics = "18.0.2" + const val remote_config = "20.0.3" const val okhttp = "4.8.1" - const val flipper = "0.64.0" - const val mockito = "3.3.3" + const val flipper = "0.74.0" + const val mockito = "3.7.7" const val androidx_test = "1.3.0" const val make_it_easy = "4.0.1" const val hilt = "2.31.2-alpha" const val hilt_androidx = "1.0.0-alpha03" const val lifecycle = "2.2.0" - const val markwon = "4.6.0" + const val markwon = "4.6.1" } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index 6ec82c231..bc51b4f88 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -19,14 +19,14 @@ +| +--- com.mapbox.mapboxsdk:mapbox-android-telemetry:4.4.1 -> 6.1.0 +| | +--- com.squareup.okhttp3:okhttp:3.12.0 -> 4.8.1 +| | | +--- com.squareup.okio:okio:2.7.0 -+| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 -+| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 ++| | | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.30 ++| | | | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 +| | | | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 -+| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.21 -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.21 (*) ++| | | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.30 ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) +| | +--- com.google.code.gson:gson:2.8.5 -> 2.8.6 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| | +--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 -> 3.1.0 ++| | +--- com.mapbox.mapboxsdk:mapbox-android-core:3.0.0 -> 3.1.1 +| | \--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | +--- androidx.core:core:1.0.0 -> 1.3.2 @@ -56,12 +56,12 @@ +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.print:print:1.0.0 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:4.6.0 -> 5.3.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:4.6.0 -> 5.8.0 +| | \--- com.google.code.gson:gson:2.8.6 +| +--- com.mapbox.mapboxsdk:mapbox-android-gestures:0.4.2 +| | \--- androidx.core:core:1.0.0 -> 1.3.2 (*) +| +--- com.mapbox.mapboxsdk:mapbox-sdk-turf:4.6.0 -+| | \--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:4.6.0 -> 5.3.0 (*) ++| | \--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:4.6.0 -> 5.8.0 (*) +| +--- com.squareup.okhttp3:okhttp:3.12.0 -> 4.8.1 (*) +| +--- com.getkeepsafe.relinker:relinker:1.3.1 +| +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 @@ -95,7 +95,7 @@ +| \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) ++--- com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0 (*) ++--- com.gitlab.bitfireAT:dav4jvm:2.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) +| \--- org.apache.commons:commons-lang3:3.9 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -104,14 +104,14 @@ +| | +--- org.apache.commons:commons-lang3:3.8.1 -> 3.9 +| | \--- org.apache.commons:commons-collections4:4.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.21 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) +| +--- com.sun.mail:android-mail:1.6.5 +| | \--- com.sun.mail:android-activation:1.6.5 +| +--- commons-io:commons-io:2.6 +| +--- org.slf4j:slf4j-jdk14:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.30 (*) +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.2 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f @@ -158,20 +158,20 @@ +| | | \--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 @@ -258,28 +258,28 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) ++--- androidx.fragment:fragment-ktx:1.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| +--- androidx.fragment:fragment:1.2.5 (*) +| +--- androidx.activity:activity-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- androidx.activity:activity:1.1.0 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.30 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 (*) +| \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.room:room-ktx:2.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.30 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.5 (*) +| \--- androidx.room:room-runtime:2.2.5 (*) @@ -294,11 +294,11 @@ +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -++--- io.noties.markwon:core:4.6.0 +++--- io.noties.markwon:core:4.6.1 +| +--- androidx.annotation:annotation:1.1.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- io.noties.markwon:ext-strikethrough:4.6.0 -+| +--- io.noties.markwon:core:4.6.0 (*) +++--- io.noties.markwon:ext-strikethrough:4.6.1 ++| +--- io.noties.markwon:core:4.6.1 (*) +| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 @@ -306,10 +306,10 @@ +| +--- com.jakewharton:butterknife-annotations:10.2.3 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| \--- androidx.core:core:1.0.0 -> 1.3.2 (*) -++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.21 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 ++--- com.squareup.okhttp3:okhttp:4.8.1 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) @@ -335,54 +335,53 @@ +| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.30.10 -+| \--- com.google.api-client:google-api-client:1.30.10 -+| +--- com.google.oauth-client:google-oauth-client:1.31.0 -+| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.37.0 -+| | | +--- org.apache.httpcomponents:httpcore:4.4.13 -+| | | +--- com.google.guava:guava:29.0-android +++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0 ++| \--- com.google.api-client:google-api-client:1.31.1 ++| +--- com.google.oauth-client:google-oauth-client:1.31.2 ++| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.38.1 ++| | | +--- org.apache.httpcomponents:httpcore:4.4.14 ++| | | +--- com.google.guava:guava:30.1-android +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +| | | +--- io.opencensus:opencensus-api:0.24.0 +| | | | \--- io.grpc:grpc-context:1.22.1 +| | | \--- io.opencensus:opencensus-contrib-http-util:0.24.0 +| | | +--- io.opencensus:opencensus-api:0.24.0 (*) -+| | | \--- com.google.guava:guava:26.0-android -> 29.0-android (*) -+| | \--- com.google.guava:guava:29.0-android (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -> 1.37.0 -+| | +--- com.google.http-client:google-http-client:1.37.0 (*) -+| | \--- com.fasterxml.jackson.core:jackson-core:2.11.3 -+| \--- com.google.guava:guava:29.0-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10 -+| \--- com.google.api-client:google-api-client:1.30.10 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.22.0 ++| | | \--- com.google.guava:guava:26.0-android -> 30.1-android (*) ++| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) ++| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) +++--- com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0 ++| \--- com.google.api-client:google-api-client:1.31.1 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.23.0 +| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.22.0 -+| +--- com.google.http-client:google-http-client:1.37.0 (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) -+| \--- com.google.guava:guava:29.0-android (*) ++| +--- com.google.auth:google-auth-library-credentials:0.23.0 ++| +--- com.google.http-client:google-http-client:1.38.1 (*) ++| +--- com.google.http-client:google-http-client-gson:1.38.1 ++| | +--- com.google.http-client:google-http-client:1.38.1 (*) ++| | \--- com.google.code.gson:gson:2.8.6 ++| \--- com.google.guava:guava:30.1-android (*) ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) -++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 -++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0 +++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.1 +++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.8.0 +| | +--- com.google.code.gson:gson:2.8.6 -+| | +--- com.squareup.retrofit2:retrofit:2.7.1 -+| | | \--- com.squareup.okhttp3:okhttp:3.14.4 -> 4.8.1 (*) -+| | +--- com.squareup.retrofit2:converter-gson:2.7.1 -+| | | +--- com.squareup.retrofit2:retrofit:2.7.1 (*) ++| | +--- com.squareup.retrofit2:retrofit:2.7.2 ++| | | \--- com.squareup.okhttp3:okhttp:3.14.7 -> 4.8.1 (*) ++| | +--- com.squareup.retrofit2:converter-gson:2.7.2 ++| | | +--- com.squareup.retrofit2:retrofit:2.7.2 (*) +| | | \--- com.google.code.gson:gson:2.8.5 -> 2.8.6 +| | \--- com.squareup.okhttp3:logging-interceptor:3.12.7 +| | \--- com.squareup.okhttp3:okhttp:3.12.7 -> 4.8.1 (*) -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.3.0 (*) -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.3.0 -+| | +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.3.0 (*) ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.8.0 (*) ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.8.0 ++| | +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.8.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| \--- com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:5.3.0 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.3.0 (*) ++| \--- com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:5.8.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.8.0 (*) +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++--- com.etesync:journalmanager:1.1.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.21 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index d01e376ac..a631f8761 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -15,22 +15,22 @@ ++--- androidx.databinding:databinding-adapters:4.1.2 +| +--- androidx.databinding:databinding-common:4.1.2 +| \--- androidx.databinding:databinding-runtime:4.1.2 (*) -++--- com.google.firebase:firebase-crashlytics:17.2.2 +++--- com.google.firebase:firebase-crashlytics:17.3.1 +| +--- com.google.android.datatransport:transport-api:2.2.1 +| | \--- androidx.annotation:annotation:1.1.0 -+| +--- com.google.android.datatransport:transport-backend-cct:2.3.1 ++| +--- com.google.android.datatransport:transport-backend-cct:2.3.3 +| | +--- androidx.annotation:annotation:1.1.0 +| | +--- com.google.android.datatransport:transport-api:2.2.1 (*) -+| | +--- com.google.android.datatransport:transport-runtime:2.2.4 ++| | +--- com.google.android.datatransport:transport-runtime:2.2.5 +| | | +--- androidx.annotation:annotation:1.1.0 +| | | +--- com.google.android.datatransport:transport-api:2.2.1 (*) -+| | | \--- com.google.dagger:dagger:2.27 -> 2.31.2 -+| | | \--- javax.inject:javax.inject:1 -+| | \--- com.google.firebase:firebase-encoders-json:16.1.0 -> 17.0.0 ++| | | \--- javax.inject:javax.inject:1 ++| | +--- com.google.firebase:firebase-encoders:16.1.0 ++| | | \--- androidx.annotation:annotation:1.1.0 ++| | \--- com.google.firebase:firebase-encoders-json:17.1.0 +| | +--- androidx.annotation:annotation:1.1.0 -+| | \--- com.google.firebase:firebase-encoders:16.0.0 -+| | \--- androidx.annotation:annotation:1.1.0 -+| +--- com.google.android.datatransport:transport-runtime:2.2.4 (*) ++| | \--- com.google.firebase:firebase-encoders:16.1.0 (*) ++| +--- com.google.android.datatransport:transport-runtime:2.2.5 (*) +| +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 +| | \--- com.google.android.gms:play-services-basement:17.3.0 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) @@ -82,32 +82,27 @@ +| | +--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) +| | +--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) -+| +--- com.google.firebase:firebase-common:19.3.1 ++| +--- com.google.firebase:firebase-common:19.5.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) -+| | \--- com.google.firebase:firebase-components:16.0.0 -+| | \--- androidx.annotation:annotation:1.1.0 -+| +--- com.google.firebase:firebase-components:16.0.0 (*) -+| +--- com.google.firebase:firebase-encoders:16.0.0 (*) -+| +--- com.google.firebase:firebase-encoders-json:17.0.0 (*) -+| +--- com.google.firebase:firebase-installations:16.3.3 ++| | \--- com.google.firebase:firebase-components:16.1.0 ++| | +--- androidx.annotation:annotation:1.1.0 ++| | \--- com.google.firebase:firebase-annotations:16.0.0 ++| +--- com.google.firebase:firebase-components:16.1.0 (*) ++| +--- com.google.firebase:firebase-encoders:16.1.0 (*) ++| +--- com.google.firebase:firebase-encoders-json:17.1.0 (*) ++| +--- com.google.firebase:firebase-installations:16.3.5 +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) -+| | +--- com.google.firebase:firebase-components:16.0.0 (*) -+| | \--- com.google.firebase:firebase-installations-interop:16.0.0 -+| | \--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) -+| +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) -+| +--- com.google.firebase:firebase-measurement-connector:18.0.0 -+| | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.8.1 -+| +--- com.squareup.okio:okio:2.7.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.21 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.21 -+| | | \--- org.jetbrains:annotations:13.0 -> 16.0.1 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.21 -+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.21 (*) -++--- com.google.firebase:firebase-analytics:18.0.0 -+| +--- com.google.android.gms:play-services-measurement:18.0.0 ++| | +--- com.google.firebase:firebase-common:19.5.0 (*) ++| | +--- com.google.firebase:firebase-components:16.1.0 (*) ++| | \--- com.google.firebase:firebase-installations-interop:16.0.1 ++| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) ++| | \--- com.google.firebase:firebase-annotations:16.0.0 ++| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) ++| \--- com.google.firebase:firebase-measurement-connector:18.0.0 ++| \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +++--- com.google.firebase:firebase-analytics:18.0.2 ++| +--- com.google.android.gms:play-services-measurement:18.0.2 +| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 +| | | +--- androidx.annotation:annotation:1.0.0 -> 1.1.0 @@ -120,59 +115,61 @@ +| | | \--- androidx.print:print:1.0.0 +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:18.0.0 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-impl:18.0.0 ++| | +--- com.google.android.gms:play-services-measurement-impl:18.0.2 +| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| | | +--- androidx.core:core:1.0.0 -> 1.3.2 (*) +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) ++| | | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) +| | | \--- com.google.android.gms:play-services-stats:17.0.0 +| | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*) +| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| | \--- com.google.android.gms:play-services-stats:17.0.0 (*) -+| +--- com.google.android.gms:play-services-measurement-api:18.0.0 ++| +--- com.google.android.gms:play-services-measurement-api:18.0.2 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) -+| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.0 ++| | +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) ++| | +--- com.google.android.gms:play-services-measurement-sdk-api:18.0.2 +| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | | \--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) ++| | | \--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) +| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.1.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.3.1 (*) -+| | +--- com.google.firebase:firebase-components:16.0.0 (*) -+| | +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.3 (*) -+| | +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) ++| | +--- com.google.firebase:firebase-common:19.3.0 -> 19.5.0 (*) ++| | +--- com.google.firebase:firebase-components:16.0.0 -> 16.1.0 (*) ++| | +--- com.google.firebase:firebase-installations:16.3.2 -> 16.3.5 (*) ++| | +--- com.google.firebase:firebase-installations-interop:16.0.0 -> 16.0.1 (*) +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| \--- com.google.android.gms:play-services-measurement-sdk:18.0.0 ++| \--- com.google.android.gms:play-services-measurement-sdk:18.0.2 +| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| +--- com.google.android.gms:play-services-measurement-base:18.0.0 (*) -+| \--- com.google.android.gms:play-services-measurement-impl:18.0.0 (*) -++--- com.google.firebase:firebase-config-ktx:20.0.0 ++| +--- com.google.android.gms:play-services-measurement-base:18.0.2 (*) ++| \--- com.google.android.gms:play-services-measurement-impl:18.0.2 (*) +++--- com.google.firebase:firebase-config-ktx:20.0.3 +| +--- androidx.annotation:annotation:1.1.0 +| +--- com.google.firebase:firebase-abt:20.0.0 +| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.1 (*) -+| | +--- com.google.firebase:firebase-components:16.0.0 (*) ++| | +--- com.google.firebase:firebase-common:19.3.1 -> 19.5.0 (*) ++| | +--- com.google.firebase:firebase-components:16.0.0 -> 16.1.0 (*) +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| +--- com.google.firebase:firebase-common:19.3.1 (*) -+| +--- com.google.firebase:firebase-common-ktx:19.3.1 ++| +--- com.google.firebase:firebase-common:19.5.0 (*) ++| +--- com.google.firebase:firebase-common-ktx:19.5.0 +| | +--- androidx.annotation:annotation:1.1.0 -+| | +--- com.google.firebase:firebase-common:19.3.1 (*) -+| | +--- com.google.firebase:firebase-components:16.0.0 (*) ++| | +--- com.google.firebase:firebase-common:19.5.0 (*) ++| | +--- com.google.firebase:firebase-components:16.1.0 (*) +| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.21 -+| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) -+| +--- com.google.firebase:firebase-components:16.0.0 (*) -+| +--- com.google.firebase:firebase-config:20.0.0 ++| | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.30 ++| | \--- org.jetbrains:annotations:13.0 -> 16.0.1 ++| +--- com.google.firebase:firebase-components:16.1.0 (*) ++| +--- com.google.firebase:firebase-config:20.0.3 +| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.1.0 (*) +| | +--- com.google.firebase:firebase-abt:20.0.0 (*) -+| | +--- com.google.firebase:firebase-common:19.3.1 (*) -+| | +--- com.google.firebase:firebase-components:16.0.0 (*) -+| | +--- com.google.firebase:firebase-installations:16.3.3 (*) -+| | +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) ++| | +--- com.google.firebase:firebase-common:19.5.0 (*) ++| | +--- com.google.firebase:firebase-components:16.1.0 (*) ++| | +--- com.google.firebase:firebase-installations:16.3.5 (*) ++| | +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) +| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*) -+| +--- com.google.firebase:firebase-installations:16.3.3 (*) -+| +--- com.google.firebase:firebase-installations-interop:16.0.0 (*) ++| +--- com.google.firebase:firebase-installations:16.3.5 (*) ++| +--- com.google.firebase:firebase-installations-interop:16.0.1 (*) +| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.4.21 (*) ++--- com.google.android.gms:play-services-location:17.1.0 +| +--- com.google.android.gms:play-services-base:17.3.0 @@ -236,8 +233,8 @@ +| | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) +| +--- com.android.volley:volley:1.1.1 +| +--- com.google.android.datatransport:transport-api:2.2.0 -> 2.2.1 (*) -+| +--- com.google.android.datatransport:transport-backend-cct:2.3.0 -> 2.3.1 (*) -+| +--- com.google.android.datatransport:transport-runtime:2.2.3 -> 2.2.4 (*) ++| +--- com.google.android.datatransport:transport-backend-cct:2.3.0 -> 2.3.3 (*) ++| +--- com.google.android.datatransport:transport-runtime:2.2.3 -> 2.2.5 (*) +| +--- com.google.android.gms:play-services-base:17.2.1 -> 17.3.0 (*) +| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.3.0 (*) +| +--- com.google.android.gms:play-services-location:17.0.0 -> 17.1.0 (*) @@ -247,7 +244,7 @@ +| \--- com.google.code.gson:gson:2.8.5 -> 2.8.6 ++--- com.android.billingclient:billing:1.2.2 ++--- com.gitlab.bitfireAT:dav4jvm:2.1.1 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) +| \--- org.apache.commons:commons-lang3:3.9 ++--- com.gitlab.abaker:ical4android:0e928b567c +| +--- org.mnode.ical4j:ical4j:3.0.21 @@ -262,7 +259,7 @@ +| +--- org.slf4j:slf4j-jdk14:1.7.30 +| | \--- org.slf4j:slf4j-api:1.7.30 +| \--- androidx.core:core-ktx:1.3.2 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.71 -> 1.4.30 (*) +| +--- androidx.annotation:annotation:1.1.0 +| \--- androidx.core:core:1.3.2 (*) ++--- com.gitlab.bitfireAT:cert4android:26a91a729f @@ -274,20 +271,20 @@ +| +--- androidx.cardview:cardview:1.0.0 (*) +| +--- androidx.lifecycle:lifecycle-extensions:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0 -> 1.4.1 +| | | \--- org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 +| | +--- androidx.lifecycle:lifecycle-livedata:2.2.0 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | \--- androidx.lifecycle:lifecycle-livedata-core:2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1 (*) -+| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) ++| | | \--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) +| | \--- androidx.lifecycle:lifecycle-viewmodel:2.2.0 (*) +| +--- com.google.android.material:material:1.2.1 -> 1.3.0 +| | +--- androidx.annotation:annotation:1.0.1 -> 1.1.0 @@ -329,7 +326,8 @@ +| | \--- org.dmfs:rfc5545-datetime:0.2.4 +| \--- org.dmfs:jems:1.33 ++--- com.google.dagger:hilt-android:2.31.2-alpha -+| +--- com.google.dagger:dagger:2.31.2 (*) ++| +--- com.google.dagger:dagger:2.31.2 ++| | \--- javax.inject:javax.inject:1 +| +--- com.google.dagger:dagger-lint-aar:2.31.2 +| +--- com.google.dagger:hilt-core:2.31.2-alpha +| | +--- com.google.dagger:dagger:2.31.2 (*) @@ -369,28 +367,28 @@ +| +--- androidx.lifecycle:lifecycle-viewmodel-savedstate:2.2.0 (*) +| \--- com.google.dagger:hilt-android:2.31-alpha -> 2.31.2-alpha (*) ++--- androidx.fragment:fragment-ktx:1.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| +--- androidx.fragment:fragment:1.2.5 (*) +| +--- androidx.activity:activity-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | +--- androidx.activity:activity:1.1.0 (*) +| | +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| | +--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 -+| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.21 (*) ++| | | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50 -> 1.4.30 (*) +| | | +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| | | +--- androidx.lifecycle:lifecycle-runtime:2.2.0 (*) +| | | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| | \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) +| +--- androidx.core:core-ktx:1.1.0 -> 1.3.2 (*) +| +--- androidx.collection:collection-ktx:1.1.0 -+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.21 (*) ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.20 -> 1.4.30 (*) +| | \--- androidx.collection:collection:1.1.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata-core-ktx:2.2.0 (*) +| \--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.lifecycle:lifecycle-runtime-ktx:2.2.0 (*) ++--- androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0 (*) ++--- androidx.room:room-ktx:2.2.5 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.41 -> 1.4.30 (*) +| +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0 -> 1.4.1 (*) +| +--- androidx.room:room-common:2.2.5 (*) +| \--- androidx.room:room-runtime:2.2.5 (*) @@ -405,11 +403,11 @@ +| +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.2.0 (*) +| +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) -++--- io.noties.markwon:core:4.6.0 +++--- io.noties.markwon:core:4.6.1 +| +--- androidx.annotation:annotation:1.1.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 -++--- io.noties.markwon:ext-strikethrough:4.6.0 -+| +--- io.noties.markwon:core:4.6.0 (*) +++--- io.noties.markwon:ext-strikethrough:4.6.1 ++| +--- io.noties.markwon:core:4.6.1 (*) +| \--- com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:0.13.0 +| \--- com.atlassian.commonmark:commonmark:0.13.0 ++--- com.jakewharton:butterknife:10.2.3 @@ -417,11 +415,15 @@ +| +--- com.jakewharton:butterknife-annotations:10.2.3 +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 +| \--- androidx.core:core:1.0.0 -> 1.3.2 (*) -++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.10 -> 1.4.21 (*) +++--- org.jetbrains.kotlin:kotlin-stdlib:1.4.30 (*) ++--- org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.3 -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.21 (*) -+| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.21 -++--- com.squareup.okhttp3:okhttp:4.8.1 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.0 -> 1.4.30 (*) ++| \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.0 -> 1.4.30 +++--- com.squareup.okhttp3:okhttp:4.8.1 ++| +--- com.squareup.okio:okio:2.7.0 ++| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.4.30 (*) ++| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.4.30 ++| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.4.30 (*) ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.annotation:annotation:1.1.0 @@ -446,55 +448,54 @@ +| +--- androidx.appcompat:appcompat:1.0.2 -> 1.2.0 (*) +| \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.1.0 (*) ++--- me.leolin:ShortcutBadger:1.1.22 -++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.30.10 -+| \--- com.google.api-client:google-api-client:1.30.10 -+| +--- com.google.oauth-client:google-oauth-client:1.31.0 -+| | +--- com.google.http-client:google-http-client:1.35.0 -> 1.37.0 -+| | | +--- org.apache.httpcomponents:httpcore:4.4.13 -+| | | +--- com.google.guava:guava:29.0-android +++--- com.google.apis:google-api-services-tasks:v1-rev20200905-1.31.0 ++| \--- com.google.api-client:google-api-client:1.31.1 ++| +--- com.google.oauth-client:google-oauth-client:1.31.2 ++| | +--- com.google.http-client:google-http-client:1.38.0 -> 1.38.1 ++| | | +--- org.apache.httpcomponents:httpcore:4.4.14 ++| | | +--- com.google.guava:guava:30.1-android +| | | | +--- com.google.guava:failureaccess:1.0.1 +| | | | \--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +| | | +--- io.opencensus:opencensus-api:0.24.0 +| | | | \--- io.grpc:grpc-context:1.22.1 +| | | \--- io.opencensus:opencensus-contrib-http-util:0.24.0 +| | | +--- io.opencensus:opencensus-api:0.24.0 (*) -+| | | \--- com.google.guava:guava:26.0-android -> 29.0-android (*) -+| | \--- com.google.guava:guava:29.0-android (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.36.0 -> 1.37.0 -+| | +--- com.google.http-client:google-http-client:1.37.0 (*) -+| | \--- com.fasterxml.jackson.core:jackson-core:2.11.3 -+| \--- com.google.guava:guava:29.0-android (*) -++--- com.google.apis:google-api-services-drive:v3-rev20201101-1.30.10 -+| \--- com.google.api-client:google-api-client:1.30.10 (*) -++--- com.google.auth:google-auth-library-oauth2-http:0.22.0 ++| | | \--- com.google.guava:guava:26.0-android -> 30.1-android (*) ++| | \--- com.google.guava:guava:30.0-android -> 30.1-android (*) ++| \--- com.google.guava:guava:29.0-android -> 30.1-android (*) +++--- com.google.apis:google-api-services-drive:v3-rev20201130-1.31.0 ++| \--- com.google.api-client:google-api-client:1.31.1 (*) +++--- com.google.auth:google-auth-library-oauth2-http:0.23.0 +| +--- com.google.auto.value:auto-value-annotations:1.7.4 -+| +--- com.google.auth:google-auth-library-credentials:0.22.0 -+| +--- com.google.http-client:google-http-client:1.37.0 (*) -+| +--- com.google.http-client:google-http-client-jackson2:1.37.0 (*) -+| \--- com.google.guava:guava:29.0-android (*) ++| +--- com.google.auth:google-auth-library-credentials:0.23.0 ++| +--- com.google.http-client:google-http-client:1.38.1 (*) ++| +--- com.google.http-client:google-http-client-gson:1.38.1 ++| | +--- com.google.http-client:google-http-client:1.38.1 (*) ++| | \--- com.google.code.gson:gson:2.8.6 ++| \--- com.google.guava:guava:30.1-android (*) ++--- androidx.work:work-runtime:2.5.0 (*) ++--- androidx.work:work-runtime-ktx:2.5.0 +| +--- androidx.work:work-runtime:2.5.0 (*) -+| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 (*) ++| +--- org.jetbrains.kotlin:kotlin-stdlib:1.4.21 -> 1.4.30 (*) +| \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1 (*) -++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.0 -++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.3.0 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.3.0 +++--- com.mapbox.mapboxsdk:mapbox-android-core:3.1.1 +++--- com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-core:5.8.0 +| | +--- com.google.code.gson:gson:2.8.6 -+| | +--- com.squareup.retrofit2:retrofit:2.7.1 -+| | | \--- com.squareup.okhttp3:okhttp:3.14.4 -> 4.8.1 (*) -+| | +--- com.squareup.retrofit2:converter-gson:2.7.1 -+| | | +--- com.squareup.retrofit2:retrofit:2.7.1 (*) ++| | +--- com.squareup.retrofit2:retrofit:2.7.2 ++| | | \--- com.squareup.okhttp3:okhttp:3.14.7 -> 4.8.1 (*) ++| | +--- com.squareup.retrofit2:converter-gson:2.7.2 ++| | | +--- com.squareup.retrofit2:retrofit:2.7.2 (*) +| | | \--- com.google.code.gson:gson:2.8.5 -> 2.8.6 +| | \--- com.squareup.okhttp3:logging-interceptor:3.12.7 +| | \--- com.squareup.okhttp3:okhttp:3.12.7 -> 4.8.1 (*) -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.3.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.8.0 +| | \--- com.google.code.gson:gson:2.8.6 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.3.0 -+| | +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.3.0 (*) ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.8.0 ++| | +--- com.mapbox.mapboxsdk:mapbox-sdk-geojson:5.8.0 (*) +| | \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 -+| \--- com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:5.3.0 -+| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.3.0 (*) ++| \--- com.mapbox.mapboxsdk:mapbox-sdk-directions-refresh-models:5.8.0 ++| +--- com.mapbox.mapboxsdk:mapbox-sdk-directions-models:5.8.0 (*) +| \--- androidx.annotation:annotation:1.0.0 -> 1.1.0 ++--- com.etesync:journalmanager:1.1.1 +| +--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71 -> 1.4.21 (*)