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

[backport to 1.2] Bump protoc #2561

Merged
merged 12 commits into from
Dec 6, 2024
4 changes: 2 additions & 2 deletions .github/workflows/java-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "26.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Create secret key ring file
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "26.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Start standalone Valkey server
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "26.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build java client
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
- name: Install protoc (protobuf)
uses: arduino/setup-protoc@v3
with:
version: "26.1"
version: "28.2"
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Build java wrapper
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#### Changes
* Java: Bump protobuf (protoc) version ([#2561](https://github.com/valkey-io/valkey-glide/pull/2561))
* Java: bump `netty` version ([#2777](https://github.com/valkey-io/valkey-glide/pull/2777))

#### Breaking Changes
Expand Down
12 changes: 6 additions & 6 deletions java/DEVELOPER.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The Valkey GLIDE Java wrapper consists of both Java and Rust code. Rust bindings
- git
- GCC
- pkg-config
- protoc (protobuf compiler) >= 26.1
- protoc (protobuf compiler) >= 28.2
- openssl
- openssl-dev
- rustup
Expand Down Expand Up @@ -64,17 +64,17 @@ Continue with **Install protobuf compiler** below.
To install protobuf for MacOS, run:
```bash
brew install protobuf
# Check that the protobuf compiler version 26.1 or higher is installed
# Check that the protobuf compiler version 28.2 or higher is installed
protoc --version
```

For the remaining systems, do the following:
```bash
PB_REL="https://github.com/protocolbuffers/protobuf/releases"
curl -LO $PB_REL/download/v26.1/protoc-26.1-linux-x86_64.zip
unzip protoc-26.1-linux-x86_64.zip -d $HOME/.local
curl -LO $PB_REL/download/v28.2/protoc-28.2-linux-x86_64.zip
unzip protoc-28.2-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
# Check that the protobuf compiler version 26.1 or higher is installed
# Check that the protobuf compiler version 28.2 or higher is installed
protoc --version
```

Expand Down Expand Up @@ -165,7 +165,7 @@ Some troubleshooting issues:
- Failed to find `cargo` after `rustup`.
- No Protobuf compiler (protoc) found.
- If build fails because of rust compiler fails, make sure submodules are updated using `git submodule update`.
- If protobuf 26.0 or earlier is detected, upgrade to the latest protobuf release.
- If protobuf 28.0 or earlier is detected, upgrade to the latest protobuf release.

## Running Examples App

Expand Down
10 changes: 5 additions & 5 deletions java/client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ repositories {
}

dependencies {
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.27.1'
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.28.2'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'

implementation group: 'io.netty', name: 'netty-handler', version: '4.1.115.Final'
Expand All @@ -38,11 +38,11 @@ dependencies {

ext {
checkProtocVersion = { String output ->
// Line in format like: libprotoc 26.1
// Line in format like: libprotoc 28.1
int majorVersion = Integer.parseInt(output.split(" ")[1].split("\\.")[0].trim());
int minorVersion = Integer.parseInt(output.split(" ")[1].split("\\.")[1].trim());
if (majorVersion < 26 || (majorVersion == 26 && minorVersion < 1)) {
throw new GradleException("Protobuf compiler (protoc) version 26.1 or newer is required. Current version: $output");
if (majorVersion < 28) {
throw new GradleException("Protobuf compiler (protoc) version 28.0 or newer is required. Current version: $output");
}
return output.split(" ")[1]
}
Expand All @@ -61,7 +61,7 @@ tasks.register('protobuf', Exec) {
}
} catch (Exception e) {
if (e.getMessage().startsWith("A problem occurred starting process")) {
throw new GradleException("No Protobuf compiler (protoc) found. Protobuf compiler version 26.1 or newer is required.");
throw new GradleException("No Protobuf compiler (protoc) found. Protobuf compiler version 28.0 or newer is required.");
}
throw e
}
Expand Down
Loading