Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main 202308091812 #13489

Merged
merged 42 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
05835e3
Updating version.json and repo version numbers to: 24.0-rc1
protobuf-team-bot Jul 11, 2023
b411d7d
Updating version.json to: 24.0-dev
protobuf-team-bot Jul 11, 2023
c27bb62
Explicitly delete the destructor for the internal `Rep` structure.
martijnvels Jul 12, 2023
725a592
Merge pull request #13288 from mkruskal-google/backports-24
mkruskal-google Jul 12, 2023
173adca
Put a 4k limit on preallocation to prevent OOM from malformed inputs.
protobuf-github-bot Jun 22, 2023
ac3cad9
Protobuf's Linakge Monitor check to use a local test BOM rather than …
protobuf-github-bot Jul 13, 2023
2cf6c66
Merge pull request #13309 from protocolbuffers/gberg-cp-24
mkruskal-google Jul 13, 2023
d1b6788
Merge pull request #13312 from mkruskal-google/java-linkage-fix
mkruskal-google Jul 13, 2023
9f2d7ea
Automated rollback of commit adb2c4b415c35cda3e4394384ec579ea8dd8ec92.
protobuf-github-bot Jul 14, 2023
4018fa8
Add a `raw_features` field to FeatureSet.
mkruskal-google Jul 12, 2023
b81d2cc
Expand VisitDescriptor to support mutable access to the proto.
mkruskal-google Jul 12, 2023
c5a1dbe
Implement helpers for exporting all FeatureSets to generators.
mkruskal-google Jul 13, 2023
f1de28a
Send full feature sets to plugins.
mkruskal-google Jul 13, 2023
e2cec78
Allow code generators to specify whether or not they support editions.
mkruskal-google Jul 13, 2023
16fbb2b
Update stale files
mkruskal-google Jul 14, 2023
bfc841d
Merge pull request #13316 from mkruskal-google/backports-24
mkruskal-google Jul 15, 2023
2402814
Add JRuby 9.3 and 9.4 to the test matrix under both Bazel versions. (…
JasonLunn Jul 15, 2023
14ea2cb
Update ruby gemspec required ruby version to >=2.7
zhangskz Jul 17, 2023
2278f6d
Drop JRuby 9.2 and 9.3 from GHA test matrix
zhangskz Jul 17, 2023
906e031
Merge pull request #13334 from protocolbuffers/backport-ruby-24
zhangskz Jul 17, 2023
7666e9f
Update protobuf's upb dep to latest 24.x commit.
zhangskz Jul 18, 2023
13dfcad
Merge pull request #13345 from zhangskz/update-24-dep
zhangskz Jul 18, 2023
034ec9d
Updating version.json and repo version numbers to: 24.0-rc2
protobuf-team-bot Jul 18, 2023
39bd80b
Updating version.json to: 24.0-dev
protobuf-team-bot Jul 18, 2023
87ffe68
Merge pull request #13351 from protocolbuffers/24.x-202307182032
zhangskz Jul 18, 2023
2ed49c9
In OSS mode omit some extern template specializations. We have seen r…
protobuf-github-bot Jul 20, 2023
a71357d
Update well known types staleness tests files
zhangskz Jul 21, 2023
980050e
Merge pull request #13369 from zhangskz/backport-24-x
zhangskz Jul 21, 2023
db616e7
Merge pull request #13323 from seongkim75/24.x
zhangskz Jul 31, 2023
fff4905
Drop support for Bazel 5.
mkruskal-google Jul 29, 2023
bc9002e
bazel: Get rid of exec_tools. (#13401)
benjaminp Jul 31, 2023
ad916a9
Merge pull request #13417 from mkruskal-google/bazel6
mkruskal-google Jul 31, 2023
64d9df7
Merge pull request #13418 from protocolbuffers/bazel6
mkruskal-google Jul 31, 2023
fce87eb
Update protobuf repo's upb dependency to latest 24.x commit
zhangskz Jul 31, 2023
e916bf6
Merge pull request #13421 from zhangskz/update-24-x-dep
zhangskz Jul 31, 2023
3487ae0
Updating version.json and repo version numbers to: 24.0-rc3
protobuf-team-bot Aug 1, 2023
e82fc05
Updating version.json to: 24.0-dev
protobuf-team-bot Aug 1, 2023
e48f6f7
Merge pull request #13430 from protocolbuffers/24.x-202308011841
zhangskz Aug 1, 2023
093e258
Updating version.json and repo version numbers to: 24.0
protobuf-team-bot Aug 8, 2023
8b20d17
Updating version.json to: 24.1-dev
protobuf-team-bot Aug 8, 2023
955eb44
Merge pull request #13476 from protocolbuffers/24.x-202308082113
mkruskal-google Aug 8, 2023
e729f0b
Merge release branch 24.x into main
ericsalo Aug 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if (protobuf_BUILD_SHARED_LIBS)
endif ()

# Version metadata
set(protobuf_VERSION_STRING "4.23.0")
set(protobuf_VERSION_STRING "4.24.0")
set(protobuf_DESCRIPTION "Protocol Buffers")
set(protobuf_CONTACT "[email protected]")

Expand Down
2 changes: 1 addition & 1 deletion Protobuf-C++.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Protobuf-C++'
s.version = '4.23.0'
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'
Expand Down
2 changes: 1 addition & 1 deletion Protobuf.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.0'
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'
Expand Down
2 changes: 1 addition & 1 deletion csharp/Google.Protobuf.Tools.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</version>
<version>3.24.0</version>
<authors>Google Inc.</authors>
<owners>protobuf-packages</owners>
<licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>
Expand Down
2 changes: 1 addition & 1 deletion csharp/src/Google.Protobuf/Google.Protobuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.0</VersionPrefix>
<VersionPrefix>3.24.0</VersionPrefix>
<LangVersion>10.0</LangVersion>
<Authors>Google Inc.</Authors>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
Expand Down
6 changes: 3 additions & 3 deletions java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ If you are using Maven, use the following:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</dependency>
```

Expand All @@ -37,14 +37,14 @@ protobuf-java-util package:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.23.0</version>
<version>3.24.0</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.0'` 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.

Expand Down
2 changes: 1 addition & 1 deletion java/bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-bom</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
<packaging>pom</packaging>

<name>Protocol Buffers [BOM]</name>
Expand Down
2 changes: 1 addition & 1 deletion java/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</parent>

<artifactId>protobuf-java</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/kotlin-lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</parent>

<artifactId>protobuf-kotlin-lite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</parent>

<artifactId>protobuf-kotlin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/lite.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ protobuf Java Lite runtime. If you are using Maven, include the following:
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-javalite</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion java/lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</parent>

<artifactId>protobuf-javalite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
<packaging>pom</packaging>

<name>Protocol Buffers [Parent]</name>
Expand Down
2 changes: 1 addition & 1 deletion java/protoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
<packaging>pom</packaging>
<name>Protobuf Compiler</name>
<description>
Expand Down
2 changes: 1 addition & 1 deletion java/util/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-parent</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</parent>

<artifactId>protobuf-java-util</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion php/ext/google/protobuf/protobuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.23.0"
#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:
Expand Down
10 changes: 5 additions & 5 deletions protobuf_version.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
""" Contains version numbers to be used in other bzl files """
PROTOC_VERSION = "23.0"
PROTOBUF_JAVA_VERSION = "3.23.0"
PROTOBUF_PYTHON_VERSION = "4.23.0"
PROTOBUF_PHP_VERSION = "3.23.0"
PROTOBUF_RUBY_VERSION = "3.23.0"
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"
2 changes: 1 addition & 1 deletion python/google/protobuf/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@

# Copyright 2007 Google Inc. All Rights Reserved.

__version__ = '4.23.0'
__version__ = '4.24.0'
4 changes: 2 additions & 2 deletions ruby/google-protobuf.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = "google-protobuf"
s.version = "3.23.0"
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"
Expand Down Expand Up @@ -31,7 +31,7 @@ Gem::Specification.new do |s|
]
s.add_development_dependency "rake-compiler-dock", "= 1.2.1"
end
s.required_ruby_version = '>= 2.5'
s.required_ruby_version = '>= 2.7'
s.add_development_dependency "rake", "~> 13"
s.add_development_dependency "ffi", "~>1"
s.add_development_dependency "ffi-compiler", "~>1"
Expand Down
4 changes: 2 additions & 2 deletions ruby/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>com.google.protobuf.jruby</groupId>
<artifactId>protobuf-jruby</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
<name>Protocol Buffer JRuby native extension</name>
<description>
Protocol Buffers are a way of encoding structured data in an efficient yet
Expand Down Expand Up @@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<version>3.23.0</version>
<version>3.24.0</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/any.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/api.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1681,7 +1681,6 @@ TEST_F(CommandLineInterfaceTest, PluginNoEditionsSupport) {
"code generator prefix-gen-plug hasn't been updated to support editions");
}


