Skip to content

Commit 03a5344

Browse files
authored
Merge branch 'main' into inline-cache-update-lazy-endpoints
2 parents 1aedbf5 + a423538 commit 03a5344

File tree

1,932 files changed

+41243
-6766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,932 files changed

+41243
-6766
lines changed

.github/workflows/generated_files_sync.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818
name: generation diff
1919
env:
20-
library_generation_image_tag: 2.69.0 # {x-version-update:gapic-generator-java:current}
20+
library_generation_image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}
2121
jobs:
2222
root-pom:
2323
# root pom.xml does not have diff from generated one

.github/workflows/hermetic_library_generation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
head_ref: ${{ github.head_ref }}
4545
token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
4646
force_regenerate_all: ${{ github.event.pull_request.head.ref == 'generate-libraries-main' }}
47-
image_tag: 2.69.0 # {x-version-update:gapic-generator-java:current}
47+
image_tag: 2.70.0 # {x-version-update:gapic-generator-java:current}

.github/workflows/sdk-platform-java-ci.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,6 @@ jobs:
173173
java-version: 8
174174
distribution: temurin
175175
cache: maven
176-
- name: Compile with Java 17 and run tests with Java 8
177-
shell: bash
178-
run: .kokoro/build.sh
179-
env:
180-
BUILD_SUBDIR: sdk-platform-java
181-
JOB_TYPE: install
182176
- run: echo "JAVA8_HOME=${JAVA_HOME}" >> $GITHUB_ENV
183177
- uses: actions/setup-java@v3
184178
with:

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.83.0"
2+
".": "1.84.0"
33
}

CHANGELOG.md

Lines changed: 160 additions & 0 deletions
Large diffs are not rendered by default.

WORKSPACE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
6767
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
6868
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6969

70-
_gapic_generator_java_version = "2.68.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
70+
_gapic_generator_java_version = "2.70.0" # {x-version-update:gapic-generator-java:current}
7171

7272
maven_install(
7373
artifacts = [

0 commit comments

Comments
 (0)