From 15935b5ab1e977382ecaf880a5b47ccbc6a3d487 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Wed, 1 Dec 2021 17:05:36 -0500 Subject: [PATCH 1/6] chore: upgrade protobuf and grpc, and fix build error --- dependencies.properties | 6 +++--- repositories.bzl | 2 +- .../composer/rest/HttpJsonServiceStubClassComposer.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 75e53a6461..81da863c6b 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -7,11 +7,11 @@ # Target workspace name: gapic_generator_java # Versions only, for dependencies which actual artifacts differ between Bazel and Gradle -version.com_google_protobuf=3.15.8 +version.com_google_protobuf=3.19.1 # Version of google-java-format is downgraded from 1.8 to 1.7, because 1.8 supports java 11 minimum, while our JRE is java 8. version.google_java_format=1.7 version.com_google_api_common_java=1.9.3 -version.io_grpc_java=1.30.2 +version.io_grpc_java=1.42.1 # Common deps. maven.com_google_guava_guava=com.google.guava:guava:30.1-android @@ -19,7 +19,7 @@ maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.0 maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.7.2 maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.2 maven.com_google_code_gson=com.google.code.gson:gson:2.8.6 -maven.com_google_protobuf_protobuf_java=com.google.protobuf:protobuf-java:3.15.8 +maven.com_google_protobuf_protobuf_java=com.google.protobuf:protobuf-java:3.19.1 maven.io_github_java_diff_utils=io.github.java-diff-utils:java-diff-utils:4.0 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 maven.javax_validation_javax_validation_api=javax.validation:validation-api:2.0.1.Final diff --git a/repositories.bzl b/repositories.bzl index d9010f6151..d067d4e689 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -109,7 +109,7 @@ def gapic_generator_java_repositories(): ) # grpc-proto doesn't have releases, so we use hashes instead. - _io_grpc_proto_prefix = "0020624375a8ee4c7dd9b3e513e443b90bc28990" # Aug. 20, 2020. + _io_grpc_proto_prefix = "8e3fec8612bc0708e857950dccadfd5063703e04" # Nov. 6, 2021. _maybe( http_archive, name = "io_grpc_proto", diff --git a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index b84e35e0f2..7643406830 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -474,7 +474,7 @@ private MethodInvocationExpr getExpr(VariableExpr var, String num) { private List setOperationSnapshotFactoryExpr( Method protoMethod, Map messageTypes) { - // Generate input varibles for create() + // Generate input variables for create() VariableExpr requestVarExpr = VariableExpr.withVariable( Variable.builder().setType(protoMethod.inputType()).setName("request").build()); From 3b1f8f42114799f8aabce3de9cb4ff27c699284a Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Wed, 1 Dec 2021 17:37:22 -0500 Subject: [PATCH 2/6] chore: fix build --- WORKSPACE | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index c8232a4a9b..6132e757e4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -65,7 +65,27 @@ load("//:repositories.bzl", "gapic_generator_java_repositories") gapic_generator_java_repositories() # protobuf -load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") + +RULES_JVM_EXTERNAL_TAG = "4.2" +RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca" + +http_archive( + name = "rules_jvm_external", + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + sha256 = RULES_JVM_EXTERNAL_SHA, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +) + +load("@rules_jvm_external//:defs.bzl", "maven_install") + +maven_install( + artifacts = PROTOBUF_MAVEN_ARTIFACTS, + generate_compat_repositories = True, + repositories = [ + "https://repo.maven.apache.org/maven2/", + ], +) protobuf_deps() From 345d41f73dc16ada7e5e2f5ed3b76658e53297d7 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Wed, 1 Dec 2021 18:16:31 -0500 Subject: [PATCH 3/6] chore: re-order load --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6132e757e4..e21076e098 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -65,8 +65,6 @@ load("//:repositories.bzl", "gapic_generator_java_repositories") gapic_generator_java_repositories() # protobuf -load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") - RULES_JVM_EXTERNAL_TAG = "4.2" RULES_JVM_EXTERNAL_SHA = "cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca" @@ -77,6 +75,8 @@ http_archive( url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, ) +load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps") + load("@rules_jvm_external//:defs.bzl", "maven_install") maven_install( From 62b7895c32129d6db624286572d60b0d01b632aa Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 3 Dec 2021 11:10:36 -0500 Subject: [PATCH 4/6] chore: upgrade gax --- WORKSPACE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index e21076e098..9d27056728 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -33,7 +33,7 @@ jvm_maven_import_external( # which in its turn, prioritizes actual generated clients runtime dependencies # over the generator dependencies. -_gax_java_version = "2.7.0" +_gax_java_version = "2.7.1" http_archive( name = "com_google_api_gax_java", From 9b4d0750f5eb34509eff4bb35aca48411eb0532b Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 3 Dec 2021 11:11:56 -0500 Subject: [PATCH 5/6] chore: upgrade google truth --- dependencies.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.properties b/dependencies.properties index 81da863c6b..fb33bd94ea 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -37,4 +37,4 @@ maven.junit_junit=junit:junit:4.13.1 maven.org_hamcrest_hamcrest_core=org.hamcrest:hamcrest-core:1.3 maven.org_mockito_mockito_core=org.mockito:mockito-core:2.21.0 # Keep in sync with gax-java. -maven.com_google_truth_truth=com.google.truth:truth:1.0 +maven.com_google_truth_truth=com.google.truth:truth:1.1.2 From 9c57546c71db172623db1c51c75a6fef50d45df5 Mon Sep 17 00:00:00 2001 From: Chanseok Oh Date: Fri, 3 Dec 2021 11:19:47 -0500 Subject: [PATCH 6/6] chore: upgrade bazel --- .github/workflows/ci.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ec62f81cb2..c65463a601 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,11 +7,6 @@ name: ci jobs: build: runs-on: ubuntu-latest - container: gcr.io/gapic-images/googleapis-bazel:20210105 - # Dockerfile for this image: https://github.com/googleapis/googleapis-discovery/blob/main/Dockerfile - # If you update its version, please also update it below in - # 'Cache Bazel files' - unfortunately it cannot accept variables at this - # time. strategy: matrix: @@ -28,7 +23,7 @@ jobs: uses: actions/cache@v2 with: path: ~/.cache/bazel - key: ${{ runner.os }}-bazel-20210105-${{ secrets.CACHE_VERSION }} + key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }} - name: Bazel Cache Not Found if: steps.cache-bazel.outputs.cache-hit != 'true'