From e90450c58b40a998630881247dfac6374cea8730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=20Do=C3=A3n?= Date: Tue, 15 Mar 2022 11:08:46 +0900 Subject: [PATCH] Update protobuf to 3.20.0-rc1 to get prebuit protoc for M1 --- proto/private/BUILD.release | 9 +++ proto/private/dependencies.bzl | 100 ++++++++++++++++++--------------- 2 files changed, 63 insertions(+), 46 deletions(-) diff --git a/proto/private/BUILD.release b/proto/private/BUILD.release index 4c2a43f..bd4b301 100644 --- a/proto/private/BUILD.release +++ b/proto/private/BUILD.release @@ -9,6 +9,7 @@ alias( ":linux-s390x": "@com_google_protobuf_protoc_linux_s390_64//:protoc", ":linux-x86_32": "@com_google_protobuf_protoc_linux_x86_32//:protoc", ":linux-x86_64": "@com_google_protobuf_protoc_linux_x86_64//:protoc", + ":macos-aarch64": "@com_google_protobuf_protoc_macos_aarch64//:protoc", ":macos-x86_64": "@com_google_protobuf_protoc_macos_x86_64//:protoc", ":windows-x86_32": "@com_google_protobuf_protoc_windows_x86_32//:protoc", ":windows-x86_64": "@com_google_protobuf_protoc_windows_x86_64//:protoc", @@ -129,6 +130,14 @@ config_setting( ], ) +config_setting( + name = "macos-aarch64", + constraint_values = [ + "@platforms//os:osx", + "@platforms//cpu:arm64", + ], +) + config_setting( name = "macos-x86_64", constraint_values = [ diff --git a/proto/private/dependencies.bzl b/proto/private/dependencies.bzl index 7d539ac..ebc2860 100644 --- a/proto/private/dependencies.bzl +++ b/proto/private/dependencies.bzl @@ -23,75 +23,83 @@ dependencies = { ], }, "com_github_protocolbuffers_protobuf": { - "sha256": "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e", - "strip_prefix": "protobuf-3.19.2", + "sha256": "413cdd214172f2124da8201e8b7281dc39073364ee2cb2a4c152eeb7db837be9", + "strip_prefix": "protobuf-3.20.0-rc1", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", - "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.20.0-rc1.tar.gz", + "https://github.com/protocolbuffers/protobuf/archive/v3.20.0-rc1.tar.gz", ], }, "com_google_protobuf_protoc_linux_aarch64": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "d14af76a12eaf22cb96c9eec4c82b2132f3b1ee29bd43e07551e4a3cef5cc16a", + "sha256": "b8a7f2e839825bd587cdc08f63ad019d0e6804e1c91b33d76ad9ada2bdf447a6", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-aarch_64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-aarch_64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-aarch_64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-aarch_64.zip", ], }, "com_google_protobuf_protoc_linux_ppc": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "b61467465e00ec86bc08b3a782f99abceadbcd91ac5c6124fe150db7a6426f66", + "sha256": "83ecdbb5d6840854eb8f4258d67df90292352b6788fab3f7663b7a83d81d2cf9", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-ppcle_64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-ppcle_64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-ppcle_64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-ppcle_64.zip", ], }, "com_google_protobuf_protoc_linux_s390_64": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "494c25dfbc302472de03b38959b149d94f6a29be3a7644e71b3d605d3b125e30", + "sha256": "59abfe5fd17a2b4c63c8400ab62e3ac548325654edfb266404dfffd5ed7172e6", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-s390_64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-s390_64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-s390_64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-s390_64.zip", ], }, "com_google_protobuf_protoc_linux_x86_32": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "1d4296cade2fe12215064d440a5c692681b5a0cda02ac9ca2b4e742baa6ad30f", + "sha256": "89638877495606273ace0a6bdd977958a127c6905942548d84fa5d86fd6b6707", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-x86_32.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-x86_32.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-x86_32.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-x86_32.zip", ], }, "com_google_protobuf_protoc_linux_x86_64": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "595ac0beaa7d2d6a672911b3b39a27fea964a5e76eeeba418a4bd3c4e8f72405", + "sha256": "199815b528cc1dfc2c83a9a7c6381db5dc658e4901fa41847707f20116e2ea36", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-x86_64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-linux-x86_64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-x86_64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-linux-x86_64.zip", + ], + }, + "com_google_protobuf_protoc_macos_aarch64": { + "build_file": "@rules_proto//proto/private:BUILD.protoc", + "sha256": "0019dfc4b32d63c1392aa264aed2253c1e0c2fb09216f8e2cc269bbfb8bb49b5", + "urls": [ + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-osx-aarch64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-osx-aarch64.zip", ], }, "com_google_protobuf_protoc_macos_x86_64": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "1af3bdcd1e684d7cbf498749f630574609f75bc33e50b03e0c9f7243d9986771", + "sha256": "bec1e105021fdf15d283e90a7e28b0b1b720c74b31d3369321d3bee9eb2dbc65", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-osx-x86_64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-osx-x86_64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-osx-x86_64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-osx-x86_64.zip", ], }, "com_google_protobuf_protoc_windows_x86_32": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "0135c6abdfc7a81e5ee9cdac8ffd7380d0bb95eacf7504f6e3570cf0e8d7e1c9", + "sha256": "144c390363aaee09883ca893860df6b8ef004de89bb61615b5478c53262c49c8", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-win32.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-win32.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-win32.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-win32.zip", ], }, "com_google_protobuf_protoc_windows_x86_64": { "build_file": "@rules_proto//proto/private:BUILD.protoc", - "sha256": "465eabb87b38c1f26f0c5404561611ad5ed9f961bd0cda095a112f641846c3d0", + "sha256": "50911080257434de19ddceb57d2081a91356c7ada33e4b36259eff497296f76e", "urls": [ - "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-win64.zip", - "https://github.com/protocolbuffers/protobuf/releases/download/v3.19.2/protoc-3.19.2-win64.zip", + "https://mirror.bazel.build/github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-win64.zip", + "https://github.com/protocolbuffers/protobuf/releases/download/v3.20.0-rc1/protoc-3.20.0-rc-1-win64.zip", ], }, # Dependency of `com_github_protocolbuffers_protobuf`. @@ -135,42 +143,42 @@ dependencies = { maven_dependencies = { "com_google_protobuf_protobuf_java": { - "jar_sha256": "3446cbfa13795228bc6549b91a409f27cdf6913d1c8f03e0f99572988623a04b", + "jar_sha256": "b73e2358180ad2c8fbea94d6a81067c3ad3fdbbb806aba164d77c44f31ac7f84", "jar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.20.0-rc-1/protobuf-java-3.20.0-rc-1.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.20.0-rc-1/protobuf-java-3.20.0-rc-1.jar", ], "licenses": ["notice"], - "srcjar_sha256": "5150243063356046d85f2949f471cf533ee4b44d31052f419fa5e70a72e76baf", + "srcjar_sha256": "847ec5706dd051385ed382fdfa70f7906d9941408018bf34bea86739ebab72ea", "srcjar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2-sources.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.2/protobuf-java-3.19.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.20.0-rc-1/protobuf-java-3.20.0-rc-1-sources.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.20.0-rc-1/protobuf-java-3.20.0-rc-1-sources.jar", ], }, "com_google_protobuf_protobuf_java_util": { - "jar_sha256": "9588d67db391b19cffb4ec658d9365ac5362b2089661c157fd27f21380cdd1e8", + "jar_sha256": "0c299390c042fee67615c6adc16114251b7e6141c49beafcc7b3e2901129a233", "jar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.19.2/protobuf-java-util-3.19.2.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.19.2/protobuf-java-util-3.19.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.20.0-rc-1/protobuf-java-util-3.20.0-rc-1.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.20.0-rc-1/protobuf-java-util-3.20.0-rc-1.jar", ], "licenses": ["notice"], - "srcjar_sha256": "1733265b9938f062042cb70a3f330617885351097bddc1dd3e22eed9d803530f", + "srcjar_sha256": "d2fe944e7e63bce96fa84bb13db69865cba13c4453dd4736154eb6f818700518", "srcjar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.19.2/protobuf-java-util-3.19.2-sources.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.19.2/protobuf-java-util-3.19.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.20.0-rc-1/protobuf-java-util-3.20.0-rc-1-sources.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.20.0-rc-1/protobuf-java-util-3.20.0-rc-1-sources.jar", ], }, "com_google_protobuf_protobuf_javalite": { - "jar_sha256": "bfc598474392a015c050d34be38bb84eb3986809374eac437420d51680150e94", + "jar_sha256": "1e90444338b711b4adbfaf8fea0defd8f2b877620a631fd32e62097d2981f496", "jar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.20.0-rc-1/protobuf-javalite-3.20.0-rc-1.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.20.0-rc-1/protobuf-javalite-3.20.0-rc-1.jar", ], "licenses": ["notice"], - "srcjar_sha256": "0154a27b8b6e4753013922fc8e50c59ebd7108af95f11fa9bc6b72ef14db0dc9", + "srcjar_sha256": "114ea0726e892f87bc10b7749037aff658cb456d621ef529b24739d263f425f4", "srcjar_urls": [ - "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2-sources.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.19.2/protobuf-javalite-3.19.2-sources.jar", + "https://mirror.bazel.build/repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.20.0-rc-1/protobuf-javalite-3.20.0-rc-1-sources.jar", + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.20.0-rc-1/protobuf-javalite-3.20.0-rc-1-sources.jar", ], }, }