Unity-Technologies
/
protobuf
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updating version.json and repo version numbers to: 24.0-rc2

This commit is contained in:
Protobuf Team Bot 2023-07-18 11:50:33 -07:00
Родитель 13dfcadda6
Коммит 034ec9d9f6
23 изменённых файлов: 39 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
CMakeLists.txt
Просмотреть файл

@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif () endif ()
# Version metadata # Version metadata
set(protobuf_VERSION_STRING "4.24.0-rc-1") set(protobuf_VERSION_STRING "4.24.0-rc-2")
set(protobuf_DESCRIPTION "Protocol Buffers") set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "protobuf@googlegroups.com") set(protobuf_CONTACT "protobuf@googlegroups.com")

2
Protobuf-C++.podspec
Просмотреть файл

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

2
Protobuf.podspec
Просмотреть файл

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

2
csharp/Google.Protobuf.Tools.nuspec
Просмотреть файл

@ -5,7 +5,7 @@
<title>Google Protocol Buffers tools</title> <title>Google Protocol Buffers tools</title>
<summary>Tools for Protocol Buffers - Google's data interchange format.</summary> <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
<description>See project site for more info.</description> <description>See project site for more info.</description>
<version>3.24.0-rc1</version> <version>3.24.0-rc2</version>
<authors>Google Inc.</authors> <authors>Google Inc.</authors>
<owners>protobuf-packages</owners> <owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl> <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>

2
csharp/src/Google.Protobuf/Google.Protobuf.csproj
Просмотреть файл

@ -5,7 +5,7 @@
<Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description> <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
<Copyright>Copyright 2015, Google Inc.</Copyright> <Copyright>Copyright 2015, Google Inc.</Copyright>
<AssemblyTitle>Google Protocol Buffers</AssemblyTitle> <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
<VersionPrefix>3.24.0-rc1</VersionPrefix> <VersionPrefix>3.24.0-rc2</VersionPrefix>
<LangVersion>10.0</LangVersion> <LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors> <Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks> <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>

6
java/README.md
Просмотреть файл

