Sync from Piper @482325250

PROTOBUF_SYNC_PIPER

Author: mkruskal-google

.github/workflows/codespell.yml

@@ -13,4 +13,4 @@ jobs:
         with:
           check_filenames: true
           skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
-          ignore_words_list: "alow,alse,ba,chec,cleare,copyable,cloneable,dedup,dur,errorprone,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy"
+          ignore_words_list: "alow,alse,ba,chec,cleare,copyable,cloneable,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur,falsy"

.gitmodules

@@ -9,3 +9,6 @@
 [submodule "third_party/jsoncpp"]
 	path = third_party/jsoncpp
 	url = https://github.com/open-source-parsers/jsoncpp.git
+[submodule "third_party/utf8_range"]
+	path = third_party/utf8_range
+	url = https://github.com/protocolbuffers/utf8_range.git

CHANGES.txt

@@ -67,6 +67,20 @@
   Compiler
   * Print full path name of source .proto file on error
 
+2022-10-18 version 21.8 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
+
+  Other
+  * Fix for grpc.tools #17995 & protobuf #7474 (handle UTF-8 paths in argumentfile) (#10721)
+
+  C++
+  * 21.x No longer define no_threadlocal on OpenBSD (#10743)
+
+  Java
+  * Mark default instance as immutable first to avoid race during static initialization of default instances (#10771)
+
+  Ruby
+  * Auto capitalize enums name in Ruby (#10454) (#10763)
+
 2022-09-29 version 21.7 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
   Java
   * Refactoring java full runtime to reuse sub-message builders and prepare to

CMakeLists.txt

@@ -330,6 +330,7 @@ set_property(CACHE protobuf_ABSL_PROVIDER PROPERTY STRINGS "module" "package")
 include(${protobuf_SOURCE_DIR}/cmake/abseil-cpp.cmake)
 
 if (protobuf_BUILD_PROTOBUF_BINARIES)
+  include(${protobuf_SOURCE_DIR}/cmake/utf8_range.cmake)
   include(${protobuf_SOURCE_DIR}/cmake/libprotobuf-lite.cmake)
   if (NOT DEFINED protobuf_LIB_PROTOBUF_LITE)
     set(protobuf_LIB_PROTOBUF_LITE libprotobuf-lite)

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

WORKSPACE

@@ -80,6 +80,9 @@ upb_deps()
 load("@upb//bazel:system_python.bzl", "system_python")
 system_python(name = "local_config_python")
 
+load("@utf8_range//:workspace_deps.bzl", "utf8_range_deps")
+utf8_range_deps()
+
 bind(
     name = "python_headers",
     actual = "@local_config_python//:python_headers",

build_defs/cpp_opts.bzl

@@ -14,16 +14,16 @@ COPTS = select({
         "/wd4506",  # no definition for inline function 'function'
         "/wd4800",  # 'type' : forcing value to bool 'true' or 'false' (performance warning)
         "/wd4996",  # The compiler encountered a deprecated declaration.
+        "/std:c++14",  # Use C++14
     ],
     "//conditions:default": [
         "-DHAVE_ZLIB",
         "-Woverloaded-virtual",
         "-Wno-sign-compare",
         "-Werror",
+        "-std=c++14",  # Protobuf requires C++14.
     ],
-}) + [
-    "-std=c++14",  # Protobuf requires C++14.
-]
+})
 
 # Android and MSVC builds do not need to link in a separate pthread library.
 LINK_OPTS = select({

cmake/conformance.cmake

@@ -1,4 +1,14 @@
 
+if (NOT EXISTS "${protobuf_SOURCE_DIR}/third_party/jsoncpp/CMakeLists.txt")
+  message(FATAL_ERROR
+          "Cannot find third_party/jsoncpp directory that's needed to "
+          "build conformance tests. If you use git, make sure you have cloned "
+          "submodules:\n"
+          "  git submodule update --init --recursive\n"
+          "If instead you want to skip them, run cmake with:\n"
+          "  cmake -Dprotobuf_BUILD_CONFORMANCE=OFF\n")
+endif()
+
 add_custom_command(
   OUTPUT
     ${protobuf_SOURCE_DIR}/conformance/conformance.pb.h
@@ -33,8 +43,6 @@ add_executable(conformance_test_runner
   ${protobuf_SOURCE_DIR}/conformance/conformance_test_main.cc
   ${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.cc
   ${protobuf_SOURCE_DIR}/conformance/text_format_conformance_suite.h
-  ${protobuf_SOURCE_DIR}/conformance/third_party/jsoncpp/json.h
-  ${protobuf_SOURCE_DIR}/conformance/third_party/jsoncpp/jsoncpp.cpp
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.pb.h
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
   ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.pb.h
@@ -74,3 +82,8 @@ add_test(NAME conformance_cpp_test
     --output_dir ${protobuf_TEST_XML_OUTDIR}
     ${CMAKE_CURRENT_BINARY_DIR}/conformance_cpp
   DEPENDS conformance_test_runner conformance_cpp)
+
+set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Disable tests")
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp third_party/jsoncpp)
+target_include_directories(conformance_test_runner PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp/include)
+target_link_libraries(conformance_test_runner jsoncpp_lib)

cmake/libprotobuf-lite.cmake

@@ -34,3 +34,6 @@ set_target_properties(libprotobuf-lite PROPERTIES
     OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
 add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
+
+target_include_directories(libprotobuf-lite PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range)
+target_link_libraries(libprotobuf-lite PRIVATE utf8_validity)

cmake/libprotobuf.cmake

@@ -37,3 +37,6 @@ set_target_properties(libprotobuf PROPERTIES
     OUTPUT_NAME ${LIB_PREFIX}protobuf
     DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
 add_library(protobuf::libprotobuf ALIAS libprotobuf)
+
+target_include_directories(libprotobuf PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range)
+target_link_libraries(libprotobuf PRIVATE utf8_validity)