Skip to content

Commit a9fbfc1

Browse files
committed
dependency: Bump protobuf from 26.1 to 27.2
1 parent 14791cb commit a9fbfc1

15 files changed

+47
-47
lines changed

Dependencies.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ZLIB=1.3.1
22
abseil-cpp=20240116.2
3-
Protobuf=v26.1
3+
Protobuf=v27.2
44
Eigen=3.4.0
55
Re2=2024-04-01
66
CoinUtils=2.11.6

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ git_repository(
101101
# This statement defines the @com_google_protobuf repo.
102102
git_repository(
103103
name = "com_google_protobuf",
104-
patches = ["//patches:protobuf-v26.1.patch"],
104+
patches = ["//patches:protobuf-v27.2.patch"],
105105
patch_args = ["-p1"],
106-
tag = "v26.1",
106+
tag = "v27.2",
107107
remote = "https://github.com/protocolbuffers/protobuf.git",
108108
)
109109
# Load common dependencies.

bazel/notebook_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
absl-py==2.0.0
33
immutabledict==3.0.0
44
numpy==1.26.1
5-
protobuf==5.26.1
5+
protobuf==5.27.2
66
requests==2.31.0
77
scipy==1.11.3
88

bazel/notebook_requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# bazel run //bazel:notebook_requirements.update
@@ -230,7 +230,7 @@ prompt-toolkit==3.0.39
230230
# via
231231
# ipython
232232
# jupyter-console
233-
protobuf==5.26.1
233+
protobuf==5.27.2
234234
# via
235235
# -r bazel/notebook_requirements.in
236236
# mypy-protobuf

bazel/ortools_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
absl-py==2.0.0
33
immutabledict==3.0.0
44
numpy==1.26.1
5-
protobuf==5.26.1
5+
protobuf==5.27.2
66
requests==2.31.0
77
scipy==1.11.3
88

bazel/ortools_requirements.txt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#
2-
# This file is autogenerated by pip-compile with Python 3.11
2+
# This file is autogenerated by pip-compile with Python 3.12
33
# by the following command:
44
#
55
# bazel run //bazel:ortools_requirements.update
66
#
77
absl-py==2.0.0
8-
# via -r ortools_requirements.in
8+
# via -r bazel/ortools_requirements.in
99
black==24.3.0
10-
# via -r ortools_requirements.in
10+
# via -r bazel/ortools_requirements.in
1111
certifi==2023.7.22
1212
# via requests
1313
charset-normalizer==3.3.2
@@ -21,46 +21,46 @@ filelock==3.12.2
2121
idna==3.7
2222
# via requests
2323
immutabledict==3.0.0
24-
# via -r ortools_requirements.in
24+
# via -r bazel/ortools_requirements.in
2525
mypy==1.6.1
26-
# via -r ortools_requirements.in
26+
# via -r bazel/ortools_requirements.in
2727
mypy-extensions==1.0.0
2828
# via
2929
# black
3030
# mypy
3131
mypy-protobuf==3.5.0
32-
# via -r ortools_requirements.in
32+
# via -r bazel/ortools_requirements.in
3333
numpy==1.26.1
3434
# via
35-
# -r ortools_requirements.in
35+
# -r bazel/ortools_requirements.in
3636
# pandas
3737
# scipy
3838
packaging==23.1
3939
# via black
4040
pandas==2.1.2
41-
# via -r ortools_requirements.in
41+
# via -r bazel/ortools_requirements.in
4242
pathspec==0.11.1
4343
# via black
4444
platformdirs==3.10.0
4545
# via
4646
# black
4747
# virtualenv
48-
protobuf==5.26.1
48+
protobuf==5.27.2
4949
# via
50-
# -r ortools_requirements.in
50+
# -r bazel/ortools_requirements.in
5151
# mypy-protobuf
5252
python-dateutil==2.8.2
5353
# via pandas
5454
pytz==2022.7.1
5555
# via pandas
5656
requests==2.31.0
57-
# via -r ortools_requirements.in
57+
# via -r bazel/ortools_requirements.in
5858
scipy==1.11.3
59-
# via -r ortools_requirements.in
59+
# via -r bazel/ortools_requirements.in
6060
six==1.16.0
6161
# via python-dateutil
6262
svgwrite==1.4.3
63-
# via -r ortools_requirements.in
63+
# via -r bazel/ortools_requirements.in
6464
types-protobuf==4.24.0.0
6565
# via mypy-protobuf
6666
typing-extensions==4.8.0
@@ -70,4 +70,4 @@ tzdata==2023.3
7070
urllib3==2.1.0
7171
# via requests
7272
virtualenv==20.24.6
73-
# via -r ortools_requirements.in
73+
# via -r bazel/ortools_requirements.in

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ if(BUILD_Protobuf)
105105
FetchContent_Declare(
106106
Protobuf
107107
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
108-
GIT_TAG "v26.1"
108+
GIT_TAG "v27.2"
109109
GIT_SUBMODULES ""
110-
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v26.1.patch")
110+
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v27.2.patch")
111111
FetchContent_MakeAvailable(Protobuf)
112112
list(POP_BACK CMAKE_MESSAGE_INDENT)
113113
message(CHECK_PASS "fetched")

cmake/host.CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ set(protobuf_WITH_ZLIB OFF)
121121
FetchContent_Declare(
122122
protobuf
123123
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
124-
GIT_TAG "v26.1"
124+
GIT_TAG "v27.2"
125125
GIT_SUBMODULES ""
126-
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v26.1.patch")
126+
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v27.2.patch")
127127
FetchContent_MakeAvailable(protobuf)
128128
list(POP_BACK CMAKE_MESSAGE_INDENT)
129129
message(CHECK_PASS "fetched")

ortools/dotnet/Google.OrTools-full.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</ItemGroup>
194194

195195
<ItemGroup>
196-
<PackageReference Include="Google.Protobuf" Version="3.26.1"/>
196+
<PackageReference Include="Google.Protobuf" Version="3.27.2"/>
197197
</ItemGroup>
198198

199199
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

ortools/dotnet/Google.OrTools-local.csproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
</ItemGroup>
182182

183183
<ItemGroup>
184-
<PackageReference Include="Google.Protobuf" Version="3.26.1"/>
184+
<PackageReference Include="Google.Protobuf" Version="3.27.2"/>
185185
</ItemGroup>
186186

187187
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

ortools/java/pom-full.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<dependency>
110110
<groupId>com.google.protobuf</groupId>
111111
<artifactId>protobuf-java</artifactId>
112-
<version>4.26.1</version>
112+
<version>4.27.2</version>
113113
</dependency>
114114
</dependencies>
115115

ortools/java/pom-local.xml.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<dependency>
8282
<groupId>com.google.protobuf</groupId>
8383
<artifactId>protobuf-java</artifactId>
84-
<version>4.26.1</version>
84+
<version>4.27.2</version>
8585
</dependency>
8686
</dependencies>
8787

ortools/python/setup.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ setup(
4646
'absl-py >= 2.0.0',
4747
'numpy >= 1.13.3',
4848
'pandas >= 2.0.0',
49-
'protobuf >= 5.26.1',
49+
'protobuf >= 5.27.2',
5050
'immutabledict >= 3.0.0',
5151
],
5252
package_data={

patches/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
exports_files([
1515
"abseil-cpp-20240116.2.patch",
1616
"highs.patch",
17-
"protobuf-v26.1.patch",
17+
"protobuf-v27.2.patch",
1818
"pybind11_abseil.patch",
1919
"pybind11_bazel.patch",
2020
"pybind11_protobuf.patch",

patches/protobuf-v26.1.patch renamed to patches/protobuf-v27.2.patch

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 312eeb928..3e154785b 100644
2+
index 9b51e9722..33c1021d4 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
5-
@@ -41,7 +41,7 @@ else (BUILD_SHARED_LIBS)
5+
@@ -42,7 +42,7 @@ else (BUILD_SHARED_LIBS)
66
endif (BUILD_SHARED_LIBS)
77
option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHARED_LIBS_DEFAULT})
88
include(CMakeDependentOption)
@@ -11,7 +11,7 @@ index 312eeb928..3e154785b 100644
1111
"NOT protobuf_BUILD_SHARED_LIBS" OFF)
1212
set(protobuf_WITH_ZLIB_DEFAULT ON)
1313
option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT})
14-
@@ -158,24 +158,16 @@ endif()
14+
@@ -160,24 +160,16 @@ endif()
1515

1616
set(_protobuf_FIND_ZLIB)
1717
if (protobuf_WITH_ZLIB)
@@ -46,23 +46,23 @@ index 312eeb928..3e154785b 100644
4646
endif (protobuf_WITH_ZLIB)
4747

4848
# We need to link with libatomic on systems that do not have builtin atomics, or
49-
@@ -277,7 +269,6 @@ else (MSVC)
49+
@@ -279,7 +271,6 @@ else (MSVC)
5050
endif (MSVC)
5151

5252
include_directories(
5353
- ${ZLIB_INCLUDE_DIRECTORIES}
5454
${protobuf_BINARY_DIR}
5555
# Support #include-ing other top-level directories, i.e. upb_generator.
5656
${protobuf_SOURCE_DIR}
57-
diff --git a/cmake/install.cmake b/cmake/install.cmake
58-
index 52914a8ea..d7dc5f232 100644
59-
--- a/cmake/install.cmake
60-
+++ b/cmake/install.cmake
61-
@@ -31,6 +31,7 @@ foreach(_library ${_protobuf_libraries})
62-
set_property(TARGET ${_library}
63-
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
64-
$<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>
65-
+ $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}>
66-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
67-
if (UNIX AND NOT APPLE)
68-
set_property(TARGET ${_library}
57+
diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake
58+
index 11c09b1bc..fdea9ce16 100644
59+
--- a/cmake/libprotobuf.cmake
60+
+++ b/cmake/libprotobuf.cmake
61+
@@ -28,6 +28,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
62+
endif()
63+
target_include_directories(libprotobuf PUBLIC
64+
$<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>
65+
+ $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}>
66+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
67+
)
68+
target_link_libraries(libprotobuf PUBLIC ${protobuf_ABSL_USED_TARGETS})

0 commit comments

Comments
 (0)