Merge pull request #9604 from protocolbuffers/3.20.x

Merge 3.20.x into master

CHANGES.txt

@@ -1,6 +1,11 @@
-Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
+2022-03-04 version 3.20.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 
   Ruby
+  * Dropped Ruby 2.3 and 2.4 support for CI and releases. (#9311)
+  * Message.decode/encode: Add max_recursion_depth option (#9218)
+  * Rename max_recursion_depth to recursion_limit (#9486)
+  * Fix conversion of singleton classes in Ruby (#9342)
+  * Suppress warning for intentional circular require (#9556)
   * JSON will now output shorter strings for double and float fields when possible
     without losing precision.
   * Encoding and decoding of binary format will now work properly on big-endian
@@ -10,37 +15,42 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
     putting such values in unknown fields.
 
   Java
+  * Revert "Standardize on Array copyOf" (#9400)
+  * Resolve more java field accessor name conflicts (#8198)
   * Don't support map fields in DynamicMessage.Builder.{getFieldBuilder,getRepeatedFieldBuilder}
   * Fix parseFrom to only throw InvalidProtocolBufferException
   * InvalidProtocolBufferException now allows arbitrary wrapped Exception types.
   * Fix bug in `FieldSet.Builder.mergeFrom`
   * Flush CodedOutputStream also flushes underlying OutputStream
   * When oneof case is the same and the field type is Message, merge the
     subfield. (previously it was replaced.)’
-  * add @CheckReturnValue to some protobuf types
+  * Add @CheckReturnValue to some protobuf types
   * Report original exceptions when parsing JSON
   * Add more info to @deprecated javadoc for set/get/has methods
   * Fix initialization bug in doc comment line numbers
   * Fix comments for message set wire format.
 
   Kotlin
+  * Add test scope to kotlin-test for protobuf-kotlin-lite (#9518)
   * Add orNull extensions for optional message fields.
   * Add orNull extensions to all proto3 message fields.
 
   Python
+  * Dropped support for Python < 3.7 (#9480)
+  * Protoc is now able to generate python stubs (.pyi) with --pyi_out
+  * Pin multibuild scripts to get manylinux1 wheels back (#9216)
   * Fix type annotations of some Duration and Timestamp methods.
   * Repeated field containers are now generic in field types and could be used
     in type annotations.
   * Protobuf python generated codes are simplified. Descriptors and message
     classes' definitions are now dynamic created in internal/builder.py.
     Insertion Points for messages classes are discarded.
-  * protoc is now able to generate python stub (.pyi) by --gen_pyi
   * has_presence is added for FieldDescriptor in python
   * Loosen indexing type requirements to allow valid __index__() implementations
     rather than only PyLongObjects.
   * Fix the deepcopy bug caused by not copying message_listener.
   * Added python JSON parse recursion limit (default 100)
-  * path info is added for python JSON parse errors
+  * Path info is added for python JSON parse errors
   * Pure python repeated scalar fields will not able to pickle. Convert to list
     first.
   * Timestamp.ToDatetime() now accepts an optional tzinfo parameter. If
@@ -82,18 +92,38 @@ Unreleased Changes (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
   * Implement on demand register ArenaDtor for InlinedStringField
 
   C++
-  * manually *struct Cord fields to work better with arenas.
-  * manually destruct map fields.
+  * Enable testing via CTest (#8737)
+  * Add option to use external GTest in CMake (#8736)
+  * CMake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (#8635) (#9529)
+  * Add cmake option `protobuf_INSTALL` to not install files (#7123)
+  * CMake: Allow custom plugin options e.g. to generate mocks (#9105)
+  * CMake: Use linker version scripts (#9545)
+  * Manually *struct Cord fields to work better with arenas.
+  * Manually destruct map fields.
   * Generate narrower code
   * Fix https://github.com/protocolbuffers/protobuf/issues/9378 by removing
     shadowed _cached_size_ field
   * Remove GetPointer() and explicit nullptr defaults.
-  * add proto_h flag for speeding up large builds
+  * Add proto_h flag for speeding up large builds
   * Add missing overload for reference wrapped fields.
   * Add MergedDescriptorDatabase::FindAllFileNames()
   * RepeatedField now defines an iterator type instead of using a pointer.
   * Remove obsolete macros GOOGLE_PROTOBUF_HAS_ONEOF and GOOGLE_PROTOBUF_HAS_ARENAS.
 
+  PHP
+  * Fix: add missing reserved classnames (#9458)
+  * PHP 8.1 compatibility (#9370)
+
+  C#
+  * Fix trim warnings (#9182)
+  * Fixes NullReferenceException when accessing FieldDescriptor.IsPacked (#9430)
+  * Add ToProto() method to all descriptor classes (#9426)
+  * Add an option to preserve proto names in JsonFormatter (#6307)
+
+  Objective-C
+  * Add prefix_to_proto_package_mappings_path option. (#9498)
+  * Rename `proto_package_to_prefix_mappings_path` to `package_to_prefix_mappings_path`. (#9552)
+  * Add a generation option to control use of forward declarations in headers. (#9568)
 
 2022-01-28 version 3.19.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
 

Protobuf-C++.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'Protobuf-C++'
-  s.version  = '3.19.4'
+  s.version  = '3.20.0-rc1'
   s.summary  = 'Protocol Buffers v3 runtime library for C++.'
   s.homepage = 'https://github.com/google/protobuf'
   s.license  = 'BSD-3-Clause'

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.19.4'
+  s.version  = '3.20.0-rc1'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   s.homepage = 'https://github.com/protocolbuffers/protobuf'
   s.license  = 'BSD-3-Clause'

cmake/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Minimum CMake required
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.5)
 
 if(protobuf_VERBOSE)
   message(STATUS "Protocol Buffers Configuring...")
@@ -135,7 +135,7 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map
     *;
 };")
 # CheckLinkerFlag module available in CMake >=3.18.
-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.18)
+if(${CMAKE_VERSION} VERSION_GREATER 3.18 OR ${CMAKE_VERSION} VERSION_EQUAL 3.18)
   include(CheckLinkerFlag)
   check_linker_flag(CXX -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map protobuf_HAVE_LD_VERSION_SCRIPT)
 else()
@@ -206,7 +206,7 @@ else (protobuf_BUILD_SHARED_LIBS)
   # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags
   # making programmatic control difficult.  Prefer the functionality in newer
   # CMake versions when available.
-  if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.15)
+  if(${CMAKE_VERSION} VERSION_GREATER 3.15 OR ${CMAKE_VERSION} VERSION_EQUAL 3.15)
     if (protobuf_MSVC_STATIC_RUNTIME)
         set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
     else()

cmake/libprotobuf-lite.cmake

@@ -94,16 +94,20 @@ endif()
 add_library(libprotobuf-lite ${protobuf_SHARED_OR_STATIC}
   ${libprotobuf_lite_files} ${libprotobuf_lite_includes} ${libprotobuf_lite_rc_files})
 if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  target_link_options(libprotobuf-lite PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf-lite.map)
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
+    target_link_options(libprotobuf-lite PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf-lite.map)
+  elseif(protobuf_BUILD_SHARED_LIBS)
+    target_link_libraries(libprotobuf-lite PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf-lite.map)
+  endif()
   set_target_properties(libprotobuf-lite PROPERTIES
     LINK_DEPENDS ${protobuf_source_dir}/src/libprotobuf-lite.map)
 endif()
-target_link_libraries(libprotobuf-lite ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(libprotobuf-lite PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 if(protobuf_LINK_LIBATOMIC)
-  target_link_libraries(libprotobuf-lite atomic)
+  target_link_libraries(libprotobuf-lite PRIVATE atomic)
 endif()
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-	target_link_libraries(libprotobuf-lite log)
+  target_link_libraries(libprotobuf-lite PRIVATE log)
 endif()
 target_include_directories(libprotobuf-lite PUBLIC ${protobuf_source_dir}/src)
 if(protobuf_BUILD_SHARED_LIBS)
@@ -113,7 +117,7 @@ if(protobuf_BUILD_SHARED_LIBS)
 endif()
 set_target_properties(libprotobuf-lite PROPERTIES
     VERSION ${protobuf_VERSION}
-    SOVERSION 30
+    SOVERSION 31
     OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
 add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)

cmake/libprotobuf.cmake

@@ -108,19 +108,23 @@ endif()
 add_library(libprotobuf ${protobuf_SHARED_OR_STATIC}
   ${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes} ${libprotobuf_rc_files})
 if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  target_link_options(libprotobuf PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf.map)
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
+    target_link_options(libprotobuf PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf.map)
+  elseif(protobuf_BUILD_SHARED_LIBS)
+    target_link_libraries(libprotobuf PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotobuf.map)
+  endif()
   set_target_properties(libprotobuf PROPERTIES
     LINK_DEPENDS ${protobuf_source_dir}/src/libprotobuf.map)
 endif()
-target_link_libraries(libprotobuf ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(libprotobuf PRIVATE ${CMAKE_THREAD_LIBS_INIT})
 if(protobuf_WITH_ZLIB)
-  target_link_libraries(libprotobuf ${ZLIB_LIBRARIES})
+  target_link_libraries(libprotobuf PRIVATE ${ZLIB_LIBRARIES})
 endif()
 if(protobuf_LINK_LIBATOMIC)
-  target_link_libraries(libprotobuf atomic)
+  target_link_libraries(libprotobuf PRIVATE atomic)
 endif()
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-	target_link_libraries(libprotobuf log)
+  target_link_libraries(libprotobuf PRIVATE log)
 endif()
 target_include_directories(libprotobuf PUBLIC ${protobuf_source_dir}/src)
 if(protobuf_BUILD_SHARED_LIBS)
@@ -130,7 +134,7 @@ if(protobuf_BUILD_SHARED_LIBS)
 endif()
 set_target_properties(libprotobuf PROPERTIES
     VERSION ${protobuf_VERSION}
-    SOVERSION 30
+    SOVERSION 31
     OUTPUT_NAME ${LIB_PREFIX}protobuf
     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
 add_library(protobuf::libprotobuf ALIAS libprotobuf)

cmake/libprotoc.cmake

@@ -132,20 +132,24 @@ endif()
 add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
   ${libprotoc_files} ${libprotoc_headers} ${libprotoc_rc_files})
 if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  target_link_options(libprotoc PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotoc.map)
+  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
+    target_link_options(libprotoc PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotoc.map)
+  elseif(protobuf_BUILD_SHARED_LIBS)
+    target_link_libraries(libprotoc PRIVATE -Wl,--version-script=${protobuf_source_dir}/src/libprotoc.map)
+  endif()
   set_target_properties(libprotoc PROPERTIES
     LINK_DEPENDS ${protobuf_source_dir}/src/libprotoc.map)
 endif()
-target_link_libraries(libprotoc libprotobuf)
-if(MSVC AND protobuf_BUILD_SHARED_LIBS)
+target_link_libraries(libprotoc PRIVATE libprotobuf)
+if(protobuf_BUILD_SHARED_LIBS)
   target_compile_definitions(libprotoc
     PUBLIC  PROTOBUF_USE_DLLS
     PRIVATE LIBPROTOC_EXPORTS)
 endif()
 set_target_properties(libprotoc PROPERTIES
     COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
     VERSION ${protobuf_VERSION}
-    SOVERSION 30
+    SOVERSION 31
     OUTPUT_NAME ${LIB_PREFIX}protoc
     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
 add_library(protobuf::libprotoc ALIAS libprotoc)

configure.ac

@@ -17,7 +17,7 @@ AC_PREREQ(2.59)
 # In the SVN trunk, the version should always be the next anticipated release
 # version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
 # the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.19.4],[protobuf@googlegroups.com],[protobuf])
+AC_INIT([Protocol Buffers],[3.20.0-rc-1],[protobuf@googlegroups.com],[protobuf])
 
 AM_MAINTAINER_MODE([enable])
 

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.19.4</version>
+    <version>3.20.0-rc1</version>
     <authors>Google Inc.</authors>
     <owners>protobuf-packages</owners>
     <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</licenseUrl>

csharp/src/Google.Protobuf/Google.Protobuf.csproj

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <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.19.4</VersionPrefix>
+    <VersionPrefix>3.20.0-rc1</VersionPrefix>
     <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
     <LangVersion>7.2</LangVersion>
     <Authors>Google Inc.</Authors>

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.19.4</version>
+  <version>3.20.0-rc-1</version>
 </dependency>
 ```
 
@@ -37,15 +37,15 @@ protobuf-java-util package:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java-util</artifactId>
-  <version>3.19.4</version>
+  <version>3.20.0-rc-1</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.19.4'
+    implementation 'com.google.protobuf:protobuf-java:3.20.0-rc-1'
 ```
 Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
 

java/bom/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-bom</artifactId>
-  <version>3.19.4</version>
+  <version>3.20.0-rc-1</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [BOM]</name>

java/core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.19.4</version>
+    <version>3.20.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-java</artifactId>

java/kotlin-lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.19.4</version>
+    <version>3.20.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-kotlin-lite</artifactId>

java/kotlin/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.19.4</version>
+    <version>3.20.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-kotlin</artifactId>

java/lite.md

@@ -30,7 +30,7 @@ protobuf Java runtime. If you are using Maven, use the following:
 <dependency>
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-javalite</artifactId>
-  <version>3.19.4</version>
+  <version>3.20.0-rc-1</version>
 </dependency>
 ```
 

java/lite/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.19.4</version>
+    <version>3.20.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-javalite</artifactId>

java/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-parent</artifactId>
-  <version>3.19.4</version>
+  <version>3.20.0-rc-1</version>
   <packaging>pom</packaging>
 
   <name>Protocol Buffers [Parent]</name>

java/util/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.protobuf</groupId>
     <artifactId>protobuf-parent</artifactId>
-    <version>3.19.4</version>
+    <version>3.20.0-rc-1</version>
   </parent>
 
   <artifactId>protobuf-java-util</artifactId>

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-protobuf",
-  "version": "3.19.4",
+  "version": "3.20.0-rc.1",
   "description": "Protocol Buffers for JavaScript",
   "main": "google-protobuf.js",
   "files": [