10000 fix(monolith): Bump microgenerator versions to monolith removal (#47) · googleapis/googleapis-discovery@6a189a8 · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Apr 12, 2022. It is now read-only.

Commit 6a189a8

Browse files
miraleungmiraleung
authored
fix(monolith): Bump microgenerator versions to monolith removal (#47)
* fix(php): Bump microgenerator version * fix(monolith): Bump microgenerator versions with monolith removal
1 parent 4f5d060 commit 6a189a8

File tree

2 files changed

+79
-49
lines changed

2 files changed

+79
-49
lines changed

‎WORKSPACE

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
http_archive(
66
name = "com_google_googleapis",
7-
strip_prefix = "googleapis-f5ce261910c373fdd96bdaa47173f5604562876f",
8-
urls = ["https://github.com/googleapis/googleapis/archive/f5ce261910c373fdd96bdaa47173f5604562876f.zip"],
7+
strip_prefix = "googleapis-dba65e3c28aa8e26c4d5b8ec9c80fbd0d0f29864",
8+
urls = ["https://github.com/googleapis/googleapis/archive/dba65e3c28aa8e26c4d5b8ec9c80fbd0d0f29864.zip"],
99
)
1010

1111
##############################################################################
@@ -173,7 +173,7 @@ apple_support_dependencies()
173173
##############################################################################
174174
# Java
175175
##############################################################################
176-
_gax_java_version = "1.64.0"
176+
_gax_java_version = "1.65.1"
177177

178178
http_archive(
179179
name = "com_google_api_gax_java",
@@ -198,7 +198,7 @@ grpc_java_repositories()
198198

199199
# Java microgenerator.
200200
# Must go AFTER java-gax, since both java gax and gapic-generator are written in java and may conflict.
201-
_gapic_generator_java_version = "1.0.11"
201+
_gapic_generator_java_version = "1.0.13"
202202

203203
http_archive(
204204
name = "gapic_generator_java",
@@ -274,8 +274,8 @@ pip_repositories()
274274

275275
http_archive(
276276
name = "gapic_generator_python",
277-
strip_prefix = "gapic-generator-python-0.48.0",
278-
urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.48.0.zip"],
277+
strip_prefix = "gapic-generator-python-0.50.0",
278+
urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.50.0.zip"],
279279
)
280280

281281
load(
@@ -312,9 +312,9 @@ go_gapic_repositories()
312312
# TypeScript
313313
##############################################################################
314314

315-
_gapic_generator_typescript_version = "1.4.0"
315+
_gapic_generator_typescript_version = "1.5.0"
316316

317-
_gapic_generator_typescript_sha256 = "34718494b0696706ccfa46c8ed360f1999d7e33d5121aa86bb302af402b72d46"
317+
_gapic_generator_typescript_sha256 = "17e9387f3d6da8e5382b4e138ccc401137d2938b394040984ef2ca11ff9f8aea"
318318

319319
### TypeScript generator
320320
http_archive(
@@ -344,19 +344,19 @@ yarn_install(
344344
# PHP
345345
##############################################################################
346346

347-
load("@com_google_api_codegen//rules_gapic/php:php_gapic_repositories.bzl", "php", "php_gapic_repositories")
347+
load("@rules_gapic//php:php_gapic_repositories.bzl", "php", "php_gapic_repositories")
348348

349349
php(
350350
name = "php",
351-
prebuilt_phps = ["@com_google_api_codegen//rules_gapic/php:resources/php-7.1.30_linux_x86_64.tar.gz"],
351+
prebuilt_phps = ["@rules_gapic//php:resources/php-7.1.30_linux_x86_64.tar.gz"],
352352
strip_prefix = "php-7.1.30",
353353
urls = ["https://www.php.net/distributions/php-7.1.30.tar.gz"],
354354
)
355355

356356
php_gapic_repositories()
357357

358358
# PHP micro-generator (beta)
359-
_gapic_generator_php_version = "0.1.7"
359+
_gapic_generator_php_version = "1.0.2"
360360

361361
http_archive(
362362
name = "gapic_generator_php",
@@ -385,9 +385,9 @@ http_archive(
385385
urls = ["https://github.com/googleapis/gax-dotnet/archive/refs/tags/%s.tar.gz" % _gax_dotnet_version],
386386
)
387387

388-
_gapic_generator_csharp_version = "1.3.6"
388+
_gapic_generator_csharp_version = "1.3.7"
389389

390-
_gapic_generator_csharp_sha256 = "6340309dc6b86bfd0dc2c9fca41cf991c7163eda2f48a7062fe4da5bd62c99d6"
390+
_gapic_generator_csharp_sha256 = "7f4fca6f9ec3902ae0bd0e6b96593e6370fb035ef0e56dd505f5b411b7138a7a"
391391

392392
http_archive(
393393
name = "gapic_generator_csharp",
@@ -403,9 +403,9 @@ gapic_generator_csharp_repositories()
403403
##############################################################################
404404
# Ruby
405405
##############################################################################
406-
_gapic_generator_ruby_version = "e10d40afa96a28036da03bb9b0af17d702715886"
406+
_gapic_generator_ruby_version = "2b66e7aca8d5d7d4cb7bf436776d7713d264cab8"
407407

408-
_gapic_generator_ruby_sha256 = "a560f2f0d12411b2b4f76ba087f6fcf4d517ef1e9abec1b5a517dfe348e67f3b"
408+
_gapic_generator_ruby_sha256 = "b00e2fa2c6f6734a32cffe77ffe5a74d02bbfaa4ad70dd92fde43c47c090b663"
409409

410410
http_archive(
411411
name = "gapic_generator_ruby",

‎google/cloud/compute/v1/BUILD.bazel

Lines changed: 64 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@ proto_from_disco(
49 10000 49
load("@rules_proto//proto:defs.bzl", "proto_library")
5050
load("@com_google_googleapis_imports//:imports.bzl", "proto_library_with_info")
5151

52+
# TODO: Remove legacy rule imports after the monolith has been removed from this repo.
53+
load(
54+
"@com_google_api_codegen//rules_gapic:gapic.bzl",
55+
proto_library_with_info_legacy = "proto_library_with_info",
56+
)
57+
5258
proto_library(
5359
name = "compute_proto",
5460
srcs = [
@@ -71,6 +77,14 @@ proto_library_with_info(
7177
],
7278
)
7379

80+
proto_library_with_info_legacy(
81+
name = "compute_proto_with_info_legacy",
82+
deps = [
83+
":compute_proto",
84+
"@com_google_googleapis//google/cloud:common_resources_proto",
85+
],
86+
)
87+
7488
proto_library(
7589
name = "compute_small_proto",
7690
srcs = [
@@ -94,19 +108,35 @@ proto_library_with_info(
94108
],
95109
)
96110

111+
proto_library_with_info_legacy(
112+
name = "compute_small_proto_with_info_legacy",
113+
deps = [
114+
":compute_small_proto",
115+
"@com_google_googleapis//google/cloud:common_resources_proto",
116+
],
117+
)
118+
97119
##############################################################################
98120
# Java
99121
##############################################################################
100122
load(
101123
"@com_google_googleapis_imports//:imports.bzl",
102-
"java_gapic_assembly_gradle_pkg_legacy",
103-
"java_gapic_library_legacy",
104-
"java_gapic_test_legacy",
105124
"java_gapic_assembly_gradle_pkg",
106125
"java_gapic_library",
107126
"java_gapic_test",
108-
"java_proto_library",
109127
"java_grpc_library",
128+
"java_proto_library",
129+
)
130+
131+
# TODO: Remove legacy rule imports after the monolith has been removed from this repo.
132+
load(
133+
"@com_google_api_codegen//rules_gapic/java:java_gapic.bzl",
134+
java_gapic_library_legacy = "java_gapic_library",
135+
java_gapic_test_legacy = "java_gapic_test",
136+
)
137+
load(
138+
"@com_google_api_codegen//rules_gapic/java:java_gapic_pkg.bzl",
139+
java_gapic_assembly_gradle_pkg_legacy = "java_gapic_assembly_gradle_pkg",
110140
)
111141

112142
java_proto_library(
@@ -116,12 +146,12 @@ java_proto_library(
116146

117147
java_gapic_library_legacy(
118148
name = "compute_java_gapic",
119-
src = ":compute_proto_with_info",
149+
src = ":compute_proto_with_info_legacy",
120150
gapic_yaml = "compute_gapic.yaml",
121151
package = "google.cloud.compute.v1",
122152
service_yaml = "compute_v1.yaml",
123-
transport = "rest",
124153
test_deps = [],
154+
transport = "rest",
125155
deps = [
126156
":compute_java_proto",
127157
],
@@ -224,9 +254,9 @@ java_proto_library(
224254
# Used for integration tests
225255
java_gapic_library(
226256
name = "compute_small_java_gapic",
227-
srcs = [":compute_small_proto_with_info"],
228-
transport = "rest",
257+
srcs = [":compute_small_proto_with_info_legacy"],
229258
test_deps = [],
259+
transport = "rest",
230260
deps = [
231261
":compute_small_java_proto",
232262
],
@@ -294,9 +324,9 @@ py_gapic_assembly_pkg(
294324
##############################################################################
295325
load(
296326
"@com_google_googleapis_imports//:imports.bzl",
297-
php_gapic_assembly_pkg = "php_gapic_assembly_pkg2",
298-
php_gapic_library = "php_gapic_library2",
299-
php_proto_library = "php_proto_library2",
327+
"php_gapic_assembly_pkg",
328+
"php_gapic_library",
329+
"php_proto_library",
300330
)
301331

302332
php_proto_library(
@@ -371,37 +401,37 @@ nodejs_gapic_assembly_pkg(
371401
load(
372402
"@com_google_googleapis_imports//:imports.bzl",
373403
"ruby_cloud_gapic_library",
404+
"ruby_gapic_assembly_pkg",
374405
"ruby_proto_library",
375-
"ruby_gapic_assembly_pkg"
376406
)
377407

378408
ruby_proto_library(
379-
name = "compute_ruby_proto",
380-
deps = [":compute_proto"],
409+
name = "compute_ruby_proto",
410+
deps = [":compute_proto"],
381411
)
382412

383413
ruby_cloud_gapic_library(
384-
name = "compute_ruby_gapic",
385-
srcs = [":compute_proto_with_info"],
386-
ruby_cloud_title="Google Cloud Compute V1 (ALPHA)",
387-
ruby_cloud_description="google-cloud-compute-v1 is the official client library for the Google Cloud Compute V1 API. This library is considered to be in alpha. This means it is still a work-in-progress and under active development. Any release is subject to backwards-incompatible changes at any time.",
388-
extra_protoc_parameters = [
389-
"ruby-cloud-gem-name=google-cloud-compute-v1",
390-
"ruby-cloud-env-prefix=COMPUTE",
391-
"ruby-cloud-product-url=https://cloud.google.com/compute/",
392-
"ruby-cloud-api-id=compute.googleapis.com",
393-
"ruby-cloud-api-shortname=compute",
394-
"ruby-cloud-generate-transports=rest",
395-
],
396-
deps = [
397-
":compute_ruby_proto",
398-
],
414+
name = "compute_ruby_gapic",
415+
srcs = [":compute_proto_with_info"],
416+
extra_protoc_parameters = [
417+
"ruby-cloud-gem-name=google-cloud-compute-v1",
418+
"ruby-cloud-env-prefix=COMPUTE",
419+
"ruby-cloud-product-url=https://cloud.google.com/compute/",
420+
"ruby-cloud-api-id=compute.googleapis.com",
421+
"ruby-cloud-api-shortname=compute",
422+
"ruby-cloud-generate-transports=rest",
423+
],
424+
ruby_cloud_description = "google-cloud-compute-v1 is the official client library for the Google Cloud Compute V1 API. This library is considered to be in alpha. This means it is still a work-in-progress and under active development. Any release is subject to backwards-incompatible changes at any time.",
425+
ruby_cloud_title = "Google Cloud Compute V1 (ALPHA)",
426+
deps = [
427+
":compute_ruby_proto",
428+
],
399429
)
400430

401431
ruby_gapic_assembly_pkg(
402-
name = "google-cloud-compute-v1-ruby",
403-
deps = [
404-
":compute_ruby_gapic",
405-
":compute_ruby_proto",
406-
],
432+
name = "google-cloud-compute-v1-ruby",
433+
deps = [
434+
":compute_ruby_gapic",
435+
":compute_ruby_proto",
436+
],
407437
)

0 commit comments

Comments
 (0)
0