Add Protobuf v23.1 (#1241)

Author: mering

modules/protobuf/23.1/MODULE.bazel

@@ -0,0 +1,48 @@
+module(
+    name = "protobuf",
+    compatibility_level = 1,
+    version = "23.1",
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.0.3")
+bazel_dep(name = "rules_python", version = "0.10.2")
+bazel_dep(name = "rules_cc", version = "0.0.1")
+bazel_dep(name = "rules_proto", version = "4.0.0")
+bazel_dep(name = "rules_java", version = "4.0.0")
+bazel_dep(name = "rules_pkg", version = "0.7.0")
+bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl", version = "20230802.0.bcr.1")
+bazel_dep(name = "zlib", version = "1.2.11")
+bazel_dep(name = "upb", version = "0.0.0-20230516-61a97ef")
+
+# Do not take the effort to convert utf8_range to Bzlmod as this has been moved to protobuf/third_party
+# See https://github.com/protocolbuffers/utf8_range/commit/1d1ea7e3fedf482d4a12b473c1ed25fe0f371a45
+non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps")
+use_repo(non_module_deps, "utf8_range")
+
+# TODO: Add missing rules_kotlin
+
+# Maven dependencies
+bazel_dep(name = "rules_jvm_external", version = "4.4.2")
+
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+maven.install(
+    name = "maven",
+    artifacts = [
+        "com.google.code.findbugs:jsr305:3.0.2",
+        "com.google.code.gson:gson:2.8.9",
+        "com.google.errorprone:error_prone_annotations:2.3.2",
+        "com.google.j2objc:j2objc-annotations:1.3",
+        "com.google.guava:guava:31.1-jre",
+        "com.google.guava:guava-testlib:31.1-jre",
+        "com.google.truth:truth:1.1.2",
+        "junit:junit:4.13.2",
+        "org.mockito:mockito-core:4.3.1",
+    ],
+)
+
+use_repo(maven, "maven")
+
+# Dependencies needed in tests
+bazel_dep(name = "googletest", repo_name = "com_google_googletest", version = "1.11.0")

modules/protobuf/23.1/patches/0001-Add-MODULE.bazel.patch

@@ -0,0 +1,62 @@
+From f277c65e9984a9fe234e8a3bf428a5ec5b6ce33c Mon Sep 17 00:00:00 2001
+From: Ivo List <[email protected]>
+Date: Fri, 29 Dec 2023 14:30:31 +0000
+Subject: [PATCH 1/7] Add MODULE.bazel
+
+---
+ MODULE.bazel | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 43 insertions(+)
+ create mode 100644 MODULE.bazel
+
+diff --git a/MODULE.bazel b/MODULE.bazel
+new file mode 100644
+index 000000000..bc361e606
+--- /dev/null
++++ b/MODULE.bazel
+@@ -0,0 +1,43 @@
++module(
++    name = "protobuf",
++    compatibility_level = 1,
++    version = "23.1",
++)
++
++bazel_dep(name = "bazel_skylib", version = "1.0.3")
++bazel_dep(name = "rules_python", version = "0.10.2")
++bazel_dep(name = "rules_cc", version = "0.0.1")
++bazel_dep(name = "rules_proto", version = "4.0.0")
++bazel_dep(name = "rules_java", version = "4.0.0")
++bazel_dep(name = "rules_pkg", version = "0.7.0")
++bazel_dep(name = "platforms", version = "0.0.8")
++bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl", version = "20230802.0.bcr.1")
++bazel_dep(name = "zlib", version = "1.2.11")
++bazel_dep(name = "upb", version = "0.0.0-20230516-61a97ef")
++
++# TODO: Add missing rules_kotlin
++
++# Maven dependencies
++bazel_dep(name = "rules_jvm_external", version = "4.4.2")
++
++maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
++
++maven.install(
++    name = "maven",
++    artifacts = [
++        "com.google.code.findbugs:jsr305:3.0.2",
++        "com.google.code.gson:gson:2.8.9",
++        "com.google.errorprone:error_prone_annotations:2.3.2",
++        "com.google.j2objc:j2objc-annotations:1.3",
++        "com.google.guava:guava:31.1-jre",
++        "com.google.guava:guava-testlib:31.1-jre",
++        "com.google.truth:truth:1.1.2",
++        "junit:junit:4.13.2",
++        "org.mockito:mockito-core:4.3.1",
++    ],
++)
++
++use_repo(maven, "maven")
++
++# Dependencies needed in tests
++bazel_dep(name = "googletest", repo_name = "com_google_googletest", version = "1.11.0")
+-- 
+2.42.1
+

modules/protobuf/23.1/patches/0002-Add-utf8_range-dependency.patch

@@ -0,0 +1,39 @@
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -15,6 +15,11 @@ bazel_dep(name = "abseil-cpp", repo_name = "com_google_absl", version = "2023080
+ bazel_dep(name = "zlib", version = "1.2.11")
+ bazel_dep(name = "upb", version = "0.0.0-20230516-61a97ef")
+ 
++# Do not take the effort to convert utf8_range to Bzlmod as this has been moved to protobuf/third_party
++# See https://github.com/protocolbuffers/utf8_range/commit/1d1ea7e3fedf482d4a12b473c1ed25fe0f371a45
++non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps")
++use_repo(non_module_deps, "utf8_range")
++
+ # TODO: Add missing rules_kotlin
+ 
+ # Maven dependencies
+diff --git a/non_module_deps.bzl b/non_module_deps.bzl
+new file mode 100644
+index 000000000..5cc13d7f7
+--- /dev/null
++++ b/non_module_deps.bzl
+@@ -0,0 +1,19 @@
++load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
++
++def _github_archive(repo, commit, **kwargs):
++    repo_name = repo.split("/")[-1]
++    http_archive(
++        urls = [repo + "/archive/" + commit + ".zip"],
++        strip_prefix = repo_name + "-" + commit,
++        **kwargs
++    )
++
++def _non_module_deps_impl(ctx):
++    _github_archive(
++        name = "utf8_range",
++        repo = "https://github.com/protocolbuffers/utf8_range",
++        commit = "de0b4a8ff9b5d4c98108bdfe723291a33c52c54f",
++        sha256 = "5da960e5e5d92394c809629a03af3c7709d2d3d0ca731dacb3a9fb4bf28f7702",
++    )
++
++non_module_deps = module_extension(implementation = _non_module_deps_impl)

modules/protobuf/23.1/patches/0003-Examples-MODULE.bazel.patch

@@ -0,0 +1,29 @@
+From 5f1b71dd4fac28f1a1006934f9f91276d52afa29 Mon Sep 17 00:00:00 2001
+From: Ivo List <[email protected]>
+Date: Fri, 29 Dec 2023 14:30:57 +0000
+Subject: [PATCH 3/7] Examples MODULE.bazel
+
+---
+ examples/MODULE.bazel | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+ create mode 100644 examples/MODULE.bazel
+
+diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel
+new file mode 100644
+index 000000000..7e7f44fb4
+--- /dev/null
++++ b/examples/MODULE.bazel
+@@ -0,0 +1,10 @@
++bazel_dep(name = "rules_cc", version = "0.0.1")
++bazel_dep(name = "rules_proto", version = "4.0.0")
++bazel_dep(name = "rules_java", version = "4.0.0")
++bazel_dep(name = "rules_pkg", version = "0.7.0")
++bazel_dep(name = "protobuf", repo_name = "com_google_protobuf")
++
++local_path_override(
++    module_name = "protobuf",
++    path = "..",
++)
+-- 
+2.42.1
+

modules/protobuf/23.1/patches/0004-Relative-labels.patch

@@ -0,0 +1,39 @@
+From 51c98cb671084be03431d248dd54eaa2de066c09 Mon Sep 17 00:00:00 2001
+From: Ivo List <[email protected]>
+Date: Fri, 29 Dec 2023 14:47:06 +0000
+Subject: [PATCH 4/7] Relative labels
+
+---
+ protobuf.bzl      | 4 ++--
+ protobuf_deps.bzl | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/protobuf.bzl b/protobuf.bzl
+index d96eeb4c9..e7b7a14eb 100644
+--- a/protobuf.bzl
++++ b/protobuf.bzl
+@@ -493,8 +493,8 @@ def internal_ruby_proto_library(
+         srcs = [],
+         deps = [],
+         includes = ["."],
+-        default_runtime = "@com_google_protobuf//ruby:protobuf",
+-        protoc = "@com_google_protobuf//:protoc",
++        default_runtime = Label("//ruby:protobuf"),
++        protoc = Label("//:protoc"),
+         testonly = None,
+         visibility = ["//visibility:public"],
+         **kwargs):
+diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
+index 37da217ee..7d825b4c7 100644
+--- a/protobuf_deps.bzl
++++ b/protobuf_deps.bzl
+@@ -153,5 +153,5 @@ def protobuf_deps():
+             repo = "https://github.com/protocolbuffers/upb",
+             commit = "61a97efa24a5ce01fb8cc73c9d1e6e7060f8ea98",
+             sha256 = "0c57aac04d62eeabe097513593c800a99aa3f5d8ac1e7871c7afadbe1d39851a",
+-            patches = ["@com_google_protobuf//build_defs:upb.patch"],
++            patches = ["//build_defs:upb.patch"],
+         )
+-- 
+2.42.1
+

modules/protobuf/23.1/patches/0005-Migrate-from-bind-to-alias.patch

@@ -0,0 +1,43 @@
+--- a/python/BUILD.bazel
++++ b/python/BUILD.bazel
+@@ -77,7 +77,7 @@ cc_binary(
+     ],
+     deps = select({
+         "//conditions:default": [],
+-        ":use_fast_cpp_protos": ["//external:python_headers"],
++        ":use_fast_cpp_protos": ["//third_party:python_headers"],
+     }),
+ )
+ 
+@@ -116,7 +116,7 @@ cc_binary(
+         "//src/google/protobuf:descriptor_legacy",
+     ] + select({
+         "//conditions:default": [],
+-        ":use_fast_cpp_protos": ["//external:python_headers"],
++        ":use_fast_cpp_protos": ["//third_party:python_headers"],
+     }),
+ )
+ 
+@@ -379,7 +379,7 @@ cc_library(
+     hdrs = ["google/protobuf/proto_api.h"],
+     visibility = ["//visibility:public"],
+     deps = [
+-        "//external:python_headers",
++        "//third_party:python_headers",
+     ],
+ )
+ 
+diff --git a/third_party/BUILD.bazel b/third_party/BUILD.bazel
+index d12b3e37f..2abc1e7ec 100644
+--- a/third_party/BUILD.bazel
++++ b/third_party/BUILD.bazel
+@@ -2,3 +2,9 @@ exports_files([
+     "BUILD.bazel",
+     "zlib.BUILD",
+ ])
++
++alias(
++    name = "python_headers",
++    actual = "@rules_python//python/cc:current_py_cc_headers",
++    visibility = ["//visibility:public"],
++)