This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/main by this push:
new e27563d7 remove guava upgrade hack (#279)
e27563d7 is described below
commit e27563d7167704d4364e00aab6283be837a2304a
Author: PJ Fanning <[email protected]>
AuthorDate: Sat Apr 6 17:44:12 2024 +0200
remove guava upgrade hack (#279)
* remove guava upgrade hack
* Update Dependencies.scala
---
gradle-plugin/build.gradle | 1 -
project/Dependencies.scala | 17 ++++-------------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle
index 61220345..b8e4d301 100644
--- 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
index 3b63e64b..58fcb4e2 100644
--- 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,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
