Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8e27a4d

Browse files
miraleungmiraleung
authored
Merge branch 'master' into fix/proto_name_conflicts
2 parents f58f180 + 2091141 commit 8e27a4d

28 files changed

+3514
-214
lines changed

‎dependencies.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Target workspace name: com_google_api_codegen
88

99
# Versions only, for dependencies which actual artifacts differ between Bazel and Gradle
10-
version.com_google_protobuf=3.15.2
10+
version.com_google_protobuf=3.15.8
1111
# 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.
1212
version.google_java_format=1.7
1313
version.com_google_api_common_java=1.9.3

‎repositories.bzl‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,18 @@ def gapic_generator_java_repositories():
5959
_maybe(
6060
http_archive,
6161
name = "com_google_googleapis",
62-
strip_prefix = "googleapis-2bea43cdc7a4443876380732980d83cd8d560582",
62+
strip_prefix = "googleapis-f5ce261910c373fdd96bdaa47173f5604562876f",
6363
urls = [
64-
"https://github.com/googleapis/googleapis/archive/2bea43cdc7a4443876380732980d83cd8d560582.zip",
64+
"https://github.com/googleapis/googleapis/archive/f5ce261910c373fdd96bdaa47173f5604562876f.zip",
65+
],
66+
)
67+
68+
_maybe(
69+
http_archive,
70+
name = "com_google_googleapis_discovery",
71+
strip_prefix = "googleapis-discovery-4f5d0604132e93e63330e65e2e6648c75012780c",
72+
urls = [
73+
"https://github.com/googleapis/googleapis-discovery/archive/4f5d0604132e93e63330e65e2e6648c75012780c.zip",
6574
],
6675
)
6776

‎test/integration/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ INTEGRATION_TEST_LIBRARIES = [
2929
"logging", # Java package remapping in gapic.yaml.
3030
"redis", # Has a gapic.yaml.
3131
"library", # No gRPC service config.
32+
"compute", # REGAPIC test.
3233
]
3334

3435
# Keys must match the values in INTEGRATION_TEST_LIBRARIES above.
@@ -41,6 +42,7 @@ API_GAPIC_TARGETS = {
4142
"logging": "@com_google_googleapis//google/logging/v2:logging_java_gapic",
4243
"redis": "@com_google_googleapis//google/cloud/redis/v1beta1:redis_java_gapic",
4344
"library": "@com_google_googleapis//google/example/library/v1:library_java_gapic",
45+
"compute": "@com_google_googleapis_discovery//google/cloud/compute/v1:compute_small_java_gapic",
4446
}
4547

4648
[integration_test(

‎test/integration/goldens/compute/BUILD.bazel‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
filegroup(
4+
name = "goldens_files",
5+
srcs = glob(
6+
["**/*"],
7+
exclude = [
8+
"BUILD.bazel",
9+
".*.sw*",
10+
],
11+
),
12+
)

0 commit comments

Comments
 (0)