From 093e258a71caacc053cf5ce86977ba3131361a9a Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 8 Aug 2023 10:26:14 -0700 Subject: [PATCH] Updating version.json and repo version numbers to: 24.0 --- CMakeLists.txt | 2 +- Protobuf-C++.podspec | 2 +- Protobuf.podspec | 2 +- csharp/Google.Protobuf.Tools.nuspec | 2 +- .../Google.Protobuf/Google.Protobuf.csproj | 2 +- java/README.md | 6 +++--- java/bom/pom.xml | 2 +- java/core/pom.xml | 2 +- java/kotlin-lite/pom.xml | 2 +- java/kotlin/pom.xml | 2 +- java/lite.md | 2 +- java/lite/pom.xml | 2 +- java/pom.xml | 2 +- java/protoc/pom.xml | 2 +- java/util/pom.xml | 2 +- php/ext/google/protobuf/protobuf.h | 2 +- protobuf_version.bzl | 10 +++++----- python/google/protobuf/__init__.py | 2 +- ruby/google-protobuf.gemspec | 2 +- ruby/pom.xml | 4 ++-- src/google/protobuf/port_def.inc | 2 +- src/google/protobuf/stubs/common.h | 2 +- version.json | 20 +++++++++---------- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38bfd46b035a..ac0d03c3aa70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS) endif () # Version metadata -set(protobuf_VERSION_STRING "4.24.0-rc-3") +set(protobuf_VERSION_STRING "4.24.0") set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_CONTACT "protobuf@googlegroups.com") diff --git a/Protobuf-C++.podspec b/Protobuf-C++.podspec index e907cfa29701..f472aa5f1bf5 100644 --- a/Protobuf-C++.podspec +++ b/Protobuf-C++.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Protobuf-C++' - s.version = '4.24.0-rc3' + s.version = '4.24.0' 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 index 40fbc87c469b..539394e629cb 100644 --- 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.24.0-rc3' + s.version = '3.24.0' 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 index 030074e6599f..2a0cf99af893 100644 --- a/csharp/Google.Protobuf.Tools.nuspec +++ b/csharp/Google.Protobuf.Tools.nuspec @@ -5,7 +5,7 @@ Google Protocol Buffers tools Tools for Protocol Buffers - Google's data interchange format. See project site for more info. - 3.24.0-rc3 + 3.24.0 Google Inc. protobuf-packages https://github.com/protocolbuffers/protobuf/blob/main/LICENSE diff --git a/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/csharp/src/Google.Protobuf/Google.Protobuf.csproj index b0e256b822a7..dede3312285b 100644 --- a/csharp/src/Google.Protobuf/Google.Protobuf.csproj +++ b/csharp/src/Google.Protobuf/Google.Protobuf.csproj @@ -5,7 +5,7 @@ C# runtime library for Protocol Buffers - Google's data interchange format. Copyright 2015, Google Inc. Google Protocol Buffers - 3.24.0-rc3 + 3.24.0 10.0 Google Inc. netstandard1.1;netstandard2.0;net45;net50 diff --git a/java/README.md b/java/README.md index 1d3eb6089010..fb80b05f27cf 100644 --- a/java/README.md +++ b/java/README.md @@ -23,7 +23,7 @@ If you are using Maven, use the following: com.google.protobuf protobuf-java - 3.24.0-rc-3 + 3.24.0 ``` @@ -37,14 +37,14 @@ protobuf-java-util package: com.google.protobuf protobuf-java-util - 3.24.0-rc-3 + 3.24.0 ``` ### Gradle If you are using Gradle, add the following to your `build.gradle` file's -dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0-rc-3'` Again, +dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0'` Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using. diff --git a/java/bom/pom.xml b/java/bom/pom.xml index 29006712477c..372dcdfda006 100644 --- a/java/bom/pom.xml +++ b/java/bom/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-bom - 3.24.0-RC3 + 3.24.0 pom Protocol Buffers [BOM] diff --git a/java/core/pom.xml b/java/core/pom.xml index 17209e11e78d..84d674094ef3 100644 --- a/java/core/pom.xml +++ b/java/core/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 protobuf-java diff --git a/java/kotlin-lite/pom.xml b/java/kotlin-lite/pom.xml index 8e4e52dcd33e..254eb8281b53 100644 --- a/java/kotlin-lite/pom.xml +++ b/java/kotlin-lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 protobuf-kotlin-lite diff --git a/java/kotlin/pom.xml b/java/kotlin/pom.xml index 4ed7a2e06e63..354e65494caf 100644 --- a/java/kotlin/pom.xml +++ b/java/kotlin/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 protobuf-kotlin diff --git a/java/lite.md b/java/lite.md index b96668d42150..d8201e04683f 100644 --- a/java/lite.md +++ b/java/lite.md @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following: com.google.protobuf protobuf-javalite - 3.24.0-rc-3 + 3.24.0 ``` diff --git a/java/lite/pom.xml b/java/lite/pom.xml index d1475c0ef497..3b4ff825830b 100644 --- a/java/lite/pom.xml +++ b/java/lite/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 protobuf-javalite diff --git a/java/pom.xml b/java/pom.xml index d0ed278579b1..1deeca92a88f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 pom Protocol Buffers [Parent] diff --git a/java/protoc/pom.xml b/java/protoc/pom.xml index eb72093110e9..eec6f636e76f 100644 --- a/java/protoc/pom.xml +++ b/java/protoc/pom.xml @@ -8,7 +8,7 @@ com.google.protobuf protoc - 3.24.0-RC3 + 3.24.0 pom Protobuf Compiler diff --git a/java/util/pom.xml b/java/util/pom.xml index 304b2d9eebd8..f5c6380899bc 100644 --- a/java/util/pom.xml +++ b/java/util/pom.xml @@ -4,7 +4,7 @@ com.google.protobuf protobuf-parent - 3.24.0-RC3 + 3.24.0 protobuf-java-util diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index b55185b3103b..c6a856583774 100644 --- 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.24.0RC3" +#define PHP_PROTOBUF_VERSION "3.24.0" // ptr -> PHP object cache. This is a weak map that caches lazily-created // wrapper objects around upb types: diff --git a/protobuf_version.bzl b/protobuf_version.bzl index 4a66fac11e3c..e4284077203f 100644 --- a/protobuf_version.bzl +++ b/protobuf_version.bzl @@ -1,6 +1,6 @@ """ Contains version numbers to be used in other bzl files """ -PROTOC_VERSION = "24.0-rc-3" -PROTOBUF_JAVA_VERSION = "3.24.0-RC3" -PROTOBUF_PYTHON_VERSION = "4.24.0rc3" -PROTOBUF_PHP_VERSION = "3.24.0RC3" -PROTOBUF_RUBY_VERSION = "3.24.0.rc.3" +PROTOC_VERSION = "24.0" +PROTOBUF_JAVA_VERSION = "3.24.0" +PROTOBUF_PYTHON_VERSION = "4.24.0" +PROTOBUF_PHP_VERSION = "3.24.0" +PROTOBUF_RUBY_VERSION = "3.24.0" diff --git a/python/google/protobuf/__init__.py b/python/google/protobuf/__init__.py index cd097d191a30..b5f9fd746761 100755 --- a/python/google/protobuf/__init__.py +++ b/python/google/protobuf/__init__.py @@ -30,4 +30,4 @@ # Copyright 2007 Google Inc. All Rights Reserved. -__version__ = '4.24.0rc3' +__version__ = '4.24.0' diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index c0256d07aacc..79d42c23b207 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.24.0.rc.3" + s.version = "3.24.0" 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 --git a/ruby/pom.xml b/ruby/pom.xml index ae8735c2691f..2242464e23bc 100644 --- a/ruby/pom.xml +++ b/ruby/pom.xml @@ -9,7 +9,7 @@ com.google.protobuf.jruby protobuf-jruby - 3.24.0-RC3 + 3.24.0 Protocol Buffer JRuby native extension Protocol Buffers are a way of encoding structured data in an efficient yet @@ -76,7 +76,7 @@ com.google.protobuf protobuf-java-util - 3.24.0-RC3 + 3.24.0 org.jruby diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index deefe5b518b9..5d292a5f4842 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -270,7 +270,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #ifdef PROTOBUF_VERSION_SUFFIX #error PROTOBUF_VERSION_SUFFIX was previously defined #endif -#define PROTOBUF_VERSION_SUFFIX "-rc3" +#define PROTOBUF_VERSION_SUFFIX "" #ifdef PROTOBUF_ALWAYS_INLINE #error PROTOBUF_ALWAYS_INLINE was previously defined diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h index f7e80dc8e1fd..90a6306f32c5 100644 --- a/src/google/protobuf/stubs/common.h +++ b/src/google/protobuf/stubs/common.h @@ -69,7 +69,7 @@ namespace internal { #define GOOGLE_PROTOBUF_VERSION 4024000 // A suffix string for alpha, beta or rc releases. Empty for stable releases. -#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc3" +#define GOOGLE_PROTOBUF_VERSION_SUFFIX "" // The minimum header version which works with the current version of // the library. This constant should only be used by protoc's C++ code diff --git a/version.json b/version.json index 4b1dd6217f61..d3640ed9e436 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "24.x": { - "protoc_version": "24.0-dev", + "protoc_version": "24.0", "lts": false, - "date": "2023-08-01", + "date": "2023-08-08", "languages": { - "cpp": "4.24.0-dev", - "csharp": "3.24.0-dev", - "java": "3.24.0-dev", - "javascript": "3.24.0-dev", - "objectivec": "3.24.0-dev", - "php": "3.24.0-dev", - "python": "4.24.0-dev", - "ruby": "3.24.0-dev" + "cpp": "4.24.0", + "csharp": "3.24.0", + "java": "3.24.0", + "javascript": "3.24.0", + "objectivec": "3.24.0", + "php": "3.24.0", + "python": "4.24.0", + "ruby": "3.24.0" } } } \ No newline at end of file