Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions third_party/googleapis/.bazelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# To make proto_library rules to include source info in the descriptor
build --protocopt=--include_source_info
build --protocopt=--experimental_allow_proto3_optional

# This is to avoid JVM SIGBUS crashes on highly parallel builds,
# see https://github.com/bazelbuild/bazel/issues/3236 for more details
Expand Down
75 changes: 63 additions & 12 deletions third_party/googleapis/WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
workspace(name = "com_google_googleapis")
workspace(
name = "com_google_googleapis",
# This tells Bazel that the node_modules directory is special and
# is managed by the package manager.
# https://bazelbuild.github.io/rules_nodejs/install.html
managed_directories = {"@npm": ["@gapic_generator_typescript//:node_modules"]}
)

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

Expand Down Expand Up @@ -41,8 +47,8 @@ http_archive(

http_archive(
name = "com_google_protobuf",
strip_prefix = "protobuf-fe1790ca0df67173702f70d5646b82f48f412b99", # this is 3.11.2
urls = ["https://github.com/protocolbuffers/protobuf/archive/fe1790ca0df67173702f70d5646b82f48f412b99.zip"],
strip_prefix = "protobuf-a37cc13b2f6d11303811011b0bfbc867e7c0bf2b", # this is 3.12.1
urls = ["https://github.com/protocolbuffers/protobuf/archive/a37cc13b2f6d11303811011b0bfbc867e7c0bf2b.zip"],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
Expand All @@ -69,17 +75,20 @@ rules_proto_toolchains()
# section
http_archive(
name = "com_google_api_codegen",
strip_prefix = "gapic-generator-acd31461ee04391df79ae8a33f793569791aa1a0",
urls = ["https://github.com/googleapis/gapic-generator/archive/acd31461ee04391df79ae8a33f793569791aa1a0.zip"],
strip_prefix = "gapic-generator-2.2.0",
urls = ["https://github.com/googleapis/gapic-generator/archive/v2.2.0.zip"],
)

# rules_go (support Golang under bazel)
# This is not in the Go section because we override the same, older dependency brought in by gRPC.
# TODO(ndietz): move this back to the Go section if gRPC is updated per https://github.com/grpc/grpc/issues/22172
http_archive(
name = "io_bazel_rules_go",
sha256 = "e6a6c016b0663e06fa5fccf1cd8152eab8aa8180c583ec20c872f4f9953a7ac5",
url = "https://github.com/bazelbuild/rules_go/releases/download/v0.22.1/rules_go-v0.22.1.tar.gz",
urls = [
"https://github.com/bazelbuild/rules_go/archive/v0.23.0.zip",
],
strip_prefix = "rules_go-0.23.0",
sha256 = "4707e6ba7c01fcfc4f0d340d123bc16e43c2b8ea3f307663d95712b36d2a0e88",
)

load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
Expand Down Expand Up @@ -186,8 +195,8 @@ py_gapic_repositories()

http_archive(
name = "protoc_docs_plugin",
strip_prefix = "protoc-docs-plugin-b2502d56b5ec2d47e063976da773206af295362d",
urls = ["https://github.com/googleapis/protoc-docs-plugin/archive/b2502d56b5ec2d47e063976da773206af295362d.zip"],
strip_prefix = "protoc-docs-plugin-2bdf14e394bbaa44b81286b1a19c5f229b51c667",
urls = ["https://github.com/googleapis/protoc-docs-plugin/archive/2bdf14e394bbaa44b81286b1a19c5f229b51c667.zip"],
)

load(
Expand Down Expand Up @@ -233,7 +242,11 @@ pip_install()
# bazel-gazelle (support Golang under bazel)
http_archive(
name = "bazel_gazelle",
urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.20.0/bazel-gazelle-v0.20.0.tar.gz"],
urls = [
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.0/bazel-gazelle-v0.21.0.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.0/bazel-gazelle-v0.21.0.tar.gz",
],
sha256 = "bfd86b3cbe855d6c16c6fce60d76bd51f5c8dbc9cfcaef7a2bb5c1aafd0710e8",
)

load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
Expand All @@ -242,8 +255,8 @@ gazelle_dependencies()

http_archive(
name = "com_googleapis_gapic_generator_go",
strip_prefix = "gapic-generator-go-0.13.3",
urls = ["https://github.com/googleapis/gapic-generator-go/archive/v0.13.3.tar.gz"],
strip_prefix = "gapic-generator-go-0.14.3",
urls = ["https://github.com/googleapis/gapic-generator-go/archive/v0.14.3.tar.gz"],
)

load("@com_googleapis_gapic_generator_go//:repositories.bzl", "com_googleapis_gapic_generator_go_repositories")
Expand All @@ -254,6 +267,44 @@ load("@com_googleapis_gapic_generator_go//rules_go_gapic:go_gapic_repositories.b

go_gapic_repositories()

##############################################################################
# TypeScript
##############################################################################

### TypeScript generator
http_archive(
name = "gapic_generator_typescript",
urls = ["https://github.com/googleapis/gapic-generator-typescript/archive/v1.0.0.tar.gz"],
strip_prefix = "gapic-generator-typescript-1.0.0",
)

load("@gapic_generator_typescript//:repositories.bzl", "gapic_generator_typescript_repositories")
gapic_generator_typescript_repositories()

load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install")
node_repositories(
package_json = ["@gapic_generator_typescript//:package.json"]
)
yarn_install(
name = "npm",
package_json = "@gapic_generator_typescript//:package.json",
yarn_lock = "@gapic_generator_typescript//:yarn.lock",
)
load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
install_bazel_dependencies()

load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")
ts_setup_workspace()

# Note: TypeScript libraries use third-party protobuf dependency,
# protobuf.js, and official Bazel rules have a special rule to
# install this dependency and its transitive dependencies.
yarn_install(
name = "build_bazel_rules_typescript_protobufs_compiletime_deps",
package_json = "@npm_bazel_labs//protobufjs:package.json",
yarn_lock = "@npm_bazel_labs//protobufjs:yarn.lock",
)

##############################################################################
# PHP
##############################################################################
Expand Down
21 changes: 11 additions & 10 deletions third_party/googleapis/google/ads/admob/v1/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ proto_library(
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/type:date_proto",
],
)
Expand All @@ -26,7 +27,6 @@ proto_library_with_info(
name = "admob_proto_with_info",
deps = [
":admob_proto",
"//google/cloud:common_resources_proto",
],
)

Expand Down Expand Up @@ -70,14 +70,14 @@ java_gapic_library(
java_gapic_test(
name = "admob_java_gapic_test_suite",
test_classes = [
"com.google.cloud.ads.admob.v1.AdMobApiClientTest",
"com.google.ads.admob.v1.AdMobApiClientTest",
],
runtime_deps = [":admob_java_gapic_test"],
)

# Open Source Packages
java_gapic_assembly_gradle_pkg(
name = "google-cloud-ads-admob-v1-java",
name = "google-ads-admob-v1-java",
deps = [
":admob_java_gapic",
":admob_java_grpc",
Expand Down Expand Up @@ -112,7 +112,7 @@ go_gapic_library(
name = "admob_go_gapic",
srcs = [":admob_proto_with_info"],
grpc_service_config = "",
importpath = "cloud.google.com/go/ads/admob/apiv1;admob",
importpath = "google.golang.org/api/admob/v1;admob",
service_yaml = "//google/ads/admob:admob_v1.yaml",
deps = [
":admob_go_proto",
Expand All @@ -123,12 +123,12 @@ go_test(
name = "admob_go_gapic_test",
srcs = [":admob_go_gapic_srcjar_test"],
embed = [":admob_go_gapic"],
importpath = "cloud.google.com/go/ads/admob/apiv1",
importpath = "google.golang.org/api/admob/v1",
)

# Open Source Packages
go_gapic_assembly_pkg(
name = "gapi-cloud-ads-admob-v1-go",
name = "gapi-ads-admob-v1-go",
deps = [
":admob_go_gapic",
":admob_go_gapic_srcjar-test.srcjar",
Expand All @@ -154,6 +154,7 @@ moved_proto_library(
deps = [
"//google/api:annotations_proto",
"//google/api:client_proto",
"//google/api:field_behavior_proto",
"//google/type:date_proto",
],
)
Expand Down Expand Up @@ -228,7 +229,7 @@ php_gapic_library(

# Open Source Packages
php_gapic_assembly_pkg(
name = "google-cloud-ads-admob-v1-php",
name = "google-ads-admob-v1-php",
deps = [
":admob_php_gapic",
":admob_php_grpc",
Expand All @@ -248,7 +249,7 @@ load(
nodejs_gapic_library(
name = "admob_nodejs_gapic",
src = ":admob_proto_with_info",
gapic_yaml = "admob_gapic.yaml",
grpc_service_config = None,
package = "google.ads.admob.v1",
service_yaml = "//google/ads/admob:admob_v1.yaml",
deps = [],
Expand Down Expand Up @@ -298,7 +299,7 @@ ruby_gapic_library(

# Open Source Packages
ruby_gapic_assembly_pkg(
name = "google-cloud-ads-admob-v1-ruby",
name = "google-ads-admob-v1-ruby",
deps = [
":admob_ruby_gapic",
":admob_ruby_grpc",
Expand Down Expand Up @@ -342,7 +343,7 @@ csharp_gapic_library(

# Open Source Packages
csharp_gapic_assembly_pkg(
name = "google-cloud-ads-admob-v1-csharp",
name = "google-ads-admob-v1-csharp",
deps = [
":admob_csharp_gapic",
":admob_csharp_grpc",
Expand Down
15 changes: 7 additions & 8 deletions third_party/googleapis/google/ads/admob/v1/admob_api.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019 Google LLC.
// Copyright 2020 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand All @@ -11,7 +11,6 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//

syntax = "proto3";

Expand All @@ -20,6 +19,7 @@ package google.ads.admob.v1;
import "google/ads/admob/v1/admob_resources.proto";
import "google/api/annotations.proto";
import "google/api/client.proto";
import "google/api/field_behavior.proto";

option go_package = "google.golang.org/genproto/googleapis/ads/admob/v1;admob";
option java_outer_classname = "AdMobApiProto";
Expand Down Expand Up @@ -117,8 +117,8 @@ message GenerateMediationReportRequest {
// "header": {
// "date_range": {
// "start_date": {"year": 2018, "month": 9, "day": 1},
// "end_date": {"year": 2018, "month": 9, "day": 30}
// }
// "end_date": {"year": 2018, "month": 9, "day": 1}
// },
// "localization_settings": {
// "currency_code": "USD",
// "language_code": "en-US"
Expand Down Expand Up @@ -178,8 +178,8 @@ message GenerateNetworkReportRequest {
// "header": {
// "dateRange": {
// "startDate": {"year": 2018, "month": 9, "day": 1},
// "endDate": {"year": 2018, "month": 9, "day": 30}
// }
// "endDate": {"year": 2018, "month": 9, "day": 1}
// },
// "localizationSettings": {
// "currencyCode": "USD",
// "languageCode": "en-US"
Expand All @@ -200,9 +200,8 @@ message GenerateNetworkReportRequest {
// }
// }
// },
// ...
// {
// "footer": {"matchingRowCount": 5}
// "footer": {"matchingRowCount": 1}
// }]
message GenerateNetworkReportResponse {
// Each stream response message contains one type of payload.
Expand Down
10 changes: 5 additions & 5 deletions third_party/googleapis/google/ads/admob/v1/admob_gapic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ config_schema_version: 1.0.0
# The settings of generated code in a specific language.
language_settings:
java:
package_name: com.google.cloud.ads.admob.v1
package_name: com.google.ads.admob.v1
python:
package_name: google.cloud.ads.admob_v1.gapic
package_name: google.ads.admob_v1.gapic
go:
package_name: cloud.google.com/go/ads/admob/apiv1
package_name: google.golang.org/api/admob/v1
csharp:
package_name: Google.Ads.Admob.V1
ruby:
package_name: Google::Cloud::Ads::Admob::V1
package_name: Google::Ads::Admob::V1
php:
package_name: Google\Cloud\Ads\Admob\V1
package_name: Google\Ads\Admob\V1
nodejs:
package_name: admob.v1
# A list of API interface configurations.
Expand Down
Loading