Skip to content

Commit

Permalink
deps: Bump Protobuf to v29.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Dec 3, 2024
1 parent b33ba80 commit 63f17fe
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ZLIB=1.3.1
abseil-cpp=20240722.0
Protobuf=v28.3
Protobuf=v29.0
Eigen=3.4.0
Re2=2024-04-01
CoinUtils=2.11.6
Expand Down
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
bazel_dep(name = "highs", version = "1.8.1")
bazel_dep(name = "platforms", version = "0.0.10")
bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf")
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
bazel_dep(name = "pybind11_abseil", version = "202402.0", repo_name = "org_pybind11_abseil")
bazel_dep(name = "pybind11_bazel", version = "2.13.6")
bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
Expand Down
2 changes: 1 addition & 1 deletion bazel/notebook_requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
absl-py==2.1.0
immutabledict==3.0.0
numpy==2.1.1
protobuf==5.28.3
protobuf==5.29.0
requests==2.32.0
scipy==1.14.1

Expand Down
2 changes: 1 addition & 1 deletion bazel/notebook_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ prometheus-client==0.17.1
# via jupyter-server
prompt-toolkit==3.0.39
# via ipython
protobuf==5.28.3
protobuf==5.29.0
# via
# -r bazel/notebook_requirements.in
# mypy-protobuf
Expand Down
2 changes: 1 addition & 1 deletion bazel/ortools_requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
absl-py==2.1.0
immutabledict==3.0.0
numpy==2.1.1
protobuf==5.28.3
protobuf==5.29.0
requests==2.32.3
scipy==1.14.1

Expand Down
4 changes: 2 additions & 2 deletions bazel/ortools_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.13
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# bazel run //bazel:ortools_requirements.update
Expand Down Expand Up @@ -45,7 +45,7 @@ platformdirs==3.10.0
# via
# black
# virtualenv
protobuf==5.28.3
protobuf==5.29.0
# via
# -r bazel/ortools_requirements.in
# mypy-protobuf
Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ if(BUILD_Protobuf)
FetchContent_Declare(
Protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v28.3"
GIT_TAG "v29.0"
GIT_SHALLOW TRUE
GIT_SUBMODULES ""
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.3.patch"
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.0.patch"
)
FetchContent_MakeAvailable(Protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
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 "v28.3"
GIT_TAG "v29.0"
GIT_SUBMODULES ""
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.3.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.0.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 @@ -193,7 +193,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3"/>
<PackageReference Include="Google.Protobuf" Version="3.29.0"/>
</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 @@ -181,7 +181,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.28.3"/>
<PackageReference Include="Google.Protobuf" Version="3.29.0"/>
</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>4.28.3</version>
<version>4.29.0</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>4.28.3</version>
<version>4.29.0</version>
</dependency>
</dependencies>

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 >= 2.0.0',
'numpy >= 1.13.3',
'pandas >= 2.0.0',
'protobuf >= 5.28.3,<5.29',
'protobuf >= 5.29.0,<5.30',
'immutabledict >= 3.0.0',
],
package_data={
Expand Down
2 changes: 1 addition & 1 deletion patches/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
exports_files([
"abseil-cpp-20240722.0.patch",
"highs-v1.8.1.patch",
"protobuf-v28.3.patch",
"protobuf-v29.0.patch",
"pybind11_abseil.patch",
"pybind11_bazel.patch",
"pybind11_protobuf.patch",
Expand Down
File renamed without changes.

0 comments on commit 63f17fe

Please sign in to comment.