Skip to content

Commit d0cd890

Browse files
committed
cmake: bump protobuf to v33.1
1 parent aef44af commit d0cd890

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
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=20250814.1
3-
Protobuf=v32.0
3+
Protobuf=v33.1
44
Eigen=3.4.0
55
Re2=2025-08-12
66
CoinUtils=2.11.12

cmake/dependencies/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ if(BUILD_Protobuf)
141141
FetchContent_Declare(
142142
Protobuf
143143
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
144-
GIT_TAG "v32.0"
144+
GIT_TAG "v33.1"
145145
GIT_SHALLOW TRUE
146146
GIT_SUBMODULES ""
147147
UPDATE_COMMAND git reset --hard
148148
PATCH_COMMAND git apply --ignore-whitespace
149-
"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v32.0.patch"
149+
"${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v33.1.patch"
150150
OVERRIDE_FIND_PACKAGE # Make package visible for "protobuf-matchers" below
151151
)
152152
set(protobuf_BUILD_TESTS OFF)

cmake/host.CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ list(APPEND CMAKE_MESSAGE_INDENT " ")
121121
FetchContent_Declare(
122122
protobuf
123123
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
124-
GIT_TAG "v32.0"
124+
GIT_TAG "v33.1"
125125
GIT_SHALLOW TRUE
126126
GIT_SUBMODULES ""
127127
PATCH_COMMAND git apply --ignore-whitespace
128-
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v32.0.patch"
128+
"${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v33.1.patch"
129129
)
130130
set(protobuf_BUILD_TESTS OFF)
131131
set(protobuf_BUILD_SHARED_LIBS ON)

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.32.0"/>
196+
<PackageReference Include="Google.Protobuf" Version="3.33.1"/>
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.32.0"/>
184+
<PackageReference Include="Google.Protobuf" Version="3.33.1"/>
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.32.0</version>
112+
<version>4.33.1</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.32.0</version>
84+
<version>4.33.1</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 >= 2.0.2',
4848
'pandas >= 2.0.0',
49-
'protobuf >= 6.32.0,<6.33',
49+
'protobuf >= 6.33.1,<6.34',
5050
'typing-extensions >= 4.12',
5151
'immutabledict >= 3.0.0',
5252
],

patches/fuzztest-2025-08-05.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ index d8565c0..24b7f52 100644
3535

3636
set(proto_URL https://github.com/protocolbuffers/protobuf.git)
3737
-set(proto_TAG v30.2)
38-
+set(proto_TAG v32.0)
38+
+set(proto_TAG v33.1)
3939

4040
set(nlohmann_json_URL https://github.com/nlohmann/json.git)
4141
set(nlohmann_json_TAG v3.11.3)

0 commit comments

Comments
 (0)