From 1992a2a4c4fb97526d8b3da989a29fb38e95b450 Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 11 Apr 2022 08:56:22 -0400 Subject: [PATCH] Update ACRA (cherry picked from commit 80635343aee56a5aa051403b70d41195be977c65) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/App.kt --- app/build.gradle.kts | 2 +- gradle/androidx.versions.toml | 4 +++- gradle/libs.versions.toml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ca8a37b02..bf7525343 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -138,7 +138,7 @@ dependencies { implementation(androidx.bundles.lifecycle) // Job scheduling - implementation(androidx.work.runtime) + implementation(androidx.bundles.workmanager) // RX implementation(libs.bundles.reactivex) diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index 76d3ed310..b051c785b 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -19,9 +19,11 @@ lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.r lifecycle-runtimektx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle_version" } work-runtime = "androidx.work:work-runtime-ktx:2.6.0" +guava = "com.google.guava:guava:31.1-android" [bundles] -lifecycle = ["lifecycle-common","lifecycle-process","lifecycle-runtimektx"] +lifecycle = ["lifecycle-common", "lifecycle-process", "lifecycle-runtimektx"] +workmanager = ["work-runtime", "guava"] [plugins] application = { id = "com.android.application", version.ref="agp_version"} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a86d9bf8c..b7353e5d9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -76,7 +76,7 @@ flowbinding-viewpager = { module = "io.github.reactivecircus.flowbinding:flowbin logcat = "com.squareup.logcat:logcat:0.1" -acra-http = "ch.acra:acra-http:5.8.4" +acra-http = "ch.acra:acra-http:5.9.0" firebase-analytics = "com.google.firebase:firebase-analytics-ktx:20.0.2" aboutlibraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "aboutlib_version" }