Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DRAFT] io.grpc 1.59 #190

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benchmark-java/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g", "-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)

val grpcVersion = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.59.0" // checked synced by VersionSyncCheckPlugin

val runtimeProject = ProjectRef(file("../"), "runtime")

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ lazy val interopTests = Project(id = "interop-tests", base = file("interop-tests
ReflectiveCodeGen.generatedLanguages := Seq("Scala", "Java"),
ReflectiveCodeGen.extraGenerators := Seq("ScalaMarshallersCodeGenerator"),
ReflectiveCodeGen.codeGeneratorSettings ++= Seq("server_power_apis"),
// grpc 1.54.2 brings in extra unnecessary proto files that cause build issues
// grpc 1.59.0 brings in extra unnecessary proto files that cause build issues
PB.generate / excludeFilter := new SimpleFileFilter(f => f.getAbsolutePath().contains("envoy")),
PB.protocVersion := Dependencies.Versions.googleProtoc,
// We need to be able to publish locally in order for sbt interopt tests to work
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import org.gradle.api.Project

class PekkoGrpcPluginExtension {

static final String PROTOC_VERSION = "3.20.1" // checked synced by VersionSyncCheckPlugin
static final String PROTOC_VERSION = "3.24.0" // checked synced by VersionSyncCheckPlugin

static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"

static final String GRPC_VERSION = "1.54.2" // checked synced by VersionSyncCheckPlugin
static final String GRPC_VERSION = "1.59.0" // checked synced by VersionSyncCheckPlugin

static final String PLUGIN_CODE = 'org.apache.pekko.grpc.gradle'

Expand Down
4 changes: 2 additions & 2 deletions maven-plugin/src/main/maven/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<protocVersion implementation="java.lang.String" default-value="-v3.24.0">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
Expand Down Expand Up @@ -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.1">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<protocVersion implementation="java.lang.String" default-value="-v3.24.0">${pekko-grpc.protoc-version}</protocVersion> <!-- checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
<pekko.http.version>1.0.0</pekko.http.version>
<grpc.version>1.54.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.59.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
2 changes: 1 addition & 1 deletion plugin-tester-scala/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<pekko.version>1.0.1</pekko.version>
<pekko.http.version>1.0.0</pekko.http.version>
<grpc.version>1.54.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<grpc.version>1.59.0</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>

Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ object Dependencies {
val pekkoHttp = "1.0.0"
val pekkoHttpBinary = "current"

val grpc = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpc = "1.59.0" // checked synced by VersionSyncCheckPlugin
// 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 googleProtoc = "3.20.1" // checked synced by VersionSyncCheckPlugin
val googleProtobufJava = "3.21.12"
val googleProtoc = "3.24.0" // checked synced by VersionSyncCheckPlugin
val googleProtobufJava = "3.24.0"

val scalaTest = "3.2.15"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ scalaVersion := "2.12.18"

organization := "org.apache.pekko"

val grpcVersion = "1.54.2" // checked synced by VersionSyncCheckPlugin
val grpcVersion = "1.59.0" // checked synced by VersionSyncCheckPlugin

libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
Expand Down
Loading