@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.24.0-rc-1</version> <version>3.24.0-rc-2</version>
</dependency> </dependency>
``` ```
@ -37,14 +37,14 @@ protobuf-java-util package:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.24.0-rc-1</version> <version>3.24.0-rc-2</version>
</dependency> </dependency>
``` ```
### Gradle ### Gradle
If you are using Gradle, add the following to your `build.gradle` file's 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-1'` Again, dependencies: `implementation 'com.google.protobuf:protobuf-java:3.24.0-rc-2'` Again,
be sure to check that the version number matches (or is newer than) the version be sure to check that the version number matches (or is newer than) the version
number of protoc that you are using. number of protoc that you are using.

2
java/bom/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId> <artifactId>protobuf-bom</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [BOM]</name> <name>Protocol Buffers [BOM]</name>

2
java/core/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</parent> </parent>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>

2
java/kotlin-lite/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</parent> </parent>
<artifactId>protobuf-kotlin-lite</artifactId> <artifactId>protobuf-kotlin-lite</artifactId>

2
java/kotlin/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</parent> </parent>
<artifactId>protobuf-kotlin</artifactId> <artifactId>protobuf-kotlin</artifactId>

2
java/lite.md
Просмотреть файл

@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>
<version>3.24.0-rc-1</version> <version>3.24.0-rc-2</version>
</dependency> </dependency>
``` ```

2
java/lite/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</parent> </parent>
<artifactId>protobuf-javalite</artifactId> <artifactId>protobuf-javalite</artifactId>

2
java/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protocol Buffers [Parent]</name> <name>Protocol Buffers [Parent]</name>

2
java/protoc/pom.xml
Просмотреть файл

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId> <artifactId>protoc</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Protobuf Compiler</name> <name>Protobuf Compiler</name>
<description> <description>

2
java/util/pom.xml
Просмотреть файл

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId> <artifactId>protobuf-parent</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</parent> </parent>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>

2
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_ARG_INFO(0, value)
ZEND_END_ARG_INFO() ZEND_END_ARG_INFO()
#define PHP_PROTOBUF_VERSION "3.24.0RC1" #define PHP_PROTOBUF_VERSION "3.24.0RC2"
// ptr -> PHP object cache. This is a weak map that caches lazily-created // ptr -> PHP object cache. This is a weak map that caches lazily-created
// wrapper objects around upb types: // wrapper objects around upb types:

10
protobuf_version.bzl
Просмотреть файл

@ -1,6 +1,6 @@
""" Contains version numbers to be used in other bzl files """ """ Contains version numbers to be used in other bzl files """
PROTOC_VERSION = "24.0-rc-1" PROTOC_VERSION = "24.0-rc-2"
PROTOBUF_JAVA_VERSION = "3.24.0-RC1" PROTOBUF_JAVA_VERSION = "3.24.0-RC2"
PROTOBUF_PYTHON_VERSION = "4.24.0rc1" PROTOBUF_PYTHON_VERSION = "4.24.0rc2"
PROTOBUF_PHP_VERSION = "3.24.0RC1" PROTOBUF_PHP_VERSION = "3.24.0RC2"
PROTOBUF_RUBY_VERSION = "3.24.0.rc.1" PROTOBUF_RUBY_VERSION = "3.24.0.rc.2"

2
python/google/protobuf/__init__.py
Просмотреть файл

@ -30,4 +30,4 @@
# Copyright 2007 Google Inc. All Rights Reserved. # Copyright 2007 Google Inc. All Rights Reserved.
__version__ = '4.24.0rc1' __version__ = '4.24.0rc2'

2
ruby/google-protobuf.gemspec
Просмотреть файл

@ -1,6 +1,6 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = "google-protobuf" s.name = "google-protobuf"
s.version = "3.24.0.rc.1" s.version = "3.24.0.rc.2"
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 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.licenses = ["BSD-3-Clause"]
s.summary = "Protocol Buffers" s.summary = "Protocol Buffers"

4
ruby/pom.xml
Просмотреть файл

@ -9,7 +9,7 @@
<groupId>com.google.protobuf.jruby</groupId> <groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId> <artifactId>protobuf-jruby</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
<name>Protocol Buffer JRuby native extension</name> <name>Protocol Buffer JRuby native extension</name>
<description> <description>
Protocol Buffers are a way of encoding structured data in an efficient yet Protocol Buffers are a way of encoding structured data in an efficient yet
@ -76,7 +76,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId> <artifactId>protobuf-java-util</artifactId>
<version>3.24.0-RC1</version> <version>3.24.0-RC2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jruby</groupId> <groupId>org.jruby</groupId>

2
src/google/protobuf/port_def.inc
Просмотреть файл

@ -270,7 +270,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#ifdef PROTOBUF_VERSION_SUFFIX #ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined #error PROTOBUF_VERSION_SUFFIX was previously defined
#endif #endif
#define PROTOBUF_VERSION_SUFFIX "-rc1" #define PROTOBUF_VERSION_SUFFIX "-rc2"
#ifdef PROTOBUF_ALWAYS_INLINE #ifdef PROTOBUF_ALWAYS_INLINE
#error PROTOBUF_ALWAYS_INLINE was previously defined #error PROTOBUF_ALWAYS_INLINE was previously defined

2
src/google/protobuf/stubs/common.h
Просмотреть файл

@ -69,7 +69,7 @@ namespace internal {
#define GOOGLE_PROTOBUF_VERSION 4024000 #define GOOGLE_PROTOBUF_VERSION 4024000
// A suffix string for alpha, beta or rc releases. Empty for stable releases. // A suffix string for alpha, beta or rc releases. Empty for stable releases.
#define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc1" #define GOOGLE_PROTOBUF_VERSION_SUFFIX "-rc2"
// The minimum header version which works with the current version of // The minimum header version which works with the current version of
// the library. This constant should only be used by protoc's C++ code // the library. This constant should only be used by protoc's C++ code

20
version.json
Просмотреть файл

@ -1,17 +1,17 @@
{ {
"24.x": { "24.x": {
"protoc_version": "24.0-dev", "protoc_version": "24.0-rc2",
"lts": false, "lts": false,
"date": "2023-07-11", "date": "2023-07-18",
"languages": { "languages": {
"cpp": "4.24.0-dev", "cpp": "4.24.0-rc2",
"csharp": "3.24.0-dev", "csharp": "3.24.0-rc2",
"java": "3.24.0-dev", "java": "3.24.0-rc2",
"javascript": "3.24.0-dev", "javascript": "3.24.0-rc2",
"objectivec": "3.24.0-dev", "objectivec": "3.24.0-rc2",
"php": "3.24.0-dev", "php": "3.24.0-rc2",
"python": "4.24.0-dev", "python": "4.24.0-rc2",
"ruby": "3.24.0-dev" "ruby": "3.24.0-rc2"
} }
} }
} }