Skip to content

Commit 064272c

Browse files
committed
Upgrade dependencies
Also add a mention in RELEASING.md that we should check github actions for updates.
1 parent bc04027 commit 064272c

17 files changed

Lines changed: 76 additions & 64 deletions

File tree

.github/workflows/branch-testing.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
fail-fast: false # Should swap to true if we grow a large matrix
2121

2222
steps:
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-java@v4
23+
- uses: actions/checkout@v6
24+
- uses: actions/setup-java@v5
2525
with:
2626
java-version: ${{ matrix.jre }}
2727
distribution: 'temurin'
2828

2929
- name: Gradle cache
30-
uses: actions/cache@v4
30+
uses: actions/cache@v5
3131
with:
3232
path: |
3333
~/.gradle/caches

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
name: "Gradle wrapper validation"
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: gradle/actions/wrapper-validation@v4
12+
- uses: actions/checkout@v6
13+
- uses: gradle/actions/wrapper-validation@v6

.github/workflows/lock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
lock:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: dessant/lock-threads@v5
16+
- uses: dessant/lock-threads@v6
1717
with:
1818
github-token: ${{ github.token }}
1919
issue-inactive-days: 90

.github/workflows/testing.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
fail-fast: false # Should swap to true if we grow a large matrix
2222

2323
steps:
24-
- uses: actions/checkout@v4
25-
- uses: actions/setup-java@v4
24+
- uses: actions/checkout@v6
25+
- uses: actions/setup-java@v5
2626
with:
2727
java-version: ${{ matrix.jre }}
2828
distribution: 'temurin'
2929

3030
- name: Gradle cache
31-
uses: actions/cache@v4
31+
uses: actions/cache@v5
3232
with:
3333
path: |
3434
~/.gradle/caches
@@ -37,7 +37,7 @@ jobs:
3737
restore-keys: |
3838
${{ runner.os }}-gradle-
3939
- name: Maven cache
40-
uses: actions/cache@v4
40+
uses: actions/cache@v5
4141
with:
4242
path: |
4343
~/.m2/repository
@@ -46,7 +46,7 @@ jobs:
4646
restore-keys: |
4747
${{ runner.os }}-maven-
4848
- name: Protobuf cache
49-
uses: actions/cache@v4
49+
uses: actions/cache@v5
5050
with:
5151
path: /tmp/protobuf-cache
5252
key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }}
@@ -55,7 +55,7 @@ jobs:
5555
run: buildscripts/kokoro/unix.sh
5656
- name: Post Failure Upload Test Reports to Artifacts
5757
if: ${{ failure() }}
58-
uses: actions/upload-artifact@v4
58+
uses: actions/upload-artifact@v7
5959
with:
6060
name: Test Reports (JRE ${{ matrix.jre }})
6161
path: |
@@ -71,7 +71,7 @@ jobs:
7171
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
7272
run: ./gradlew :grpc-all:coveralls -PskipAndroid=true -x compileJava
7373
- name: Codecov
74-
uses: codecov/codecov-action@v4
74+
uses: codecov/codecov-action@v6
7575
with:
7676
token: ${{ secrets.CODECOV_TOKEN }}
7777

@@ -88,15 +88,15 @@ jobs:
8888
USE_BAZEL_VERSION: ${{ matrix.bazel_version }}
8989

9090
steps:
91-
- uses: actions/checkout@v4
91+
- uses: actions/checkout@v6
9292

9393
- name: Check versions match in MODULE.bazel and repositories.bzl
9494
run: |
9595
diff -u <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' MODULE.bazel) \
9696
<(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' repositories.bzl)
9797
9898
- name: Bazel cache
99-
uses: actions/cache@v4
99+
uses: actions/cache@v5
100100
with:
101101
path: |
102102
~/.cache/bazel/*/cache

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
1313
"com.google.auto.value:auto-value-annotations:1.11.0",
1414
"com.google.auto.value:auto-value:1.11.0",
1515
"com.google.code.findbugs:jsr305:3.0.2",
16-
"com.google.code.gson:gson:2.13.2",
17-
"com.google.errorprone:error_prone_annotations:2.48.0",
16+
"com.google.code.gson:gson:2.14.0",
17+
"com.google.errorprone:error_prone_annotations:2.50.0",
1818
"com.google.guava:failureaccess:1.0.1",
19-
"com.google.guava:guava:33.5.0-android",
19+
"com.google.guava:guava:33.6.0-android",
2020
"com.google.re2j:re2j:1.8",
2121
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
2222
"com.google.truth:truth:1.4.5",
23-
"dev.cel:runtime:0.12.0",
24-
"dev.cel:protobuf:0.12.0",
25-
"dev.cel:common:0.12.0",
23+
"dev.cel:runtime:0.13.0",
24+
"dev.cel:protobuf:0.13.0",
25+
"dev.cel:common:0.13.0",
2626
"com.squareup.okhttp:okhttp:2.7.5",
2727
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
2828
"io.netty:netty-buffer:4.2.15.Final",

RELEASING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,3 +250,7 @@ gRPC for things that will need a migration effort.
250250
When happy with the dependency upgrades, update the versions in `MODULE.bazel`,
251251
`repositories.bzl`, and the various `pom.xml` and `build.gradle` files in
252252
`examples/`.
253+
254+
Upgrade the `uses:` for actions in `.github/workflows` to newer versions. Make
255+
sure to see what changed in each new major version, but it is most often just
256+
requiring a newer Node.js version.

examples/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ java {
2222
// Feel free to delete the comment at the next line. It is just for safely
2323
// updating the version in our release process.
2424
def grpcVersion = '1.83.0-SNAPSHOT' // CURRENT_GRPC_VERSION
25-
def protobufVersion = '3.25.8'
25+
def protobufVersion = '3.25.9'
2626
def protocVersion = protobufVersion
2727

2828
dependencies {

examples/example-gauth/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency><!-- upgrade version from google-auth-library-oauth2-http -->
3232
<groupId>com.google.code.gson</groupId>
3333
<artifactId>gson</artifactId>
34-
<version>2.13.2</version>
34+
<version>2.14.0</version>
3535
</dependency>
3636
</dependencies>
3737
</dependencyManagement>

examples/example-gcp-csm-observability/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ java {
2424
// updating the version in our release process.
2525
def grpcVersion = '1.83.0-SNAPSHOT' // CURRENT_GRPC_VERSION
2626
def protocVersion = '3.25.8'
27-
def openTelemetryVersion = '1.56.0'
28-
def openTelemetryPrometheusVersion = '1.56.0-alpha'
27+
def openTelemetryVersion = '1.63.0'
28+
def openTelemetryPrometheusVersion = '1.63.0-alpha'
2929

3030
dependencies {
3131
implementation "io.grpc:grpc-protobuf:${grpcVersion}"

examples/example-hostname/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'java'
44

55
id "com.google.protobuf" version "0.9.5"
6-
id 'com.google.cloud.tools.jib' version '3.4.4' // For releasing to Docker Hub
6+
id 'com.google.cloud.tools.jib' version '3.5.3' // For releasing to Docker Hub
77
}
88

99
repositories {

0 commit comments

Comments
 (0)