Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
2 changes: 1 addition & 1 deletion dependencies.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Target workspace name: com_google_api_codegen

# Versions only, for dependencies which actual artifacts differ between Bazel and Gradle
version.com_google_protobuf=3.15.2
version.com_google_protobuf=3.15.8
# 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
Expand Down
15 changes: 13 additions & 2 deletions repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,20 @@ def gapic_generator_java_repositories():
_maybe(
http_archive,
name = "com_google_googleapis",
strip_prefix = "googleapis-2bea43cdc7a4443876380732980d83cd8d560582",
strip_prefix = "googleapis-f5ce261910c373fdd96bdaa47173f5604562876f",
urls = [
"https://github.com/googleapis/googleapis/archive/2bea43cdc7a4443876380732980d83cd8d560582.zip",
"https://github.com/googleapis/googleapis/archive/f5ce261910c373fdd96bdaa47173f5604562876f.zip",
],
)

#TODO: replace with the googleapis-discovery upstream after
# https://github.com/googleapis/googleapis-discovery/pull/46 is merged
_maybe(
http_archive,
name = "com_google_googleapis_discovery",
strip_prefix = "googleapis-discovery-e38f9bcb93237eed01f40d4fe1337d820f9f6b80",
urls = [
"https://github.com/vam-google/googleapis-discovery/archive/e38f9bcb93237eed01f40d4fe1337d820f9f6b80.zip",
],
)

Expand Down
2 changes: 2 additions & 0 deletions test/integration/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ INTEGRATION_TEST_LIBRARIES = [
"logging", # Java package remapping in gapic.yaml.
"redis", # Has a gapic.yaml.
"library", # No gRPC service config.
"compute", # REGAPIC test.
]

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

[integration_test(
Expand Down
12 changes: 12 additions & 0 deletions test/integration/goldens/compute/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package(default_visibility = ["//visibility:public"])

filegroup(
name = "goldens_files",
srcs = glob(
["**/*"],
exclude = [
"BUILD.bazel",
".*.sw*",
],
),
)
Loading