Merge branch 'main' into renovate/gradle-7.x

chanseokoh · web-flow · commit 400f2ce0eadd · 2022-01-04T17:00:12.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [2.2.4](https://www.github.com/googleapis/gapic-generator-java/compare/v2.2.3...v2.2.4) (2022-01-04)
+
+
+### Bug Fixes
+
+* add missing dependencies in Gradle for "self-service" library generation ([#884](https://www.github.com/googleapis/gapic-generator-java/issues/884)) ([3adac5e](https://www.github.com/googleapis/gapic-generator-java/commit/3adac5e2898e40a1e5395ab65db037c26a4f7e1b))
+
 ### [2.2.3](https://www.github.com/googleapis/gapic-generator-java/compare/v2.2.2...v2.2.3) (2021-12-06)
 
 
diff --git a/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpc.gradle.tmpl
@@ -10,6 +10,8 @@ dependencies {
   testImplementation 'com.google.api:gax:{{version.gax}}:testlib'
   implementation 'com.google.api:gax-grpc:{{version.gax_grpc}}'
   testImplementation 'com.google.api:gax-grpc:{{version.gax_grpc}}:testlib'
+  implementation 'io.grpc:grpc-protobuf:{{version.io_grpc}}'
+  testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
   testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
   testImplementation '{{maven.junit_junit}}'
   {{extra_deps}}
diff --git a/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl b/rules_java_gapic/resources/gradle/client_grpcrest.gradle.tmpl
@@ -12,6 +12,8 @@ dependencies {
   testImplementation 'com.google.api:gax-grpc:{{version.gax_grpc}}:testlib'
   implementation 'com.google.api:gax-httpjson:{{version.gax_httpjson}}'
   testImplementation 'com.google.api:gax-httpjson:{{version.gax_httpjson}}:testlib'
+  implementation 'io.grpc:grpc-protobuf:{{version.io_grpc}}'
+  testImplementation 'io.grpc:grpc-stub:{{version.io_grpc}}'
   testImplementation 'io.grpc:grpc-netty-shaded:{{version.io_grpc}}'
   testImplementation '{{maven.junit_junit}}'
   {{extra_deps}}
diff --git a/rules_java_gapic/resources/gradle/proto.gradle.tmpl b/rules_java_gapic/resources/gradle/proto.gradle.tmpl
@@ -7,6 +7,7 @@ javadoc.options.encoding = 'UTF-8'
 
 dependencies {
   implementation 'com.google.protobuf:protobuf-java:{{version.com_google_protobuf}}'
+  implementation '{{maven.com_google_guava_guava}}'
   implementation '{{maven.com_google_api_api_common}}'
   implementation '{{maven.com_google_api_grpc_proto_google_common_protos}}'
   {{extra_deps}}
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.2.3
+2.2.4
