deps: Bump protobuf to v23.2
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
Protobuf=v23.1
|
||||
Protobuf=v23.2
|
||||
abseil-cpp=20230125.3
|
||||
Cbc=2.10.7
|
||||
Cgl=0.60.5
|
||||
|
||||
@@ -73,8 +73,8 @@ git_repository(
|
||||
## Protobuf
|
||||
git_repository(
|
||||
name = "com_google_protobuf",
|
||||
tag = "v23.1",
|
||||
patches = ["//patches:protobuf-v23.1.patch"],
|
||||
tag = "v23.2",
|
||||
patches = ["//patches:protobuf-v23.2.patch"],
|
||||
patch_args = ["-p1"],
|
||||
remote = "https://github.com/protocolbuffers/protobuf.git",
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# OR-Tools code dependencies
|
||||
absl-py==1.4.0
|
||||
numpy==1.24.1
|
||||
protobuf==4.23.1
|
||||
protobuf==4.23.2
|
||||
scipy==1.10.0
|
||||
|
||||
# OR-Tools build dependencies
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# OR-Tools code dependencies
|
||||
absl-py==1.4.0
|
||||
numpy==1.24.1
|
||||
protobuf==4.23.1
|
||||
protobuf==4.23.2
|
||||
scipy==1.10.0
|
||||
|
||||
# OR-Tools build dependencies
|
||||
|
||||
@@ -103,9 +103,9 @@ if(BUILD_Protobuf)
|
||||
FetchContent_Declare(
|
||||
protobuf
|
||||
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
|
||||
GIT_TAG "v23.1"
|
||||
GIT_TAG "v23.2"
|
||||
GIT_SUBMODULES ""
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v23.1.patch")
|
||||
PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v23.2.patch")
|
||||
FetchContent_MakeAvailable(protobuf)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
message(CHECK_PASS "fetched")
|
||||
|
||||
@@ -131,9 +131,9 @@ set(protobuf_MSVC_STATIC_RUNTIME OFF)
|
||||
FetchContent_Declare(
|
||||
protobuf
|
||||
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
|
||||
GIT_TAG "v23.1"
|
||||
GIT_TAG "v23.2"
|
||||
GIT_SUBMODULES ""
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v23.1.patch")
|
||||
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v23.2.patch")
|
||||
FetchContent_MakeAvailable(protobuf)
|
||||
list(POP_BACK CMAKE_MESSAGE_INDENT)
|
||||
message(CHECK_PASS "fetched")
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Google.Protobuf" Version="3.23.1"/>
|
||||
<PackageReference Include="Google.Protobuf" Version="3.23.2"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Google.Protobuf" Version="3.23.1"/>
|
||||
<PackageReference Include="Google.Protobuf" Version="3.23.2"/>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>3.23.1</version>
|
||||
<version>3.23.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>3.23.1</version>
|
||||
<version>3.23.2</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<dependency>
|
||||
<groupId>com.google.protobuf</groupId>
|
||||
<artifactId>protobuf-java</artifactId>
|
||||
<version>3.23.1</version>
|
||||
<version>3.23.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
||||
@@ -45,7 +45,7 @@ setup(
|
||||
install_requires=[
|
||||
'absl-py >= 0.13',
|
||||
'numpy >= 1.13.3',
|
||||
'protobuf >= 4.23.1',
|
||||
'protobuf >= 4.23.2',
|
||||
'scipy >= 1.10.0',
|
||||
],
|
||||
package_data={
|
||||
|
||||
Reference in New Issue
Block a user