Merge pull request protocolbuffers#139 from dibenede/prepare-release

lukesandberg · web-flow · commit b792840136d0 · 2022-10-07T11:25:33.000-07:00
Prepare release
diff --git a/WORKSPACE b/WORKSPACE
@@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "com_google_protobuf",
-    strip_prefix = "protobuf-21.0-rc1",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.0-rc1.zip"],
+    strip_prefix = "protobuf-21.3",
+    urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.3.zip"],
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.21.0",
+  "version": "3.21.1",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [
diff --git a/protobuf_javascript_release.bzl b/protobuf_javascript_release.bzl
@@ -1,11 +1,10 @@
-"""
-Generates package naming variables for use with rules_pkg.
-"""
+"""Generates package naming variables for use with rules_pkg."""
 
 load("@rules_pkg//:providers.bzl", "PackageVariablesInfo")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 
-_PROTOBUF_JAVASCRIPT_VERSION = '3.21.0'
+_PROTOBUF_JAVASCRIPT_VERSION = "3.21.1"
+
 
 def _package_naming_impl(ctx):
   values = {}
@@ -37,15 +36,17 @@ def _package_naming_impl(ctx):
   else:
     values["platform"] = "unknown"
 
-  return PackageVariablesInfo(values = values)
+  return PackageVariablesInfo(values=values)
 
 
 package_naming = rule(
-  implementation = _package_naming_impl,
-    attrs = {
-      # Necessary data dependency for find_cpp_toolchain.
-      "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
+    implementation=_package_naming_impl,
+    attrs={
+        # Necessary data dependency for find_cpp_toolchain.
+        "_cc_toolchain":
+            attr.label(
+                default=Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
     },
-    toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
-    incompatible_use_toolchain_transition = True,
-)
+    toolchains=["@bazel_tools//tools/cpp:toolchain_type"],
+    incompatible_use_toolchain_transition=True,
+)

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")`
`4`	`4`
`5`	`5`	`http_archive(`
`6`	`6`	`name = "com_google_protobuf",`
`7`		`- strip_prefix = "protobuf-21.0-rc1",`
`8`		`- urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.0-rc1.zip"],`
	`7`	`+ strip_prefix = "protobuf-21.3",`
	`8`	`+ urls = ["https://github.com/protocolbuffers/protobuf/archive/refs/tags/v21.3.zip"],`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "google-protobuf",`
`3`		`- "version": "3.21.0",`
	`3`	`+ "version": "3.21.1",`
`4`	`4`	`"description": "Protocol Buffers for JavaScript",`
`5`	`5`	`"main": "google-protobuf.js",`
`6`	`6`	`"files": [`