always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deps: Bump protobuf v21.10 -> v21.12

Browse Source
This commit is contained in:
Corentin Le Molgat
2023-01-20 10:16:40 +01:00
parent c619acbee1
commit 844368617a
12 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dependencies.txt
View File

@@ -1,4 +1,4 @@
Protobuf=v21.10
Protobuf=v21.12
abseil-cpp=20220623.1
Cbc=2.10.7
Cgl=0.60.5

2
WORKSPACE
View File

@@ -42,7 +42,7 @@ git_repository(
# Protobuf
git_repository(
name = "com_google_protobuf",
tag = "v21.10",
tag = "v21.12",
remote = "https://github.com/protocolbuffers/protobuf.git",
)
# Load common dependencies.

2
bazel/python_deps.txt
View File

@@ -1,4 +1,4 @@
absl-py >= 0.13
numpy >= 1.13.3
protobuf >= 4.21.10
protobuf >= 4.21.12
scipy >= 1.10.0

4
cmake/dependencies/CMakeLists.txt
View File

@@ -100,9 +100,9 @@ if(BUILD_Protobuf)
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v21.10"
GIT_TAG "v21.12"
GIT_SUBMODULES ""
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v21.10.patch")
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v21.12.patch")
FetchContent_MakeAvailable(protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")

4
cmake/host.CMakeLists.txt
View File

@@ -116,9 +116,9 @@ set(protobuf_MSVC_STATIC_RUNTIME OFF)
FetchContent_Declare(
protobuf
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v21.5"
GIT_TAG "v21.12"
GIT_SUBMODULES ""
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v21.10.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v21.12.patch")
FetchContent_MakeAvailable(protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")

2
ortools/dotnet/Google.OrTools-full.csproj.in
View File

@@ -176,7 +176,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.10"/>
<PackageReference Include="Google.Protobuf" Version="3.21.12"/>
</ItemGroup>
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

2
ortools/dotnet/Google.OrTools-local.csproj.in
View File

@@ -164,7 +164,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.21.10"/>
<PackageReference Include="Google.Protobuf" Version="3.21.12"/>
</ItemGroup>
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->

2
ortools/java/pom-full.xml.in
View File

@@ -109,7 +109,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.21.10</version>
<version>3.21.12</version>
</dependency>
</dependencies>

2
ortools/java/pom-local.xml.in
View File

@@ -81,7 +81,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.21.10</version>
<version>3.21.12</version>
</dependency>
</dependencies>

2
ortools/java/pom.xml.in
View File

@@ -69,7 +69,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.21.10</version>
<version>3.21.12</version>
</dependency>
<dependency>
<groupId>junit</groupId>

2
ortools/python/setup.py.in
View File

@@ -45,7 +45,7 @@ setup(
install_requires=[
'absl-py >= 0.13',
'numpy >= 1.13.3',
'protobuf >= 4.21.10',
'protobuf >= 4.21.12',
'scipy >= 1.10.0',
],
package_data={

0
patches/protobuf-v21.10.patch → patches/protobuf-v21.12.patch
View File