remove guava upgrade hack (#279)

* remove guava upgrade hack * Update Dependencies.scala
apache · Apr 6, 2024 · e27563d · e27563d
1 parent d358680
commit e27563d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
@@ -127,7 +127,6 @@ repositories {
 dependencies {
   implementation 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
   implementation 'commons-lang:commons-lang:2.6'
-  runtimeOnly 'com.google.guava:guava:32.1.2-android'
   testImplementation 'junit:junit:4.13.2'
   testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
 }

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -56,15 +56,10 @@ object Dependencies {
     val scalapbRuntime = ("com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion)
       .exclude("io.grpc", "grpc-netty")
 
-    // we force the use of a newer version of guava due to CVEs
-    val grpcCore = ("io.grpc" % "grpc-core" % Versions.grpc)
-      .excludeAll("com.google.guava" % "guava")
-    val grpcProtobuf = ("io.grpc" % "grpc-protobuf" % Versions.grpc)
-      .excludeAll("com.google.guava" % "guava")
-    val grpcNettyShaded = ("io.grpc" % "grpc-netty-shaded" % Versions.grpc)
-      .excludeAll("com.google.guava" % "guava")
-    val grpcStub = ("io.grpc" % "grpc-stub" % Versions.grpc)
-      .excludeAll("com.google.guava" % "guava")
+    val grpcCore = "io.grpc" % "grpc-core" % Versions.grpc
+    val grpcProtobuf = "io.grpc" % "grpc-protobuf" % Versions.grpc
+    val grpcNettyShaded = "io.grpc" % "grpc-netty-shaded" % Versions.grpc
+    val grpcStub = "io.grpc" % "grpc-stub" % Versions.grpc
 
     // Excluding grpc-alts works around a complex resolution bug
     // Details are in https://github.com/akka/akka-grpc/pull/469
@@ -91,7 +86,6 @@ object Dependencies {
 
   object Runtime {
     val logback = "ch.qos.logback" % "logback-classic" % "1.3.14" % "runtime"
-    val guavaAndroid = "com.google.guava" % "guava" % "32.1.2-android" % "runtime"
   }
 
   object Protobuf {
@@ -109,7 +103,6 @@ object Dependencies {
     Compile.scalapbCompilerPlugin,
     Protobuf.protobufJava, // or else scalapb pulls older version in transitively
     Compile.grpcProtobuf,
-    Runtime.guavaAndroid, // forces a newer version than grpc-protobuf defaults too
     Test.scalaTest)
 
   lazy val runtime = l ++= Seq(
@@ -119,7 +112,6 @@ object Dependencies {
     Compile.grpcCore,
     Compile.grpcStub % Provided, // comes from the generators
     Compile.grpcNettyShaded,
-    Runtime.guavaAndroid, // forces a newer version than grpc-core/grpc-protobuf default too
     Compile.pekkoStream,
     Compile.pekkoHttpCore,
     Compile.pekkoHttp,
@@ -158,7 +150,6 @@ object Dependencies {
   lazy val pluginTester = l ++= Seq(
     // usually automatically added by `suggestedDependencies`, which doesn't work with ReflectiveCodeGen
     Compile.grpcStub,
-    Runtime.guavaAndroid,
     Compile.pekkoHttpCors,
     Compile.pekkoHttp,
     Test.scalaTest,