Skip to content
This repository was archived by the owner on May 14, 2026. It is now read-only.
Merged
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
4 changes: 2 additions & 2 deletions .bazeliskrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# See https://github.com/bazelbuild/bazelisk
# As per b/302171264#comment5, 6.4.0 supports Java 21.
USE_BAZEL_VERSION=6.4.0
# Version required for Java 24 support (https://github.com/bazelbuild/bazel/commit/806a6e82320956b63f1351ebe2b0da8483f36f19).
USE_BAZEL_VERSION=7.6.1
36 changes: 35 additions & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,41 @@
- name: Integration Tests
run: |
bazelisk --batch test //test/integration/...
build-java-24:
name: "build(24) except self-service clients"
# Support for Java 24 is available for all use cases except self-service clients.
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 24
distribution: temurin
cache: maven
- run: java -version
- name: Unit Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage
# The `envVarTest` profile runs tests that require an environment variable
- name: Env Var Tests
run: |
mvn test --batch-mode --no-transfer-progress -Dcheckstyle.skip \
-Dfmt.skip -DenableTestCoverage -PenvVarTest
# Set the Env Var for this step only
env:
GOOGLE_CLOUD_UNIVERSE_DOMAIN: random.com
GOOGLE_CLOUD_ENABLE_DIRECT_PATH_XDS: true
GOOGLE_SDK_JAVA_LOGGING: true
- run: bazelisk version
- name: Install Maven modules
run: |
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
- name: Integration Tests
# note need to set shouldInstallTestSecurityManager=false due to https://github.com/bazelbuild/bazel/issues/24354
run: |
bazelisk --batch test //test/integration/... --jvmopt=-Dcom.google.testing.junit.runner.shouldInstallTestSecurityManager=false
build-java8-except-gapic-generator-java:

Check warning on line 128 in .github/workflows/ci.yaml

View check run for this annotation

GitHub Advanced Security / CodeQL

Workflow does not contain permissions

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {{contents: read}}
name: "build(8) except for gapic-generator-java"
runs-on: ubuntu-22.04
steps:
Expand Down Expand Up @@ -273,7 +307,7 @@
runs-on: ubuntu-22.04
strategy:
matrix:
java: [ 11, 17, 21, 23 ]
java: [ 11, 17, 21, 24 ]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [11, 17, 21]
java: [11, 17, 21, 24]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion rules_java_gapic/java_gapic_pkg.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def _construct_extra_deps(scope_to_deps, versions_map):
if not extra_deps.get(key):
extra_deps[key] = "%s project(':%s')" % (scope, pkg_dependency)
elif _is_java_dependency(dep):
for f in dep[JavaInfo].transitive_deps.to_list():
for f in dep[JavaInfo].transitive_compile_time_jars.to_list():
maven_artifact = label_name_to_maven_artifact.get(f.owner.name)
if not maven_artifact:
continue
Expand Down
Loading