Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2023-07-08 22:46:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Sat Jul 8 22:46:26 2023 rev:75 rq:1097523 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2023-07-04 15:21:43.381968765 +0200 +++ /work/SRC/openSUSE:Factory/.protobuf.new.23466/protobuf.changes 2023-07-08 22:46:33.506912467 +0200 @@ -1,0 +2,7 @@ +Fri Jul 7 12:04:43 UTC 2023 - Dirk Müller <[email protected]> + +- update to 23.4: + * Add dllexport_decl for generated default instance. + * Deps: Update Guava to 32.0.1 + +------------------------------------------------------------------- Old: ---- protobuf-23.3.tar.gz New: ---- protobuf-23.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.pzUyMl/_old 2023-07-08 22:46:34.458918190 +0200 +++ /var/tmp/diff_new_pack.pzUyMl/_new 2023-07-08 22:46:34.462918214 +0200 @@ -25,8 +25,8 @@ %bcond_without java %bcond_without python3 Name: protobuf -Version: 23.3 -%global sover 23_3_0 +Version: 23.4 +%global sover 23_4_0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.pzUyMl/_old 2023-07-08 22:46:34.494918405 +0200 +++ /var/tmp/diff_new_pack.pzUyMl/_new 2023-07-08 22:46:34.498918430 +0200 @@ -1,4 +1,4 @@ -libprotobuf23_3_0 -libprotoc23_3_0 -libprotobuf-lite23_3_0 +libprotobuf23_4_0 +libprotoc23_4_0 +libprotobuf-lite23_4_0 ++++++ protobuf-23.3.tar.gz -> protobuf-23.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/.github/workflows/staleness_check.yml new/protobuf-23.4/.github/workflows/staleness_check.yml --- old/protobuf-23.3/.github/workflows/staleness_check.yml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/.github/workflows/staleness_check.yml 2023-07-05 23:53:30.000000000 +0200 @@ -30,21 +30,28 @@ with: ref: ${{ inputs.safe-checkout || matrix.branch}} - # For commit-based tests, simply run the bazel query to make sure it works. This should be - # identical to the step below, except for the xargs piece that runs bazel test. - - name: Check that staleness tests are queryable - if: ${{ github.event_name == 'pull_request_target' || github.event_name == 'pull_request' || github.event_name == 'push' }} - uses: protocolbuffers/protobuf-ci/bazel-docker@v1 - with: - image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:6.0.0-6361b3a6e5c97e9951d03a4de28542fc45f1adab - credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} - bazel-cache: staleness_check/${{ matrix.branch}}_${{ matrix.os.value }} - bash: bazel query 'attr(tags, "staleness_test", //...)' + - name: Mark runs associated with commits + if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' }} + run: echo "COMMIT_TRIGGERED_RUN=1" >> $GITHUB_ENV + + - name: Mark runs from the main branch + if: ${{ github.base_ref == 'main' || github.ref == 'refs/heads/main' }} + run: echo "MAIN_RUN=1" >> $GITHUB_ENV - name: Run all staleness tests - if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' && github.event_name != 'push' }} - uses: protocolbuffers/protobuf-ci/bazel-docker@v1 - with: - credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} - bazel-cache: staleness_check/${{ matrix.branch}}_${{ matrix.os.value }} - bash: bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS + # Run all tests if either of the following is true, otherwise simply run the query to make + # sure it continues to work: + # 1) If this is not a commit-based run it means it's scheduled or manually dispatched. In + # this case we want to make sure there are no stale files. + # 2) Release branches don't work with automated commits (see b/287117570). Until this is + # fixed, we want to run the tests to force manual regeneration when necessary. + # + # In branches where automatic updates work as post-submits, we don't want to run staleness + # tests along with user changes. Any stale files will be automatically fixed in a follow-up + # commit. + run: | + if [[ -z $COMMIT_TRIGGERED_RUN || -z $MAIN_RUN ]]; then + bazel query 'attr(tags, "staleness_test", //...)' | xargs bazel test $BAZEL_FLAGS + else + bazel query 'attr(tags, "staleness_test", //...)' + fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/.github/workflows/test_java.yml new/protobuf-23.4/.github/workflows/test_java.yml --- old/protobuf-23.3/.github/workflows/test_java.yml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/.github/workflows/test_java.yml 2023-07-05 23:53:30.000000000 +0200 @@ -72,7 +72,7 @@ - name: Download Linkage Monitor run: curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/linkage-monitor-latest-all-deps.jar" - name: Fails if there's new linkage errors compared with baseline - run: java -Xmx2048m -jar linkage-monitor-latest-all-deps.jar com.google.cloud:libraries-bom + run: java -Xmx4096m -jar linkage-monitor-latest-all-deps.jar com.google.cloud:libraries-bom protobuf-bom: name: Protobuf Maven BOM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/CMakeLists.txt new/protobuf-23.4/CMakeLists.txt --- old/protobuf-23.3/CMakeLists.txt 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/CMakeLists.txt 2023-07-05 23:53:30.000000000 +0200 @@ -93,7 +93,7 @@ endif () # Version metadata -set(protobuf_VERSION_STRING "4.23.3") +set(protobuf_VERSION_STRING "4.23.4") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "[email protected]") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/Protobuf-C++.podspec new/protobuf-23.4/Protobuf-C++.podspec --- old/protobuf-23.3/Protobuf-C++.podspec 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/Protobuf-C++.podspec 2023-07-05 23:53:30.000000000 +0200 @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '4.23.3' + s.version = '4.23.4' s.summary = 'Protocol Buffers v3 runtime library for C++.' s.homepage = 'https://github.com/google/protobuf' s.license = 'BSD-3-Clause' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/Protobuf.podspec new/protobuf-23.4/Protobuf.podspec --- old/protobuf-23.3/Protobuf.podspec 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/Protobuf.podspec 2023-07-05 23:53:30.000000000 +0200 @@ -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.23.3' + s.version = '3.23.4' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.homepage = 'https://github.com/protocolbuffers/protobuf' s.license = 'BSD-3-Clause' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/csharp/CHANGES.txt new/protobuf-23.4/csharp/CHANGES.txt --- old/protobuf-23.3/csharp/CHANGES.txt 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/csharp/CHANGES.txt 2023-07-05 23:53:30.000000000 +0200 @@ -72,7 +72,7 @@ custom implementation of writers with both speed and size optimizations. - Addition of the "Google.ProtoBuffers.Serialization" assembly to support reading and writing messages to/from XML, JSON, IDictionary<,> and others. -- Several performance related fixes and tweeks +- Several performance related fixes and tweaks - Issue 3: Add option to mark generated code with attribute - Issue 20: Support for decorating classes [Serializable] - Issue 21: Decorate fields with [deprecated=true] as [System.Obsolete] @@ -145,4 +145,4 @@ - Initial release -=============================================================================== \ No newline at end of file +=============================================================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/csharp/Google.Protobuf.Tools.nuspec new/protobuf-23.4/csharp/Google.Protobuf.Tools.nuspec --- old/protobuf-23.3/csharp/Google.Protobuf.Tools.nuspec 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/csharp/Google.Protobuf.Tools.nuspec 2023-07-05 23:53:30.000000000 +0200 @@ -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.23.3</version> + <version>3.23.4</version> <authors>Google Inc.</authors> <owners>protobuf-packages</owners> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/csharp/src/Google.Protobuf/Google.Protobuf.csproj new/protobuf-23.4/csharp/src/Google.Protobuf/Google.Protobuf.csproj --- old/protobuf-23.3/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/csharp/src/Google.Protobuf/Google.Protobuf.csproj 2023-07-05 23:53:30.000000000 +0200 @@ -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.23.3</VersionPrefix> + <VersionPrefix>3.23.4</VersionPrefix> <LangVersion>10.0</LangVersion> <Authors>Google Inc.</Authors> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/README.md new/protobuf-23.4/java/README.md --- old/protobuf-23.3/java/README.md 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/README.md 2023-07-05 23:53:30.000000000 +0200 @@ -23,7 +23,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </dependency> ``` @@ -37,14 +37,14 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.23.3</version> + <version>3.23.4</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.23.3'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.23.4'` Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/bom/pom.xml new/protobuf-23.4/java/bom/pom.xml --- old/protobuf-23.3/java/bom/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/bom/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-bom</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> <packaging>pom</packaging> <name>Protocol Buffers [BOM]</name> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/core/pom.xml new/protobuf-23.4/java/core/pom.xml --- old/protobuf-23.3/java/core/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/core/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </parent> <artifactId>protobuf-java</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/kotlin/pom.xml new/protobuf-23.4/java/kotlin/pom.xml --- old/protobuf-23.3/java/kotlin/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/kotlin/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </parent> <artifactId>protobuf-kotlin</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/kotlin-lite/pom.xml new/protobuf-23.4/java/kotlin-lite/pom.xml --- old/protobuf-23.3/java/kotlin-lite/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/kotlin-lite/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </parent> <artifactId>protobuf-kotlin-lite</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/lite/pom.xml new/protobuf-23.4/java/lite/pom.xml --- old/protobuf-23.3/java/lite/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/lite/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </parent> <artifactId>protobuf-javalite</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/lite.md new/protobuf-23.4/java/lite.md --- old/protobuf-23.3/java/lite.md 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/lite.md 2023-07-05 23:53:30.000000000 +0200 @@ -29,7 +29,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-javalite</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </dependency> ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/pom.xml new/protobuf-23.4/java/pom.xml --- old/protobuf-23.3/java/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> <packaging>pom</packaging> <name>Protocol Buffers [Parent]</name> @@ -87,12 +87,12 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>32.0.0-android</version> + <version>32.0.1-android</version> </dependency> <dependency> <groupId>com.google.guava</groupId> <artifactId>guava-testlib</artifactId> - <version>32.0.0-android</version> + <version>32.0.1-android</version> <scope>test</scope> </dependency> <dependency> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/protoc/pom.xml new/protobuf-23.4/java/protoc/pom.xml --- old/protobuf-23.3/java/protoc/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/protoc/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -8,7 +8,7 @@ </parent> <groupId>com.google.protobuf</groupId> <artifactId>protoc</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> <packaging>pom</packaging> <name>Protobuf Compiler</name> <description> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/java/util/pom.xml new/protobuf-23.4/java/util/pom.xml --- old/protobuf-23.3/java/util/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/java/util/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </parent> <artifactId>protobuf-java-util</artifactId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/maven_install.json new/protobuf-23.4/maven_install.json --- old/protobuf-23.3/maven_install.json 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/maven_install.json 2023-07-05 23:53:30.000000000 +0200 @@ -1,8 +1,8 @@ { "dependency_tree": { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": -739595740, - "__RESOLVED_ARTIFACTS_HASH": 611495085, + "__INPUT_ARTIFACTS_HASH": -1740498846, + "__RESOLVED_ARTIFACTS_HASH": -60988338, "conflict_resolution": { "com.google.errorprone:error_prone_annotations:2.5.1": "com.google.errorprone:error_prone_annotations:2.18.0" }, @@ -69,11 +69,11 @@ { "coord": "com.google.caliper:caliper-api:1.0-beta-3", "dependencies": [ - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "joda-time:joda-time:2.10.10" ], "directDependencies": [ - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "joda-time:joda-time:2.10.10" ], "file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-api/1.0-beta-3/caliper-api-1.0-beta-3.jar", @@ -92,7 +92,7 @@ "com.google.caliper:caliper-util:1.0-beta-3", "com.google.code.gson:gson:2.8.9", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.6.0", "javax.inject:javax.inject:1", @@ -103,7 +103,7 @@ "com.google.caliper:caliper-api:1.0-beta-3", "com.google.caliper:caliper-util:1.0-beta-3", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "joda-time:joda-time:2.10.10" ], @@ -125,7 +125,7 @@ "com.google.code.gson:gson:2.8.9", "com.google.dagger:dagger-producers:2.22.1", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.6.0", "javax.inject:javax.inject:1", @@ -138,7 +138,7 @@ "com.google.caliper:caliper-util:1.0-beta-3", "com.google.dagger:dagger-producers:2.22.1", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "joda-time:joda-time:2.10.10" ], @@ -155,14 +155,14 @@ "dependencies": [ "com.google.code.gson:gson:2.8.9", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "javax.inject:javax.inject:1", "joda-time:joda-time:2.10.10" ], "directDependencies": [ "com.google.code.gson:gson:2.8.9", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "joda-time:joda-time:2.10.10" ], "file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-util/1.0-beta-3/caliper-util-1.0-beta-3.jar", @@ -184,7 +184,7 @@ "com.google.code.gson:gson:2.8.9", "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.6.0", "com.sun.jersey:jersey-client:1.19.4", @@ -204,7 +204,7 @@ "com.google.caliper:caliper-worker:1.0-beta-3", "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.sun.jersey:jersey-client:1.19.4" ], "file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper-worker-jvm/1.0-beta-3/caliper-worker-jvm-1.0-beta-3.jar", @@ -224,7 +224,7 @@ "com.google.caliper:caliper-util:1.0-beta-3", "com.google.code.gson:gson:2.8.9", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.6.0", "javax.inject:javax.inject:1", @@ -235,7 +235,7 @@ "com.google.caliper:caliper-core:1.0-beta-3", "com.google.caliper:caliper-util:1.0-beta-3", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "joda-time:joda-time:2.10.10" ], @@ -261,7 +261,7 @@ "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", "com.google.dagger:dagger-producers:2.22.1", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.6.0", "com.sun.jersey:jersey-client:1.19.4", @@ -283,7 +283,7 @@ "com.google.caliper:caliper-worker-jvm:1.0-beta-3", "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.sun.jersey:jersey-client:1.19.4" ], "file": "v1/https/repo1.maven.org/maven2/com/google/caliper/caliper/1.0-beta-3/caliper-1.0-beta-3.jar", @@ -321,7 +321,7 @@ { "coord": "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", "dependencies": [ - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "javax.annotation:javax.annotation-api:1.3.2", "org.ow2.asm:asm-analysis:7.2", "org.ow2.asm:asm-commons:7.2", @@ -330,7 +330,7 @@ "org.ow2.asm:asm:9.0" ], "directDependencies": [ - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "javax.annotation:javax.annotation-api:1.3.2", "org.ow2.asm:asm-analysis:7.2", "org.ow2.asm:asm-commons:7.2", @@ -350,13 +350,13 @@ "coord": "com.google.dagger:dagger-producers:2.22.1", "dependencies": [ "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "javax.inject:javax.inject:1", "org.checkerframework:checker-compat-qual:2.5.3" ], "directDependencies": [ "com.google.dagger:dagger:2.22.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "javax.inject:javax.inject:1", "org.checkerframework:checker-compat-qual:2.5.3" ], @@ -409,12 +409,12 @@ "url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" }, { - "coord": "com.google.guava:guava-testlib:32.0.0-jre", + "coord": "com.google.guava:guava-testlib:32.0.1-jre", "dependencies": [ "com.google.code.findbugs:jsr305:3.0.2", "com.google.errorprone:error_prone_annotations:2.18.0", "com.google.guava:failureaccess:1.0.1", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", "com.google.j2objc:j2objc-annotations:2.8", "junit:junit:4.13.2", @@ -424,21 +424,21 @@ "directDependencies": [ "com.google.code.findbugs:jsr305:3.0.2", "com.google.errorprone:error_prone_annotations:2.18.0", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "com.google.j2objc:j2objc-annotations:2.8", "junit:junit:4.13.2", "org.checkerframework:checker-qual:3.33.0" ], - "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar", - "https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar" + "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar", + "https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar" ], - "sha256": "8294e760db205405fdb916baa2eea615107b7b97c1810847dea33ea63fbaf3c8", - "url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.0-jre/guava-testlib-32.0.0-jre.jar" + "sha256": "c97511849a5e085280f106df2b059566febd280b118d33d6a9e068d238100b63", + "url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/32.0.1-jre/guava-testlib-32.0.1-jre.jar" }, { - "coord": "com.google.guava:guava:32.0.0-jre", + "coord": "com.google.guava:guava:32.0.1-jre", "dependencies": [ "com.google.code.findbugs:jsr305:3.0.2", "com.google.errorprone:error_prone_annotations:2.18.0", @@ -455,13 +455,13 @@ "com.google.j2objc:j2objc-annotations:2.8", "org.checkerframework:checker-qual:3.33.0" ], - "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar", + "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar", - "https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar" + "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar", + "https://repo.maven.apache.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar" ], - "sha256": "39f3550b0343d8d19dd4e83bd165b58ea3389d2ddb9f2148e63903f79ecdb114", - "url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.0-jre/guava-32.0.0-jre.jar" + "sha256": "bd7fa227591fb8509677d0d1122cf95158f3b8a9f45653f58281d879f6dc48c5", + "url": "https://repo1.maven.org/maven2/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar" }, { "coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava", @@ -492,7 +492,7 @@ "dependencies": [ "com.google.auto.value:auto-value-annotations:1.8.1", "com.google.errorprone:error_prone_annotations:2.18.0", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "junit:junit:4.13.2", "org.checkerframework:checker-qual:3.33.0", "org.ow2.asm:asm:9.0" @@ -500,7 +500,7 @@ "directDependencies": [ "com.google.auto.value:auto-value-annotations:1.8.1", "com.google.errorprone:error_prone_annotations:2.18.0", - "com.google.guava:guava:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", "junit:junit:4.13.2", "org.checkerframework:checker-qual:3.33.0", "org.ow2.asm:asm:9.0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/objectivec/DevTools/pddm_tests.py new/protobuf-23.4/objectivec/DevTools/pddm_tests.py --- old/protobuf-23.3/objectivec/DevTools/pddm_tests.py 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/objectivec/DevTools/pddm_tests.py 2023-07-05 23:53:30.000000000 +0200 @@ -35,7 +35,7 @@ import io import unittest -import pddm +from objectivec.DevTools import pddm class TestParsingMacros(unittest.TestCase): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/php/ext/google/protobuf/protobuf.h new/protobuf-23.4/php/ext/google/protobuf/protobuf.h --- old/protobuf-23.3/php/ext/google/protobuf/protobuf.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/php/ext/google/protobuf/protobuf.h 2023-07-05 23:53:30.000000000 +0200 @@ -127,7 +127,7 @@ ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() -#define PHP_PROTOBUF_VERSION "3.23.3" +#define PHP_PROTOBUF_VERSION "3.23.4" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/protobuf_deps.bzl new/protobuf-23.4/protobuf_deps.bzl --- old/protobuf-23.3/protobuf_deps.bzl 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/protobuf_deps.bzl 2023-07-05 23:53:30.000000000 +0200 @@ -8,8 +8,8 @@ "com.google.code.gson:gson:2.8.9", "com.google.errorprone:error_prone_annotations:2.5.1", "com.google.j2objc:j2objc-annotations:2.8", - "com.google.guava:guava:32.0.0-jre", - "com.google.guava:guava-testlib:32.0.0-jre", + "com.google.guava:guava:32.0.1-jre", + "com.google.guava:guava-testlib:32.0.1-jre", "com.google.truth:truth:1.1.2", "junit:junit:4.13.2", "org.mockito:mockito-core:4.3.1", @@ -151,7 +151,7 @@ _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "1956df14832979471d0c79210a817aeb54f7a526", - sha256 = "102039feae921205690d28561d6c74ba13e0561a76d7247de5df7d7cc8d72ca6", + commit = "455cfdb8ae60a1763e6d924e36851c6897a781bb", + sha256 = "2c8b4e961c38fcc7c58e8aca807cc3cc5190f42afdf39551ce49812b130493de", patches = ["@com_google_protobuf//build_defs:upb.patch"], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/protobuf_version.bzl new/protobuf-23.4/protobuf_version.bzl --- old/protobuf-23.3/protobuf_version.bzl 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/protobuf_version.bzl 2023-07-05 23:53:30.000000000 +0200 @@ -1,6 +1,6 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "23.3" -PROTOBUF_JAVA_VERSION = "3.23.3" -PROTOBUF_PYTHON_VERSION = "4.23.3" -PROTOBUF_PHP_VERSION = "3.23.3" -PROTOBUF_RUBY_VERSION = "3.23.3" +PROTOC_VERSION = "23.4" +PROTOBUF_JAVA_VERSION = "3.23.4" +PROTOBUF_PYTHON_VERSION = "4.23.4" +PROTOBUF_PHP_VERSION = "3.23.4" +PROTOBUF_RUBY_VERSION = "3.23.4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/python/google/protobuf/__init__.py new/protobuf-23.4/python/google/protobuf/__init__.py --- old/protobuf-23.3/python/google/protobuf/__init__.py 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/python/google/protobuf/__init__.py 2023-07-05 23:53:30.000000000 +0200 @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.23.3' +__version__ = '4.23.4' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/ruby/google-protobuf.gemspec new/protobuf-23.4/ruby/google-protobuf.gemspec --- old/protobuf-23.3/ruby/google-protobuf.gemspec 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/ruby/google-protobuf.gemspec 2023-07-05 23:53:30.000000000 +0200 @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.23.3" + s.version = "3.23.4" git_tag = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/ruby/pom.xml new/protobuf-23.4/ruby/pom.xml --- old/protobuf-23.3/ruby/pom.xml 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/ruby/pom.xml 2023-07-05 23:53:30.000000000 +0200 @@ -9,7 +9,7 @@ <groupId>com.google.protobuf.jruby</groupId> <artifactId>protobuf-jruby</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> <name>Protocol Buffer JRuby native extension</name> <description> Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java-util</artifactId> - <version>3.23.3</version> + <version>3.23.4</version> </dependency> <dependency> <groupId>org.jruby</groupId> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/any.pb.cc new/protobuf-23.4/src/google/protobuf/any.pb.cc --- old/protobuf-23.3/src/google/protobuf/any.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/any.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -44,7 +44,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AnyDefaultTypeInternal _Any_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fany_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/any.pb.h new/protobuf-23.4/src/google/protobuf/any.pb.h --- old/protobuf-23.3/src/google/protobuf/any.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/any.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/api.pb.cc new/protobuf-23.4/src/google/protobuf/api.pb.cc --- old/protobuf-23.3/src/google/protobuf/api.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/api.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -46,7 +46,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApiDefaultTypeInternal _Api_default_instance_; template <typename> PROTOBUF_CONSTEXPR Method::Method( @@ -79,7 +79,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodDefaultTypeInternal _Method_default_instance_; template <typename> PROTOBUF_CONSTEXPR Mixin::Mixin( @@ -101,7 +101,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MixinDefaultTypeInternal _Mixin_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fapi_2eproto[3]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/api.pb.h new/protobuf-23.4/src/google/protobuf/api.pb.h --- old/protobuf-23.3/src/google/protobuf/api.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/api.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/compiler/cpp/file.cc new/protobuf-23.4/src/google/protobuf/compiler/cpp/file.cc --- old/protobuf-23.3/src/google/protobuf/compiler/cpp/file.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/compiler/cpp/file.cc 2023-07-05 23:53:30.000000000 +0200 @@ -556,7 +556,7 @@ }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$ PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 const $type$ $name$; )cc"); } @@ -579,7 +579,7 @@ }; }; - PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT + PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT$ dllexport_decl$ PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 $type$ $name$; )cc"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/compiler/plugin.pb.cc new/protobuf-23.4/src/google/protobuf/compiler/plugin.pb.cc --- old/protobuf-23.3/src/google/protobuf/compiler/plugin.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/compiler/plugin.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -43,7 +43,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 VersionDefaultTypeInternal _Version_default_instance_; template <typename> PROTOBUF_CONSTEXPR CodeGeneratorRequest::CodeGeneratorRequest( @@ -65,7 +65,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorRequestDefaultTypeInternal _CodeGeneratorRequest_default_instance_; template <typename> PROTOBUF_CONSTEXPR CodeGeneratorResponse_File::CodeGeneratorResponse_File( @@ -93,7 +93,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponse_FileDefaultTypeInternal _CodeGeneratorResponse_File_default_instance_; template <typename> PROTOBUF_CONSTEXPR CodeGeneratorResponse::CodeGeneratorResponse( @@ -115,7 +115,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOC_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponseDefaultTypeInternal _CodeGeneratorResponse_default_instance_; } // namespace compiler PROTOBUF_NAMESPACE_CLOSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/compiler/plugin.pb.h new/protobuf-23.4/src/google/protobuf/compiler/plugin.pb.h --- old/protobuf-23.3/src/google/protobuf/compiler/plugin.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/compiler/plugin.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/descriptor.pb.cc new/protobuf-23.4/src/google/protobuf/descriptor.pb.cc --- old/protobuf-23.3/src/google/protobuf/descriptor.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/descriptor.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -32,7 +32,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_; template <typename> PROTOBUF_CONSTEXPR FileDescriptorProto::FileDescriptorProto( @@ -74,7 +74,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange( @@ -94,7 +94,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_; template <typename> PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange::DescriptorProto_ReservedRange( @@ -113,7 +113,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_; template <typename> PROTOBUF_CONSTEXPR DescriptorProto::DescriptorProto( @@ -141,7 +141,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR ExtensionRangeOptions_Declaration::ExtensionRangeOptions_Declaration( @@ -172,7 +172,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExtensionRangeOptions_DeclarationDefaultTypeInternal _ExtensionRangeOptions_Declaration_default_instance_; template <typename> PROTOBUF_CONSTEXPR ExtensionRangeOptions::ExtensionRangeOptions( @@ -192,7 +192,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExtensionRangeOptionsDefaultTypeInternal _ExtensionRangeOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR FieldDescriptorProto::FieldDescriptorProto( @@ -238,7 +238,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR OneofDescriptorProto::OneofDescriptorProto( @@ -258,7 +258,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange( @@ -277,7 +277,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal _EnumDescriptorProto_EnumReservedRange_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumDescriptorProto::EnumDescriptorProto( @@ -300,7 +300,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumValueDescriptorProto::EnumValueDescriptorProto( @@ -322,7 +322,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR ServiceDescriptorProto::ServiceDescriptorProto( @@ -343,7 +343,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR MethodDescriptorProto::MethodDescriptorProto( @@ -375,7 +375,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_; template <typename> PROTOBUF_CONSTEXPR FileOptions::FileOptions( @@ -452,7 +452,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileOptionsDefaultTypeInternal _FileOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR MessageOptions::MessageOptions( @@ -479,7 +479,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR FieldOptions::FieldOptions( @@ -518,7 +518,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR OneofOptions::OneofOptions( @@ -534,7 +534,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumOptions::EnumOptions( @@ -557,7 +557,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumValueOptions::EnumValueOptions( @@ -576,7 +576,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR ServiceOptions::ServiceOptions( @@ -595,7 +595,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR MethodOptions::MethodOptions( @@ -616,7 +616,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_; template <typename> PROTOBUF_CONSTEXPR UninterpretedOption_NamePart::UninterpretedOption_NamePart( @@ -637,7 +637,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_; template <typename> PROTOBUF_CONSTEXPR UninterpretedOption::UninterpretedOption( @@ -671,7 +671,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_; template <typename> PROTOBUF_CONSTEXPR SourceCodeInfo_Location::SourceCodeInfo_Location( @@ -701,7 +701,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_; template <typename> PROTOBUF_CONSTEXPR SourceCodeInfo::SourceCodeInfo( @@ -716,7 +716,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_; template <typename> PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation( @@ -744,7 +744,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_; template <typename> PROTOBUF_CONSTEXPR GeneratedCodeInfo::GeneratedCodeInfo( @@ -759,7 +759,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[28]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/descriptor.pb.h new/protobuf-23.4/src/google/protobuf/descriptor.pb.h --- old/protobuf-23.3/src/google/protobuf/descriptor.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/descriptor.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/duration.pb.cc new/protobuf-23.4/src/google/protobuf/duration.pb.cc --- old/protobuf-23.3/src/google/protobuf/duration.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/duration.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -35,7 +35,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DurationDefaultTypeInternal _Duration_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fduration_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/duration.pb.h new/protobuf-23.4/src/google/protobuf/duration.pb.h --- old/protobuf-23.3/src/google/protobuf/duration.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/duration.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/empty.pb.cc new/protobuf-23.4/src/google/protobuf/empty.pb.cc --- old/protobuf-23.3/src/google/protobuf/empty.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/empty.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -30,7 +30,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EmptyDefaultTypeInternal _Empty_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fempty_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/empty.pb.h new/protobuf-23.4/src/google/protobuf/empty.pb.h --- old/protobuf-23.3/src/google/protobuf/empty.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/empty.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/field_mask.pb.cc new/protobuf-23.4/src/google/protobuf/field_mask.pb.cc --- old/protobuf-23.3/src/google/protobuf/field_mask.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/field_mask.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -32,7 +32,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldMaskDefaultTypeInternal _FieldMask_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/field_mask.pb.h new/protobuf-23.4/src/google/protobuf/field_mask.pb.h --- old/protobuf-23.3/src/google/protobuf/field_mask.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/field_mask.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/port_def.inc new/protobuf-23.4/src/google/protobuf/port_def.inc --- old/protobuf-23.3/src/google/protobuf/port_def.inc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/port_def.inc 2023-07-05 23:53:30.000000000 +0200 @@ -246,7 +246,7 @@ #ifdef PROTOBUF_VERSION #error PROTOBUF_VERSION was previously defined #endif -#define PROTOBUF_VERSION 4023003 +#define PROTOBUF_VERSION 4023004 #ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC #error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined @@ -1010,6 +1010,10 @@ // This error has been generally flaky, but we need to disable it specifically // to fix https://github.com/protocolbuffers/protobuf/issues/12313 #pragma clang diagnostic ignored "-Wunused-parameter" +// -Wshadow means that declaration shadows a variable. +// for (int i = 0; i < file_->public_dependency_count(); ++i) +// for (int i = 0; i < public_dep->message_type_count(); ++i) +#pragma clang diagnostic ignored "-Wshadow" #endif #ifdef __GNUC__ #pragma GCC diagnostic push @@ -1033,6 +1037,10 @@ // This error has been generally flaky, but we need to disable it specifically // to fix https://github.com/protocolbuffers/protobuf/issues/12313 #pragma GCC diagnostic ignored "-Wunused-parameter" +// -Wshadow means that declaration shadows a variable. +// for (int i = 0; i < file_->public_dependency_count(); ++i) +// for (int i = 0; i < public_dep->message_type_count(); ++i) +#pragma GCC diagnostic ignored "-Wshadow" #ifndef __clang__ // This causes spurious warnings in GCC 13. #pragma GCC diagnostic ignored "-Wstringop-overflow" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/source_context.pb.cc new/protobuf-23.4/src/google/protobuf/source_context.pb.cc --- old/protobuf-23.3/src/google/protobuf/source_context.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/source_context.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -35,7 +35,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceContextDefaultTypeInternal _SourceContext_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/source_context.pb.h new/protobuf-23.4/src/google/protobuf/source_context.pb.h --- old/protobuf-23.3/src/google/protobuf/source_context.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/source_context.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/struct.pb.cc new/protobuf-23.4/src/google/protobuf/struct.pb.cc --- old/protobuf-23.3/src/google/protobuf/struct.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/struct.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -30,7 +30,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Struct_FieldsEntry_DoNotUseDefaultTypeInternal _Struct_FieldsEntry_DoNotUse_default_instance_; template <typename> PROTOBUF_CONSTEXPR Struct::Struct( @@ -45,7 +45,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StructDefaultTypeInternal _Struct_default_instance_; template <typename> PROTOBUF_CONSTEXPR Value::Value( @@ -61,7 +61,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ValueDefaultTypeInternal _Value_default_instance_; template <typename> PROTOBUF_CONSTEXPR ListValue::ListValue( @@ -76,7 +76,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListValueDefaultTypeInternal _ListValue_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fstruct_2eproto[4]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/struct.pb.h new/protobuf-23.4/src/google/protobuf/struct.pb.h --- old/protobuf-23.3/src/google/protobuf/struct.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/struct.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/stubs/common.h new/protobuf-23.4/src/google/protobuf/stubs/common.h --- old/protobuf-23.3/src/google/protobuf/stubs/common.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/stubs/common.h 2023-07-05 23:53:30.000000000 +0200 @@ -66,7 +66,7 @@ // The current version, represented as a single integer to make comparison // easier: major * 10^6 + minor * 10^3 + micro -#define GOOGLE_PROTOBUF_VERSION 4023003 +#define GOOGLE_PROTOBUF_VERSION 4023004 // A suffix string for alpha, beta or rc releases. Empty for stable releases. #define GOOGLE_PROTOBUF_VERSION_SUFFIX "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/timestamp.pb.cc new/protobuf-23.4/src/google/protobuf/timestamp.pb.cc --- old/protobuf-23.3/src/google/protobuf/timestamp.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/timestamp.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -35,7 +35,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TimestampDefaultTypeInternal _Timestamp_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/timestamp.pb.h new/protobuf-23.4/src/google/protobuf/timestamp.pb.h --- old/protobuf-23.3/src/google/protobuf/timestamp.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/timestamp.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/type.pb.cc new/protobuf-23.4/src/google/protobuf/type.pb.cc --- old/protobuf-23.3/src/google/protobuf/type.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/type.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -46,7 +46,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TypeDefaultTypeInternal _Type_default_instance_; template <typename> PROTOBUF_CONSTEXPR Field::Field( @@ -87,7 +87,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldDefaultTypeInternal _Field_default_instance_; template <typename> PROTOBUF_CONSTEXPR Enum::Enum( @@ -115,7 +115,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDefaultTypeInternal _Enum_default_instance_; template <typename> PROTOBUF_CONSTEXPR EnumValue::EnumValue( @@ -136,7 +136,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDefaultTypeInternal _EnumValue_default_instance_; template <typename> PROTOBUF_CONSTEXPR Option::Option( @@ -156,7 +156,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OptionDefaultTypeInternal _Option_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftype_2eproto[5]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/type.pb.h new/protobuf-23.4/src/google/protobuf/type.pb.h --- old/protobuf-23.3/src/google/protobuf/type.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/type.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/wrappers.pb.cc new/protobuf-23.4/src/google/protobuf/wrappers.pb.cc --- old/protobuf-23.3/src/google/protobuf/wrappers.pb.cc 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/wrappers.pb.cc 2023-07-05 23:53:30.000000000 +0200 @@ -33,7 +33,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DoubleValueDefaultTypeInternal _DoubleValue_default_instance_; template <typename> PROTOBUF_CONSTEXPR FloatValue::FloatValue( @@ -49,7 +49,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FloatValueDefaultTypeInternal _FloatValue_default_instance_; template <typename> PROTOBUF_CONSTEXPR Int64Value::Int64Value( @@ -65,7 +65,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int64ValueDefaultTypeInternal _Int64Value_default_instance_; template <typename> PROTOBUF_CONSTEXPR UInt64Value::UInt64Value( @@ -81,7 +81,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_; template <typename> PROTOBUF_CONSTEXPR Int32Value::Int32Value( @@ -97,7 +97,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int32ValueDefaultTypeInternal _Int32Value_default_instance_; template <typename> PROTOBUF_CONSTEXPR UInt32Value::UInt32Value( @@ -113,7 +113,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_; template <typename> PROTOBUF_CONSTEXPR BoolValue::BoolValue( @@ -129,7 +129,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BoolValueDefaultTypeInternal _BoolValue_default_instance_; template <typename> PROTOBUF_CONSTEXPR StringValue::StringValue( @@ -147,7 +147,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringValueDefaultTypeInternal _StringValue_default_instance_; template <typename> PROTOBUF_CONSTEXPR BytesValue::BytesValue( @@ -165,7 +165,7 @@ }; }; -PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT +PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_EXPORT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BytesValueDefaultTypeInternal _BytesValue_default_instance_; PROTOBUF_NAMESPACE_CLOSE static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[9]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/src/google/protobuf/wrappers.pb.h new/protobuf-23.4/src/google/protobuf/wrappers.pb.h --- old/protobuf-23.3/src/google/protobuf/wrappers.pb.h 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/src/google/protobuf/wrappers.pb.h 2023-07-05 23:53:30.000000000 +0200 @@ -15,7 +15,7 @@ #error "your headers." #endif // PROTOBUF_VERSION -#if 4023003 < PROTOBUF_MIN_PROTOC_VERSION +#if 4023004 < PROTOBUF_MIN_PROTOC_VERSION #error "This file was generated by an older version of protoc which is" #error "incompatible with your Protocol Buffer headers. Please" #error "regenerate this file with a newer version of protoc." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/protobuf-23.3/version.json new/protobuf-23.4/version.json --- old/protobuf-23.3/version.json 2023-06-14 16:28:10.000000000 +0200 +++ new/protobuf-23.4/version.json 2023-07-05 23:53:30.000000000 +0200 @@ -1,17 +1,17 @@ { "23.x": { - "protoc_version": "23.3", + "protoc_version": "23.4", "lts": false, - "date": "2023-06-14", + "date": "2023-07-05", "languages": { - "cpp": "4.23.3", - "csharp": "3.23.3", - "java": "3.23.3", - "javascript": "3.23.3", - "objectivec": "3.23.3", - "php": "3.23.3", - "python": "4.23.3", - "ruby": "3.23.3" + "cpp": "4.23.4", + "csharp": "3.23.4", + "java": "3.23.4", + "javascript": "3.23.4", + "objectivec": "3.23.4", + "php": "3.23.4", + "python": "4.23.4", + "ruby": "3.23.4" } } } \ No newline at end of file
