From 3a4ea7eefddcb635d3ad7becec57e68638b2ef81 Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Wed, 1 Feb 2023 15:16:48 -0500 Subject: [PATCH] [#907] Remove Guava dependency --- gradle.properties | 1 - sdk-lib/build.gradle.kts | 10 ---------- settings.gradle.kts | 2 -- 3 files changed, 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8172c74f..0486a431 100644 --- a/gradle.properties +++ b/gradle.properties @@ -120,7 +120,6 @@ GOOGLE_MATERIAL_VERSION=1.7.0 GRPC_KOTLIN_VERSION=1.3.0 GRPC_VERSION=1.52.1 GSON_VERSION=2.9.0 -GUAVA_VERSION=31.1-android JACOCO_VERSION=0.8.8 JAVAX_ANNOTATION_VERSION=1.3.2 JUNIT_VERSION=5.9.1 diff --git a/sdk-lib/build.gradle.kts b/sdk-lib/build.gradle.kts index 4e379c52..df15dec5 100644 --- a/sdk-lib/build.gradle.kts +++ b/sdk-lib/build.gradle.kts @@ -249,16 +249,6 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.android) - // - // Locked Versions - // these should be checked regularly and removed when possible - - // solves error: Duplicate class com.google.common.util.concurrent.ListenableFuture found in modules - // jetified-guava-26.0-android.jar (com.google.guava:guava:26.0-android) and listenablefuture-1.0.jar - // (com.google.guava:listenablefuture:1.0) per this recommendation from Chris Povirk, given guava's decision to - // split ListenableFuture away from Guava: https://groups.google.com/d/msg/guava-discuss/GghaKwusjcY/bCIAKfzOEwAJ - implementation(libs.guava) - // Tests testImplementation(libs.kotlin.reflect) testImplementation(libs.kotlin.test) diff --git a/settings.gradle.kts b/settings.gradle.kts index a177d3d6..e30472a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -99,7 +99,6 @@ dependencyResolutionManagement { val grpcJavaVersion = extra["GRPC_VERSION"].toString() val grpcKotlinVersion = extra["GRPC_KOTLIN_VERSION"].toString() val gsonVersion = extra["GSON_VERSION"].toString() - val guavaVersion = extra["GUAVA_VERSION"].toString() val javaVersion = extra["ANDROID_JVM_TARGET"].toString() val javaxAnnotationVersion = extra["JAVAX_ANNOTATION_VERSION"].toString() val junitVersion = extra["JUNIT_VERSION"].toString() @@ -158,7 +157,6 @@ dependencyResolutionManagement { library("grpc-protobuf", "io.grpc:grpc-protobuf-lite:$grpcJavaVersion") library("grpc-stub", "io.grpc:grpc-stub:$grpcJavaVersion") library("gson", "com.google.code.gson:gson:$gsonVersion") - library("guava", "com.google.guava:guava:$guavaVersion") library("javax-annotation", "javax.annotation:javax.annotation-api:$javaxAnnotationVersion") library("kotlin-reflect", "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion") library("kotlin-stdlib", "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")