diff --git a/app/build.gradle b/app/build.gradle index 0ef8e255..3c84eca3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -117,7 +117,6 @@ dependencies { implementation Deps.kotlinx_coroutines implementation(Deps.zxing) { transitive = false } implementation Deps.zxing_core - implementation Deps.guava_conflict_resolver implementation Deps.hilt kapt Deps.hilt_compiler diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt index d45dae63..9019df51 100644 --- a/buildSrc/src/main/java/AppConfig.kt +++ b/buildSrc/src/main/java/AppConfig.kt @@ -25,7 +25,7 @@ import org.gradle.api.JavaVersion object Config { const val minSdk = 26 const val compileSdk = 29 - const val targetSdk = 29 + const val targetSdk = 30 val javaVersion = JavaVersion.VERSION_1_8 const val versionCode = 30 diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index d8117f3d..7062ec4b 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -58,7 +58,6 @@ object Deps { const val zxing = "com.journeyapps:zxing-android-embedded:${Versions.zxing}" const val zxing_core = "com.google.zxing:core:${Versions.zxing_core}" - const val guava_conflict_resolver = "com.google.guava:listenablefuture:${Versions.guave_conflict_resolver_version}" const val kotlin_reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin_reflect}" const val java_cose = "com.augustcellars.cose:cose-java:${Versions.java_cose}" const val json_validation = "com.github.java-json-tools:json-schema-validator:${Versions.json_validation}" diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 9640d12c..09376724 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -45,7 +45,7 @@ object Versions { const val hilt_version = "2.33-beta" const val google_licenses_version = "0.10.4" const val retrofit = "2.9.0" - const val logging_interceptor = "4.0.1" + const val logging_interceptor = "4.9.2" const val gson_converter = "2.1.0" const val timber = "4.7.1" @@ -55,7 +55,6 @@ object Versions { // QR const val zxing = "4.2.0" const val zxing_core = "3.3.0" - const val guave_conflict_resolver_version = "9999.0-empty-to-avoid-conflict-with-guava" // Decoder const val kotlin_reflect = "1.4.32"