Skip to content

Commit

Permalink
deps: finish Protobuf 3.23.4 bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Aug 10, 2023
1 parent 4eb29c2 commit 0693558
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions cmake/host.CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ set(protobuf_MSVC_STATIC_RUNTIME OFF)
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v23.3"
GIT_TAG "v23.4"
GIT_SUBMODULES ""
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v23.3.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v23.4.patch")
FetchContent_MakeAvailable(protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")
2 changes: 1 addition & 1 deletion ortools/dotnet/Google.OrTools-full.csproj.in
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.23.3"/>
<PackageReference Include="Google.Protobuf" Version="3.23.4"/>
</ItemGroup>

<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
Expand Down
2 changes: 1 addition & 1 deletion ortools/dotnet/Google.OrTools-local.csproj.in
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.23.3"/>
<PackageReference Include="Google.Protobuf" Version="3.23.4"/>
</ItemGroup>

<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
Expand Down
2 changes: 1 addition & 1 deletion ortools/java/pom-full.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.23.3</version>
<version>3.23.4</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion ortools/java/pom-local.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.23.3</version>
<version>3.23.4</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion ortools/java/pom.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.23.3</version>
<version>3.23.4</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ortools/python/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ setup(
install_requires=[
'absl-py >= 0.13',
'numpy >= 1.13.3',
'protobuf >= 4.23.3',
'protobuf >= 4.23.4',
],
package_data={
'@PYTHON_PROJECT@':[$<$<STREQUAL:$<TARGET_PROPERTY:@PROJECT_NAME@,TYPE>,SHARED_LIBRARY>:'.libs/*','../$<TARGET_SONAME_FILE_NAME:@PROJECT_NAME@>'>],
Expand Down
2 changes: 1 addition & 1 deletion patches/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# limitations under the License.

exports_files([
"protobuf-v23.3.patch",
"protobuf-v23.4.patch",
"pybind11_bazel.patch",
"pybind11_protobuf.patch",
])

0 comments on commit 0693558

Please sign in to comment.