TEST_F(CommandLineInterfaceTest, DirectDependencies_Missing_EmptyList) {
CreateTempFile("foo.proto",
"syntax = \"proto2\";\n"
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/compiler/plugin.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/cpp_features.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/descriptor.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/duration.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/empty.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/google/protobuf/field_mask.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/google/protobuf/port_def.inc
Original file line number Diff line number Diff line change
Expand Up @@ -251,17 +251,17 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#ifdef PROTOBUF_VERSION
#error PROTOBUF_VERSION was previously defined
#endif
#define PROTOBUF_VERSION 4023000
#define PROTOBUF_VERSION 4024000

#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
#endif
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 4023000
#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 4024000

#ifdef PROTOBUF_MIN_PROTOC_VERSION
#error PROTOBUF_MIN_PROTOC_VERSION was previously defined
#endif
#define PROTOBUF_MIN_PROTOC_VERSION 4023000
#define PROTOBUF_MIN_PROTOC_VERSION 4024000

#ifdef PROTOBUF_VERSION_SUFFIX
#error PROTOBUF_VERSION_SUFFIX was previously defined
Expand Down Expand Up @@ -442,7 +442,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),

// The minimum library version which works with the current version of the
// headers.
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 4023000
#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 4024000

#ifdef PROTOBUF_RTTI
#error PROTOBUF_RTTI was previously defined
Expand Down
4 changes: 2 additions & 2 deletions src/google/protobuf/source_context.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading