try to just upgrade protobuf java version

apache · Jul 27, 2023 · 131ac70 · 131ac70
1 parent bb87cda
commit 131ac70
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
@@ -5,7 +5,7 @@ import org.gradle.api.Project
 
 class PekkoGrpcPluginExtension {
 
-    static final String PROTOC_VERSION = "3.20.3" // checked synced by VersionSyncCheckPlugin
+    static final String PROTOC_VERSION = "3.20.1" // checked synced by VersionSyncCheckPlugin
 
     static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"
 

diff --git a/maven-plugin/src/main/maven/plugin.xml b/maven-plugin/src/main/maven/plugin.xml
@@ -95,7 +95,7 @@
         <extraGenerators implementation="java.util.List" default-value=""/>
         <protoPaths default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${pekko-grpc.protoPaths}</protoPaths>
         <outputDirectory default-value="${project.build.directory}/generated-sources">${pekko-grpc.outputDirectory}</outputDirectory>
-	<protocVersion implementation="java.lang.String" default-value="-v3.20.3">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
+	<protocVersion implementation="java.lang.String" default-value="-v3.20.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
         <includeStdTypes implementation="boolean" default-value="false" />
       </configuration>
     </mojo>
@@ -187,7 +187,7 @@
         <extraGenerators implementation="java.util.List" default-value=""/>
         <protoPaths default-value="src/test/proto,src/test/protobuf">${pekko-grpc.protoPaths}</protoPaths>
         <outputDirectory default-value="target/generated-test-sources">${pekko-grpc.outputDirectory}</outputDirectory>
-        <protocVersion implementation="java.lang.String" default-value="-v3.20.3">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
+        <protocVersion implementation="java.lang.String" default-value="-v3.20.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
         <includeStdTypes implementation="boolean" default-value="false" />
       </configuration>
     </mojo>

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -35,7 +35,8 @@ object Dependencies {
     // Even referenced explicitly in the sbt-plugin's sbt-tests
     // If changing this, remember to update protoc plugin version to align in
     // maven-plugin/src/main/maven/plugin.xml and org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
-    val googleProtobuf = "3.20.3" // checked synced by VersionSyncCheckPlugin
+    val googleProtoc = "3.20.1" // checked synced by VersionSyncCheckPlugin
+    val googleProtobufJava = "3.20.3" // checked synced by VersionSyncCheckPlugin
 
     val scalaTest = "3.2.15"
 
@@ -87,8 +88,8 @@ object Dependencies {
   }
 
   object Protobuf {
-    val protobufJava = "com.google.protobuf" % "protobuf-java" % Versions.googleProtobuf
-    val googleCommonProtos = "com.google.protobuf" % "protobuf-java" % Versions.googleProtobuf % "protobuf"
+    val protobufJava = "com.google.protobuf" % "protobuf-java" % Versions.googleProtobufJava
+    val googleCommonProtos = "com.google.protobuf" % "protobuf-java" % Versions.googleProtobufJava % "protobuf"
   }
 
   object Plugins {

diff --git a/project/VersionSyncCheckPlugin.scala b/project/VersionSyncCheckPlugin.scala
@@ -40,7 +40,7 @@ object VersionSyncCheckPlugin extends AutoPlugin {
         Paths.get("gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy"))).value,
     googleProtobufVersionSyncCheck := versionSyncCheckImpl(
       "Google Protobuf",
-      Dependencies.Versions.googleProtobuf,
+      Dependencies.Versions.googleProtoc,
       raw"""(?i)protoc_?version.*= ?"-?v?(\d+\.\d+\.\d+)"""".r.unanchored,
       Seq(
         Paths.get("maven-plugin/src/main/maven/plugin.xml"),