From 148883f48a8f871ddb0d340192e3ae826d7e40e5 Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Wed, 28 Oct 2020 13:57:12 -0700 Subject: [PATCH 1/2] Ads v5 alpha test DO NOT SUBMIT --- WORKSPACE | 5 +++++ repositories.bzl | 2 ++ test/integration/BUILD.bazel | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/WORKSPACE b/WORKSPACE index 66982c622d..ae93c358f4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -39,6 +39,11 @@ http_archive( urls = ["https://github.com/googleapis/gapic-generator/archive/v2.4.6.zip"], ) +local_repository( + name = "com_google_googleapis", + path = "/usr/local/google/home/miraleung/dev/googleapis", +) + load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") switched_rules_by_language( diff --git a/repositories.bzl b/repositories.bzl index 9b1a8cd45b..18215c5269 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -56,6 +56,7 @@ def gapic_generator_java_repositories(): urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], ) + """ _maybe( http_archive, name = "com_google_googleapis", @@ -64,6 +65,7 @@ def gapic_generator_java_repositories(): "https://github.com/googleapis/googleapis/archive/bda7ce951def5ae6e5c4258d0e569188dd4ae02b.zip", ], ) + """ _maybe( native.bind, diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel index 086f641051..dbff57b342 100644 --- a/test/integration/BUILD.bazel +++ b/test/integration/BUILD.bazel @@ -1,6 +1,7 @@ load( "@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info", + java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2", java_gapic_library = "java_gapic_library2", ) load( @@ -22,8 +23,8 @@ integration_test( integration_test( name = "asset", - target = ":asset_java_gapic", data = ["//test/integration/goldens/asset:goldens_files"], + target = ":asset_java_gapic", ) #################################################### @@ -87,3 +88,35 @@ java_gapic_library( "@com_google_googleapis//google/logging/v2:logging_java_proto", ], ) + +#################################################### +# Ads Alpha +#################################################### + +java_gapic_library( + name = "googleads_java_gapic", + srcs = ["@com_google_googleapis//google/ads/googleads/v5:googleads_proto_with_info"], + grpc_service_config = "@com_google_googleapis//google/ads/googleads/v5:googleads_grpc_service_config.json", + package = "google.ads.googleads.v5", + service_yaml = "@com_google_googleapis//google/ads/googleads/v5:googleads_v5.yaml", + deps = [ + "@com_google_googleapis//google/ads/googleads/v5/enums:enums_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/resources:resources_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/services:services_java_grpc", + "@com_google_googleapis//google/ads/googleads/v5/services:services_java_proto", + ], +) + +java_gapic_assembly_gradle_pkg( + name = "googleads-java", + deps = [ + ":googleads_java_gapic", + "@com_google_googleapis//google/ads/googleads/v5:googleads_proto", + "@com_google_googleapis//google/ads/googleads/v5/common:common_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/enums:enums_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/errors:errors_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/resources:resources_java_proto", + "@com_google_googleapis//google/ads/googleads/v5/services:services_java_grpc", + "@com_google_googleapis//google/ads/googleads/v5/services:services_java_proto", + ], +) From 3e1467a212a7d63ffedbbb8a6e31319903c4aecc Mon Sep 17 00:00:00 2001 From: Mira Leung Date: Wed, 28 Oct 2020 14:55:51 -0700 Subject: [PATCH 2/2] fix: add dep --- test/integration/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel index dbff57b342..4dc05695bc 100644 --- a/test/integration/BUILD.bazel +++ b/test/integration/BUILD.bazel @@ -100,6 +100,7 @@ java_gapic_library( package = "google.ads.googleads.v5", service_yaml = "@com_google_googleapis//google/ads/googleads/v5:googleads_v5.yaml", deps = [ + "@com_google_googleapis//google/ads/googleads/v5/common:common_proto", "@com_google_googleapis//google/ads/googleads/v5/enums:enums_java_proto", "@com_google_googleapis//google/ads/googleads/v5/resources:resources_java_proto", "@com_google_googleapis//google/ads/googleads/v5/services:services_java_grpc",