Main 202212161220 (protocolbuffers#11340)

Closes protocolbuffers#11340 COPYBARA_INTEGRATE_REVIEW=protocolbuffers#11340 from protocolbuffers:main-202212161220 c39ccb7 PiperOrigin-RevId: 496029356
ChristianToepfer · Dec 17, 2022 · 1697e45 · 1697e45
1 parent 832faf8
commit 1697e45
Show file tree

Hide file tree

Showing 30 changed files with 431 additions and 90 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -81,6 +81,19 @@
   * Print full path name of source .proto file on error
   * Include proto message type in the annotation comments.
 
+2022-12-13 version 21.12 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+
+  Python
+  * Fix broken enum ranges (#11171)
+  * Stop requiring extension fields to have a sythetic oneof (#11091)
+  * Python runtime 4.21.10 not works generated code can not load valid proto.
+    (#11171)
+
+2022-12-07 version 21.11 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+  Python
+  * Add license file to pypi wheels (#10936)
+  * Fix round-trip bug (#10158)
+
 2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
 
   Java

diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.21.10'
+  s.version  = '3.21.12'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

diff --git a/Protobuf.podspec b/Protobuf.podspec
@@ -5,7 +5,7 @@
 # dependent projects use the :git notation to refer to the library.
 Pod::Spec.new do |s|
   s.name     = 'Protobuf'
-  s.version  = '3.21.10'
+  s.version  = '3.21.12'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

diff --git a/csharp/Google.Protobuf.Tools.nuspec b/csharp/Google.Protobuf.Tools.nuspec
@@ -5,7 +5,7 @@
     <title>Google Protocol Buffers tools</title>
     <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
     <description>See project site for more info.</description>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj
@@ -5,7 +5,7 @@
     <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
     <Copyright>Copyright 2015, Google Inc.</Copyright>
     <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.21.10</VersionPrefix>
+    <VersionPrefix>3.21.12</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Google Inc.</Authors>
     <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

diff --git a/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs b/csharp/src/Google.Protobuf/Reflection/Descriptor.pb.cs
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs b/csharp/src/Google.Protobuf/WellKnownTypes/Any.pb.cs
@@ -64,6 +64,10 @@ static AnyReflection() {
   ///     if (any.is(Foo.class)) {
   ///       foo = any.unpack(Foo.class);
   ///     }
+  ///     // or ...
+  ///     if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+  ///       foo = any.unpack(Foo.getDefaultInstance());
+  ///     }
   ///
   /// Example 3: Pack and unpack a message in Python.
   ///

diff --git a/java/README.md b/java/README.md
@@ -23,7 +23,7 @@ If you are using Maven, use the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java</artifactId>
-  <version>3.21.10</version>
+  <version>3.21.12</version>
 </dependency>
 ```
 
@@ -37,17 +37,16 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.21.10</version>
+  <version>3.21.12</version>
 </dependency>
 ```
 
 ### Gradle
 
-If you are using Gradle, add the following to your `build.gradle` file's dependencies:
-```
-    implementation 'com.google.protobuf:protobuf-java:3.21.10'
-```
-Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
+If you are using Gradle, add the following to your `build.gradle` file's
+dependencies: `implementation 'com.google.protobuf:protobuf-java:3.21.12'`
+Again, be sure to check that the version number matches (or is newer than) the
+version number of protoc that you are using.
 
 ### Use Java Protocol Buffers on Android
 

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.21.10</version>
+  <version>3.21.12</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

diff --git a/java/core/pom.xml b/java/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

diff --git a/java/lite.md b/java/lite.md
@@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-javalite</artifactId>
-  <version>3.21.10</version>
+  <version>3.21.12</version>
 </dependency>
 ```
 

diff --git a/java/lite/pom.xml b/java/lite/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

diff --git a/java/pom.xml b/java/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.21.10</version>
+  <version>3.21.12</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

diff --git a/java/util/pom.xml b/java/util/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.21.10</version>
+    <version>3.21.12</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h
@@ -127,7 +127,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO()
 
-#define PHP_PROTOBUF_VERSION "3.21.10"
+#define PHP_PROTOBUF_VERSION "3.21.12"
 
 // ptr -> PHP object cache. This is a weak map that caches lazily-created
 // wrapper objects around upb types:

diff --git a/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php b/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php
diff --git a/php/src/Google/Protobuf/Any.php b/php/src/Google/Protobuf/Any.php
diff --git a/php/src/Google/Protobuf/Internal/EnumOptions.php b/php/src/Google/Protobuf/Internal/EnumOptions.php
diff --git a/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php b/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php