Skip to content

Commit 382585e

Browse files
committed
Version upgrades following 1.83 release
1 parent 7fdcde1 commit 382585e

10 files changed

Lines changed: 41 additions & 41 deletions

File tree

.github/workflows/branch-testing.yml

Lines changed: 2 additions & 2 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@v6
23+
- uses: actions/checkout@v7
2424
- uses: actions/setup-java@v5
2525
with:
2626
java-version: ${{ matrix.jre }}
2727
distribution: 'temurin'
2828

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

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

Lines changed: 1 addition & 1 deletion
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@v6
12+
- uses: actions/checkout@v7
1313
- uses: gradle/actions/wrapper-validation@v6

.github/workflows/testing.yml

Lines changed: 7 additions & 7 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@v6
24+
- uses: actions/checkout@v7
2525
- uses: actions/setup-java@v5
2626
with:
2727
java-version: ${{ matrix.jre }}
2828
distribution: 'temurin'
2929

3030
- name: Gradle cache
31-
uses: actions/cache@v5
31+
uses: actions/cache@v6
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@v5
40+
uses: actions/cache@v6
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@v5
49+
uses: actions/cache@v6
5050
with:
5151
path: /tmp/protobuf-cache
5252
key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }}
@@ -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@v6
74+
uses: codecov/codecov-action@v7
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@v6
91+
- uses: actions/checkout@v7
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@v5
99+
uses: actions/cache@v6
100100
with:
101101
path: |
102102
~/.cache/bazel/*/cache

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
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.13.0",
24-
"dev.cel:protobuf:0.13.0",
25-
"dev.cel:common:0.13.0",
23+
"dev.cel:runtime:0.13.1",
24+
"dev.cel:protobuf:0.13.1",
25+
"dev.cel:common:0.13.1",
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",

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.84.0-SNAPSHOT' // CURRENT_GRPC_VERSION
2626
def protocVersion = '3.25.8'
27-
def openTelemetryVersion = '1.63.0'
28-
def openTelemetryPrometheusVersion = '1.63.0-alpha'
27+
def openTelemetryVersion = '1.64.0'
28+
def openTelemetryPrometheusVersion = '1.64.0-alpha'
2929

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

examples/example-opentelemetry/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ java {
2323
// updating the version in our release process.
2424
def grpcVersion = '1.84.0-SNAPSHOT' // CURRENT_GRPC_VERSION
2525
def protocVersion = '3.25.8'
26-
def openTelemetryVersion = '1.63.0'
27-
def openTelemetryPrometheusVersion = '1.63.0-alpha'
26+
def openTelemetryVersion = '1.64.0'
27+
def openTelemetryPrometheusVersion = '1.64.0-alpha'
2828

2929
dependencies {
3030
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradle/libs.versions.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1"
3737
# checkstyle 10.0+ requires Java 11+
3838
# See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0
3939
# checkForUpdates: checkstylejava8:9.+
40-
cel-runtime = "dev.cel:runtime:0.13.0"
41-
cel-protobuf = "dev.cel:protobuf:0.13.0"
42-
cel-compiler = "dev.cel:compiler:0.13.0"
40+
cel-runtime = "dev.cel:runtime:0.13.1"
41+
cel-protobuf = "dev.cel:protobuf:0.13.1"
42+
cel-compiler = "dev.cel:compiler:0.13.1"
4343
checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3"
4444
commons-math3 = "org.apache.commons:commons-math3:3.6.1"
45-
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2"
45+
conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.6.1"
4646
# 141.7340.3+ requires Java 17+
4747
# checkForUpdates: cronet-api:119.6045.31
4848
cronet-api = "org.chromium.net:cronet-api:119.6045.31"
@@ -82,16 +82,16 @@ javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1"
8282
# 12.0.0+ require Java 17+
8383
# checkForUpdates: jetty-client:11.+
8484
jetty-client = "org.eclipse.jetty:jetty-client:11.0.26"
85-
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.10"
85+
jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.11"
8686
# 10.0.25+ uses uses @Deprecated(since=/forRemoval=) from Java 9
8787
# checkForUpdates: jetty-http2-server10:10.0.24
8888
jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.24"
89-
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10"
89+
jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.11"
9090
# checkForUpdates: jetty-servlet10:10.0.24
9191
jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.24"
9292
jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
9393
junit = "junit:junit:4.13.2"
94-
lincheck = "org.jetbrains.lincheck:lincheck:3.6"
94+
lincheck = "org.jetbrains.lincheck:lincheck:3.7"
9595
# Update notes / 2023-07-19 sergiitk:
9696
# Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests.
9797
# Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435
@@ -119,11 +119,11 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g
119119
opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" }
120120
opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" }
121121
opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" }
122-
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.63.0"
123-
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha"
124-
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.57.0-alpha"
125-
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0"
126-
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.63.0"
122+
opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.64.0"
123+
opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.64.0-alpha"
124+
opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.59.0-alpha"
125+
opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0"
126+
opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.64.0"
127127
perfmark-api = "io.perfmark:perfmark-api:0.27.0"
128128
# Not upgrading to 4.x as it is not yet ABI compatible.
129129
# https://github.com/protocolbuffers/protobuf/issues/17247
@@ -142,11 +142,11 @@ signature-android = "net.sf.androidscents.signature:android-api-level-24:7.0_r2"
142142
signature-java = "org.codehaus.mojo.signature:java18:1.0"
143143
# 11.0.0+ require Java 17+
144144
# checkForUpdates: tomcat-embed-core:10.+
145-
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.55"
145+
tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.57"
146146
# checkForUpdates: tomcat-embed-core9:9.+
147-
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.118"
147+
tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.120"
148148
truth = "com.google.truth:truth:1.4.5"
149149
# checkForUpdates: undertow-servlet22:2.2.+
150-
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.39.Final"
150+
undertow-servlet22 = "io.undertow:undertow-servlet:2.2.40.Final"
151151
# checkForUpdates: undertow-servlet:2.3.+
152-
undertow-servlet = "io.undertow:undertow-servlet:2.3.21.Final"
152+
undertow-servlet = "io.undertow:undertow-servlet:2.3.26.Final"

repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2525
"com.google.re2j:re2j:1.8",
2626
"com.google.s2a.proto.v2:s2a-proto:0.1.3",
2727
"com.google.truth:truth:1.4.5",
28-
"dev.cel:runtime:0.13.0",
29-
"dev.cel:protobuf:0.13.0",
30-
"dev.cel:common:0.13.0",
28+
"dev.cel:runtime:0.13.1",
29+
"dev.cel:protobuf:0.13.1",
30+
"dev.cel:common:0.13.1",
3131
"com.squareup.okhttp:okhttp:2.7.5",
3232
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
3333
"io.netty:netty-buffer:4.2.15.Final",

settings.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ pluginManagement {
1515
plugins {
1616
// https://developer.android.com/build/releases/gradle-plugin
1717
// 8+ has many changes: https://github.com/grpc/grpc-java/issues/10152
18-
id "com.android.application" version "7.4.1"
19-
id "com.android.library" version "7.4.1"
18+
id "com.android.application" version "7.4.2"
19+
id "com.android.library" version "7.4.2"
2020
// https://github.com/kt3k/coveralls-gradle-plugin/tags
2121
id "com.github.kt3k.coveralls" version "2.12.2"
2222
// https://github.com/GoogleCloudPlatform/appengine-plugins/releases
2323
id "com.google.cloud.tools.appengine" version "2.8.7"
2424
// https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md
25-
id "com.google.cloud.tools.jib" version "3.5.3"
25+
id "com.google.cloud.tools.jib" version "3.5.4"
2626
// https://github.com/google/osdetector-gradle-plugin/tags
2727
id "com.google.osdetector" version "1.7.3"
2828
// https://github.com/google/protobuf-gradle-plugin/releases
@@ -33,7 +33,7 @@ pluginManagement {
3333
// 8.3.1 breaks apache imports for netty/shaded, fixed in 8.3.2
3434
id "com.gradleup.shadow" version "8.3.0"
3535
// https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt
36-
id "me.champeau.gradle.japicmp" version "0.4.2"
36+
id "me.champeau.gradle.japicmp" version "0.4.6"
3737
// https://github.com/melix/jmh-gradle-plugin/releases
3838
id "me.champeau.jmh" version "0.7.3"
3939
// https://github.com/tbroyer/gradle-errorprone-plugin/releases

0 commit comments

Comments
 (0)