Update third party dependencies

pull/1632/head
Alex Baker 3 years ago
parent f7dcd2f023
commit e06d0ffb15

@ -1,10 +1,13 @@
import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
plugins {
id("com.android.application")
id("checkstyle")
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
kotlin("android")
kotlin("kapt")
id("com.cookpad.android.plugin.license-tools") version "1.2.6"
id("com.cookpad.android.plugin.license-tools") version "1.2.8"
id("com.github.ben-manes.versions") version "0.39.0"
id("com.vanniktech.android.junit.jacoco") version "0.16.0"
id("dagger.hilt.android.plugin")
@ -103,7 +106,7 @@ android {
@Suppress("LocalVariableName")
buildTypes {
getByName("debug") {
firebaseCrashlytics {
configure<CrashlyticsExtension> {
mappingFileUploadEnabled = false
}
val tasks_mapbox_key_debug: String? by project
@ -201,7 +204,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.kotlin}")
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
implementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
implementation("com.google.code.gson:gson:2.8.7")
implementation("com.google.code.gson:gson:2.8.8")
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.0")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
@ -224,7 +227,7 @@ dependencies {
implementation("com.etebase:client:2.3.2")
implementation("com.github.QuadFlask:colorpicker:0.0.15")
implementation("net.openid:appauth:0.8.1")
implementation("org.osmdroid:osmdroid-android:6.1.10@aar")
implementation("org.osmdroid:osmdroid-android:6.1.11@aar")
implementation("androidx.compose.ui:ui:${Versions.compose}")
implementation("androidx.compose.foundation:foundation:${Versions.compose}")
@ -254,11 +257,9 @@ dependencies {
androidTestImplementation("com.squareup.okhttp3:mockwebserver:${Versions.okhttp}")
testImplementation("junit:junit:4.13.2")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0")
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.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}")
testImplementation("org.ogce:xpp3:1.1.6")
}
apply(mapOf("plugin" to "com.google.gms.google-services"))

@ -6,8 +6,8 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle:7.0.2")
classpath("com.google.gms:google-services:4.3.8")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
classpath("com.google.gms:google-services:4.3.10")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt}")
}

@ -6,15 +6,15 @@ object Versions {
const val work = "2.7.0-beta01"
const val leakcanary = "2.7"
const val room = "2.3.0"
const val crashlytics = "18.0.0"
const val analytics = "19.0.0"
const val remote_config = "21.0.0"
const val crashlytics = "18.2.1"
const val analytics = "19.0.1"
const val remote_config = "21.0.1"
const val okhttp = "4.8.1"
const val flipper = "0.92.0"
const val flipper = "0.110.0"
const val mockito = "3.9.0"
const val androidx_test = "1.3.0"
const val make_it_easy = "4.0.1"
const val hilt = "2.37"
const val hilt = "2.38.1"
const val hilt_androidx = "1.0.0"
const val lifecycle = "2.3.0"
const val markwon = "4.6.2"

@ -216,12 +216,12 @@
+| +--- org.dmfs:lib-recur:0.11.4
+| | \--- org.dmfs:rfc5545-datetime:0.2.4
+| \--- org.dmfs:jems:1.33
++--- com.google.dagger:hilt-android:2.37
+| +--- com.google.dagger:dagger:2.37
++--- com.google.dagger:hilt-android:2.38.1
+| +--- com.google.dagger:dagger:2.38.1
+| | \--- javax.inject:javax.inject:1
+| +--- com.google.dagger:dagger-lint-aar:2.37
+| +--- com.google.dagger:hilt-core:2.37
+| | +--- com.google.dagger:dagger:2.37 (*)
+| +--- com.google.dagger:dagger-lint-aar:2.38.1
+| +--- com.google.dagger:hilt-core:2.38.1
+| | +--- com.google.dagger:dagger:2.38.1 (*)
+| | \--- javax.inject:javax.inject:1
+| +--- androidx.activity:activity:1.2.2 -> 1.3.1 (*)
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@ -234,7 +234,7 @@
++--- androidx.hilt:hilt-work:1.0.0
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.hilt:hilt-common:1.0.0
+| | \--- com.google.dagger:hilt-core:2.35 -> 2.37 (*)
+| | \--- com.google.dagger:hilt-core:2.35 -> 2.38.1 (*)
+| +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01
+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
@ -257,7 +257,7 @@
+| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
+| | +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
+| \--- com.google.dagger:hilt-android:2.35 -> 2.37 (*)
+| \--- com.google.dagger:hilt-android:2.35 -> 2.38.1 (*)
++--- androidx.fragment:fragment-ktx:1.3.6
+| +--- androidx.fragment:fragment:1.3.6 (*)
+| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.1
@ -322,7 +322,7 @@
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.21 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.21
+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.21 (*)
++--- com.google.code.gson:gson:2.8.7
++--- com.google.code.gson:gson:2.8.8
++--- com.google.android.material:material:1.4.0 (*)
++--- androidx.constraintlayout:constraintlayout:2.1.0 (*)
++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
@ -358,7 +358,7 @@
+| | \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*)
+| +--- com.google.http-client:google-http-client-gson:1.39.2
+| | +--- com.google.http-client:google-http-client:1.39.2 (*)
+| | \--- com.google.code.gson:gson:2.8.6 -> 2.8.7
+| | \--- com.google.code.gson:gson:2.8.6 -> 2.8.8
+| +--- com.google.guava:guava:30.1.1-android (*)
+| \--- com.google.http-client:google-http-client:1.39.2 (*)
++--- com.google.apis:google-api-services-drive:v3-rev20210725-1.32.1
@ -381,7 +381,7 @@
+| | \--- com.madgag.spongycastle:core:1.54.0.0
+| +--- com.squareup.okhttp3:logging-interceptor:3.12.1
+| | \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.8.1 (*)
+| +--- com.google.code.gson:gson:1.7.2 -> 2.8.7
+| +--- com.google.code.gson:gson:1.7.2 -> 2.8.8
+| +--- org.apache.commons:commons-collections4:4.1
+| +--- org.apache.commons:commons-lang3:3.8.1
+| \--- commons-codec:commons-codec:1.7 -> 1.11
@ -401,7 +401,7 @@
+| +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++--- org.osmdroid:osmdroid-android:6.1.10
++--- org.osmdroid:osmdroid-android:6.1.11
++--- androidx.compose.ui:ui:1.0.2
+| +--- androidx.compose.runtime:runtime-saveable:1.0.2
+| | +--- androidx.compose.runtime:runtime:1.0.2

@ -98,7 +98,7 @@
+| | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+| +--- androidx.databinding:databinding-runtime:7.0.2 (*)
+| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32 -> 1.5.21 (*)
++--- com.google.firebase:firebase-crashlytics:18.0.0
++--- com.google.firebase:firebase-crashlytics:18.2.1
+| +--- com.google.android.datatransport:transport-api:3.0.0
+| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- com.google.android.datatransport:transport-backend-cct:3.0.0
@ -140,8 +140,8 @@
+| \--- com.google.firebase:firebase-measurement-connector:18.0.2 -> 19.0.0
+| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| \--- com.google.firebase:firebase-annotations:16.0.0
++--- com.google.firebase:firebase-analytics:19.0.0
+| +--- com.google.android.gms:play-services-measurement:19.0.0
++--- com.google.firebase:firebase-analytics:19.0.1
+| +--- com.google.android.gms:play-services-measurement:19.0.1
+| | +--- 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.2.0
@ -154,35 +154,35 @@
+| | | \--- androidx.print:print:1.0.0
+| | | \--- androidx.annotation:annotation:1.0.0 -> 1.2.0
+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| | +--- com.google.android.gms:play-services-measurement-base:19.0.0
+| | +--- com.google.android.gms:play-services-measurement-base:19.0.1
+| | | \--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| | +--- com.google.android.gms:play-services-measurement-impl:19.0.0
+| | +--- com.google.android.gms:play-services-measurement-impl:19.0.1
+| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
+| | | +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
+| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| | | +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
+| | | +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
+| | | \--- 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.5.0 (*)
+| | \--- com.google.android.gms:play-services-stats:17.0.0 (*)
+| +--- com.google.android.gms:play-services-measurement-api:19.0.0
+| +--- com.google.android.gms:play-services-measurement-api:19.0.1
+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| | +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
+| | +--- com.google.android.gms:play-services-measurement-sdk-api:19.0.0
+| | +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
+| | +--- com.google.android.gms:play-services-measurement-sdk-api:19.0.1
+| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| | | \--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
+| | | \--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
+| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 17.2.0 (*)
+| | +--- com.google.firebase:firebase-common:20.0.0 (*)
+| | +--- com.google.firebase:firebase-components:17.0.0 (*)
+| | +--- com.google.firebase:firebase-installations:17.0.0 (*)
+| | +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
+| | \--- com.google.firebase:firebase-measurement-connector:19.0.0 (*)
+| \--- com.google.android.gms:play-services-measurement-sdk:19.0.0
+| \--- com.google.android.gms:play-services-measurement-sdk:19.0.1
+| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
+| +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
+| +--- com.google.android.gms:play-services-measurement-base:19.0.0 (*)
+| \--- com.google.android.gms:play-services-measurement-impl:19.0.0 (*)
++--- com.google.firebase:firebase-config-ktx:21.0.0
+| +--- com.google.android.gms:play-services-measurement-base:19.0.1 (*)
+| \--- com.google.android.gms:play-services-measurement-impl:19.0.1 (*)
++--- com.google.firebase:firebase-config-ktx:21.0.1
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- com.google.firebase:firebase-abt:21.0.0
+| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 17.5.0 (*)
@ -196,7 +196,7 @@
+| | +--- com.google.firebase:firebase-components:17.0.0 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.21 (*)
+| +--- com.google.firebase:firebase-components:17.0.0 (*)
+| +--- com.google.firebase:firebase-config:21.0.0
+| +--- com.google.firebase:firebase-config:21.0.1
+| | +--- com.google.android.gms:play-services-tasks:17.0.2 -> 17.2.0 (*)
+| | +--- com.google.firebase:firebase-abt:21.0.0 (*)
+| | +--- com.google.firebase:firebase-common:20.0.0 (*)
@ -335,12 +335,12 @@
+| +--- org.dmfs:lib-recur:0.11.4
+| | \--- org.dmfs:rfc5545-datetime:0.2.4
+| \--- org.dmfs:jems:1.33
++--- com.google.dagger:hilt-android:2.37
+| +--- com.google.dagger:dagger:2.37
++--- com.google.dagger:hilt-android:2.38.1
+| +--- com.google.dagger:dagger:2.38.1
+| | \--- javax.inject:javax.inject:1
+| +--- com.google.dagger:dagger-lint-aar:2.37
+| +--- com.google.dagger:hilt-core:2.37
+| | +--- com.google.dagger:dagger:2.37 (*)
+| +--- com.google.dagger:dagger-lint-aar:2.38.1
+| +--- com.google.dagger:hilt-core:2.38.1
+| | +--- com.google.dagger:dagger:2.38.1 (*)
+| | \--- javax.inject:javax.inject:1
+| +--- androidx.activity:activity:1.2.2 -> 1.3.1 (*)
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
@ -353,7 +353,7 @@
++--- androidx.hilt:hilt-work:1.0.0
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| +--- androidx.hilt:hilt-common:1.0.0
+| | \--- com.google.dagger:hilt-core:2.35 -> 2.37 (*)
+| | \--- com.google.dagger:hilt-core:2.35 -> 2.38.1 (*)
+| +--- androidx.work:work-runtime:2.3.4 -> 2.7.0-beta01
+| | +--- androidx.annotation:annotation-experimental:1.0.0 -> 1.1.0
+| | +--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
@ -376,7 +376,7 @@
+| | +--- androidx.sqlite:sqlite-framework:2.1.0 (*)
+| | +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
+| | \--- androidx.lifecycle:lifecycle-service:2.1.0 -> 2.2.0 (*)
+| \--- com.google.dagger:hilt-android:2.35 -> 2.37 (*)
+| \--- com.google.dagger:hilt-android:2.35 -> 2.38.1 (*)
++--- androidx.fragment:fragment-ktx:1.3.6
+| +--- androidx.fragment:fragment:1.3.6 (*)
+| +--- androidx.activity:activity-ktx:1.2.2 -> 1.3.1
@ -441,7 +441,7 @@
+| | +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.70 -> 1.5.21 (*)
+| | \--- org.jetbrains.kotlin:kotlin-stdlib-common:1.3.70 -> 1.5.21
+| \--- org.jetbrains.kotlin:kotlin-stdlib:1.3.72 -> 1.5.21 (*)
++--- com.google.code.gson:gson:2.8.7
++--- com.google.code.gson:gson:2.8.8
++--- com.google.android.material:material:1.4.0 (*)
++--- androidx.constraintlayout:constraintlayout:2.1.0 (*)
++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
@ -477,7 +477,7 @@
+| | \--- com.google.guava:guava:30.1-android -> 30.1.1-android (*)
+| +--- com.google.http-client:google-http-client-gson:1.39.2
+| | +--- com.google.http-client:google-http-client:1.39.2 (*)
+| | \--- com.google.code.gson:gson:2.8.6 -> 2.8.7
+| | \--- com.google.code.gson:gson:2.8.6 -> 2.8.8
+| +--- com.google.guava:guava:30.1.1-android (*)
+| \--- com.google.http-client:google-http-client:1.39.2 (*)
++--- com.google.apis:google-api-services-drive:v3-rev20210725-1.32.1
@ -500,7 +500,7 @@
+| | \--- com.madgag.spongycastle:core:1.54.0.0
+| +--- com.squareup.okhttp3:logging-interceptor:3.12.1
+| | \--- com.squareup.okhttp3:okhttp:3.12.1 -> 4.8.1 (*)
+| +--- com.google.code.gson:gson:1.7.2 -> 2.8.7
+| +--- com.google.code.gson:gson:1.7.2 -> 2.8.8
+| +--- org.apache.commons:commons-collections4:4.1
+| +--- org.apache.commons:commons-lang3:3.8.1
+| \--- commons-codec:commons-codec:1.7 -> 1.11
@ -520,7 +520,7 @@
+| +--- androidx.core:core:1.1.0 -> 1.5.0 (*)
+| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
+| \--- com.google.guava:listenablefuture:1.0 -> 9999.0-empty-to-avoid-conflict-with-guava
++--- org.osmdroid:osmdroid-android:6.1.10
++--- org.osmdroid:osmdroid-android:6.1.11
++--- androidx.compose.ui:ui:1.0.2
+| +--- androidx.compose.runtime:runtime-saveable:1.0.2
+| | +--- androidx.compose.runtime:runtime:1.0.2

Loading…
Cancel
Save