chore: remove all monolith Bazel deps

Google APIs · copybara-github · commit 076f7e9f0b25 · 2021-06-21T12:43:29.000-07:00
chore: release gapic-generator-csharp v1.3.7 chore: release gapic-generator-go 0.20.5 chore: release gapic-generator-java 1.0.14 chore: release gapic-generator-php 1.0.1 chore: release gapic-generator-python 0.50.0 chore: update gapic-generator-ruby to the latest commit chore: release gapic-generator-typescript 1.5.0 Committer: @miraleung PiperOrigin-RevId: 380641501
diff --git a/WORKSPACE b/WORKSPACE
@@ -72,14 +72,6 @@ rules_proto_dependencies()
 
 rules_proto_toolchains()
 
-# Note gapic-generator contains java-specific and common code, that is why it is imported in common
-# section
-http_archive(
-    name = "com_google_api_codegen",
-    strip_prefix = "gapic-generator-2.11.0",
-    urls = ["https://github.com/googleapis/gapic-generator/archive/v2.11.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
@@ -202,7 +194,7 @@ grpc_java_repositories()
 
 # Java microgenerator.
 # Must go AFTER java-gax, since both java gax and gapic-generator are written in java and may conflict.
-_gapic_generator_java_version = "1.0.13"
+_gapic_generator_java_version = "1.0.14"
 
 http_archive(
     name = "gapic_generator_java",
@@ -221,49 +213,23 @@ load("@gapic_generator_java//:repositories.bzl", "gapic_generator_java_repositor
 
 gapic_generator_java_repositories()
 
-# gapic-generator transitive
-# (goes AFTER java-gax, since both java gax and gapic-generator are written in java and may conflict)
-load("@com_google_api_codegen//:repository_rules.bzl", "com_google_api_codegen_properties")
-
-com_google_api_codegen_properties(
-    name = "com_google_api_codegen_properties",
-    file = "@com_google_api_codegen//:dependencies.properties",
-)
-
-load("@com_google_api_codegen//:repositories.bzl", "com_google_api_codegen_repositories")
-
-http_archive(
-    name = "com_google_protoc_java_resource_names_plugin",
-    strip_prefix = "protoc-java-resource-names-plugin-8d749cb5b7aa2734656e1ad36ceda92894f33153",
-    urls = ["https://github.com/googleapis/protoc-java-resource-names-plugin/archive/8d749cb5b7aa2734656e1ad36ceda92894f33153.zip"],
-)
-
-com_google_api_codegen_repositories()
-
-# protoc-java-resource-names-plugin (loaded in com_google_api_codegen_repositories())
-# (required to support resource names feature in gapic generator)
-load(
-    "@com_google_protoc_java_resource_names_plugin//:repositories.bzl",
-    "com_google_protoc_java_resource_names_plugin_repositories",
-)
-
-com_google_protoc_java_resource_names_plugin_repositories()
-
 ##############################################################################
 # Python
 ##############################################################################
-load("@com_google_api_codegen//rules_gapic/python:py_gapic_repositories.bzl", "py_gapic_repositories")
+load("@rules_gapic//python:py_gapic_repositories.bzl", "py_gapic_repositories")
 
 py_gapic_repositories()
 
 load("@rules_python//python:pip.bzl", "pip_repositories")
 
 pip_repositories()
 
+_gapic_generator_python_version = "0.50.0"
+
 http_archive(
     name = "gapic_generator_python",
-    strip_prefix = "gapic-generator-python-0.46.3",
-    urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.46.3.zip"],
+    strip_prefix = "gapic-generator-python-%s" % _gapic_generator_python_version,
+    urls = ["https://github.com/googleapis/gapic-generator-python/archive/v%s.zip" % _gapic_generator_python_version],
 )
 
 load(
@@ -280,7 +246,7 @@ gapic_generator_register_toolchains()
 # Go
 ##############################################################################
 
-_gapic_generator_go_version = "0.20.3"
+_gapic_generator_go_version = "0.20.5"
 
 http_archive(
     name = "com_googleapis_gapic_generator_go",
@@ -300,9 +266,9 @@ go_gapic_repositories()
 # TypeScript
 ##############################################################################
 
-_gapic_generator_typescript_version = "1.4.0"
+_gapic_generator_typescript_version = "1.5.0"
 
-_gapic_generator_typescript_sha256 = "34718494b0696706ccfa46c8ed360f1999d7e33d5121aa86bb302af402b72d46"
+_gapic_generator_typescript_sha256 = "17e9387f3d6da8e5382b4e138ccc401137d2938b394040984ef2ca11ff9f8aea"
 
 ### TypeScript generator
 http_archive(
@@ -332,19 +298,19 @@ yarn_install(
 # PHP
 ##############################################################################
 
-load("@com_google_api_codegen//rules_gapic/php:php_gapic_repositories.bzl", "php", "php_gapic_repositories")
+load("@rules_gapic//php:php_gapic_repositories.bzl", "php", "php_gapic_repositories")
 
 php(
     name = "php",
-    prebuilt_phps = ["@com_google_api_codegen//rules_gapic/php:resources/php-7.1.30_linux_x86_64.tar.gz"],
+    prebuilt_phps = ["@rules_gapic//php:resources/php-7.1.30_linux_x86_64.tar.gz"],
     strip_prefix = "php-7.1.30",
     urls = ["https://www.php.net/distributions/php-7.1.30.tar.gz"],
 )
 
 php_gapic_repositories()
 
-# PHP micro-generator (beta)
-_gapic_generator_php_version = "1.0.0"
+# PHP micro-generator
+_gapic_generator_php_version = "1.0.1"
 
 http_archive(
     name = "gapic_generator_php",
@@ -373,9 +339,9 @@ http_archive(
     urls = ["https://github.com/googleapis/gax-dotnet/archive/refs/tags/%s.tar.gz" % _gax_dotnet_version],
 )
 
-_gapic_generator_csharp_version = "1.3.6"
+_gapic_generator_csharp_version = "1.3.7"
 
-_gapic_generator_csharp_sha256 = "6340309dc6b86bfd0dc2c9fca41cf991c7163eda2f48a7062fe4da5bd62c99d6"
+_gapic_generator_csharp_sha256 = "7f4fca6f9ec3902ae0bd0e6b96593e6370fb035ef0e56dd505f5b411b7138a7a"
 
 http_archive(
     name = "gapic_generator_csharp",
@@ -391,9 +357,10 @@ gapic_generator_csharp_repositories()
 ##############################################################################
 # Ruby
 ##############################################################################
-_gapic_generator_ruby_version = "6e9a4813de65c40b02b5f72ab79f58769fdef2fe"
 
-_gapic_generator_ruby_sha256 = "0a4af103077410db9f19ffd74b533b58e712efadac82359a6cde5de74612896a"
+_gapic_generator_ruby_version = "2b66e7aca8d5d7d4cb7bf436776d7713d264cab8"
+
+_gapic_generator_ruby_sha256 = "b00e2fa2c6f6734a32cffe77ffe5a74d02bbfaa4ad70dd92fde43c47c090b663"
 
 http_archive(
     name = "gapic_generator_ruby",
diff --git a/repository_rules.bzl b/repository_rules.bzl
@@ -116,11 +116,11 @@ def switched_rules_by_language(
     #
     rules["proto_library_with_info"] = _switch(
         gapic,
-        "@com_google_api_codegen//rules_gapic:gapic.bzl",
+        "@rules_gapic//:gapic.bzl",
     )
     rules["moved_proto_library"] = _switch(
         gapic,
-        "@com_google_api_codegen//rules_gapic:gapic.bzl",
+        "@rules_gapic//:gapic.bzl",
     )
 
     #

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,11 @@ def switched_rules_by_language(`
`116`	`116`	`#`
`117`	`117`	`rules["proto_library_with_info"] = _switch(`
`118`	`118`	`gapic,`
`119`		`- "@com_google_api_codegen//rules_gapic:gapic.bzl",`
	`119`	`+ "@rules_gapic//:gapic.bzl",`
`120`	`120`	`)`
`121`	`121`	`rules["moved_proto_library"] = _switch(`
`122`	`122`	`gapic,`
`123`		`- "@com_google_api_codegen//rules_gapic:gapic.bzl",`
	`123`	`+ "@rules_gapic//:gapic.bzl",`
`124`	`124`	`)`
`125`	`125`
`126`	`126`	`#`