Skip to content

Commit

Permalink
dependency: Bump Protobuf to v24.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Oct 5, 2023
1 parent 14f48ae commit 05b72ea
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Protobuf=v24.0
Protobuf=v24.4
abseil-cpp=20230802.0
Cbc=2.10.7
Cgl=0.60.5
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ git_repository(
## Protobuf
git_repository(
name = "com_google_protobuf",
tag = "v24.0",
patches = ["//patches:protobuf-v24.0.patch"],
tag = "v24.4",
patches = ["//patches:protobuf-v24.4.patch"],
patch_args = ["-p1"],
remote = "https://github.com/protocolbuffers/protobuf.git",
)
Expand Down
2 changes: 1 addition & 1 deletion bazel/notebook_requirements.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# OR-Tools code dependencies
absl-py==1.4.0
numpy==1.25.2
protobuf==4.24.0
protobuf==4.24.4
scipy==1.11.1

# OR-Tools build dependencies
Expand Down
2 changes: 1 addition & 1 deletion bazel/ortools_requirements.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# OR-Tools code dependencies
absl-py==1.4.0
numpy==1.25.2
protobuf==4.24.0
protobuf==4.24.4
scipy==1.11.1

# OR-Tools build dependencies
Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ if(BUILD_Protobuf)
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v24.0"
GIT_TAG "v24.4"
GIT_SUBMODULES ""
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.0.patch")
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v24.4.patch")
FetchContent_MakeAvailable(protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")
Expand Down
4 changes: 2 additions & 2 deletions cmake/host.CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ set(protobuf_WITH_ZLIB OFF)
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v24.0"
GIT_TAG "v24.4"
GIT_SUBMODULES ""
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.0.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.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.24.0"/>
<PackageReference Include="Google.Protobuf" Version="3.24.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.24.0"/>
<PackageReference Include="Google.Protobuf" Version="3.24.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.24.0</version>
<version>3.24.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.24.0</version>
<version>3.24.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.24.0</version>
<version>3.24.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 @@ -46,7 +46,7 @@ setup(
'absl-py >= 0.13',
'numpy >= 1.13.3',
'pandas >= 1.5.2',
'protobuf >= 4.24.0',
'protobuf >= 4.24.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 @@ -13,7 +13,7 @@

exports_files([
"abseil-cpp-20230802.0.patch",
"protobuf-v24.0.patch",
"protobuf-v24.4.patch",
"pybind11.patch",
"pybind11_bazel.patch",
"pybind11_protobuf.patch",
Expand Down
File renamed without changes.

0 comments on commit 05b72ea

Please sign in to comment.