Skip to content

Commit

Permalink
chore(protoc, grpc): bumped proto and grpc versions for java, python …
Browse files Browse the repository at this point in the history
  • Loading branch information
moritzzimmer committed May 29, 2024
1 parent 3be0787 commit 4fdad18
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
* @moritzzimmer @harryherbig @thisismana @bobaaaaa @saefty @vmk1vmk @jadiedrich
# t-online.de team
* @moritzzimmer @harryherbig @thisismana @bobaaaaa @saefty @bastianpahlke
2 changes: 1 addition & 1 deletion buf.gen.go.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: v1

plugins:
- plugin: buf.build/protocolbuffers/go:v1.31.0
- plugin: buf.build/protocolbuffers/go:v1.34.1
out: gen/go
opt:
- module=github.com/stroeer/go-tapir
Expand Down
2 changes: 1 addition & 1 deletion buf.gen.node-proto.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: v1

plugins:
- plugin: buf.build/bufbuild/es:v1.3.1
- plugin: buf.build/bufbuild/es:v1.9.0
out: ./node-proto/
opt:
- target=ts
8 changes: 4 additions & 4 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ managed:

plugins:
# Java
- plugin: buf.build/protocolbuffers/java:v24.4
- plugin: buf.build/protocolbuffers/java:v25.3
out: ./java/src/main/java

- plugin: buf.build/grpc/java:v1.59.0
- plugin: buf.build/grpc/java:v1.64.0
out: ./java/src/main/java

# Python
- plugin: buf.build/protocolbuffers/python:v24.4
- plugin: buf.build/protocolbuffers/python:v25.3
out: gen/python

- plugin: buf.build/grpc/python:v1.59.2
- plugin: buf.build/grpc/python:v1.64.0
out: gen/python
10 changes: 6 additions & 4 deletions java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'idea'
id 'java-library'
id 'maven-publish'
id 'com.github.ben-manes.versions' version '0.49.0'
id 'com.github.ben-manes.versions' version '0.51.0'
}

ext {
Expand All @@ -21,15 +21,17 @@ repositories {
}

dependencies {
def protoc = '3.24.4'
def protoc = '3.25.1'
def grpc = '1.64.0'

implementation group: 'io.grpc', name: 'grpc-services', version: '1.59.0'
implementation group: 'io.grpc', name: 'grpc-services', version: grpc
implementation group: 'io.grpc', name: 'grpc-protobuf', version: grpc
implementation group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'

implementation group: 'com.google.protobuf', name: 'protobuf-java', version: protoc
implementation group: 'com.google.protobuf', name: 'protobuf-java-util', version: protoc

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.0'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: '5.10.2'
}

task printVersion {
Expand Down
Binary file modified java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion java/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions java/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down

0 comments on commit 4fdad18

Please sign in to comment.