dependency_support: bump protobuf, absl and ortools (#356)

* dependency_support: bump protobuf and ortools * dependency_support/ortools: remove obsolete patch * dependency_support: bump absl * dependency_support/absl: fix imports * dependency_support/ortools: bump deps
hdl · Oct 1, 2024 · 5023590 · 5023590
1 parent 0c9ad2b
commit 5023590
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 37 deletions.
diff --git a/dependency_support/com_google_absl/com_google_absl.bzl b/dependency_support/com_google_absl/com_google_absl.bzl
@@ -14,15 +14,16 @@
 
 """Registers Bazel workspaces for the GNU readline library."""
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 
 def com_google_absl():
     maybe(
-        git_repository,
+        http_archive,
         name = "com_google_absl",
-        tag = "20230125.3",
-        patches = ["@com_google_ortools//patches:abseil-cpp-20230125.3.patch"],
+        urls = ["https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.2.tar.gz"],
+        strip_prefix = "abseil-cpp-20240116.2",
+        sha256 = "733726b8c3a6d39a4120d7e45ea8b41a434cdacde401cba500f14236c49b39dc",
+        patches = ["@com_google_ortools//patches:abseil-cpp-20240116.2.patch"],
         patch_args = ["-p1"],
-        remote = "https://github.com/abseil/abseil-cpp.git",
     )
diff --git a/dependency_support/com_google_ortools/com_google_ortools.bzl b/dependency_support/com_google_ortools/com_google_ortools.bzl
@@ -22,45 +22,40 @@ def com_google_ortools():
     maybe(
         http_archive,
         name = "com_google_ortools",
-        strip_prefix = "or-tools-9.7",
-        urls = ["https://github.com/google/or-tools/archive/refs/tags/v9.7.tar.gz"],
-        sha256 = "054d9517fc6c83f15150c93ef1c2c674ffd7d4a0d1fdc78f6ef8bc3e25c2e339",
-        patch_args = ["-p1"],
-        patches = [
-            # TODO: Newer versions of ortools should not need this patch
-            Label("//dependency_support/com_google_ortools:scip.patch"),
-        ],
+        strip_prefix = "or-tools-9.10",
+        urls = ["https://github.com/google/or-tools/archive/refs/tags/v9.10.tar.gz"],
+        sha256 = "e7c27a832f3595d4ae1d7e53edae595d0347db55c82c309c8f24227e675fd378",
     )
     maybe(
         new_git_repository,
         name = "scip",
-        build_file = "@com_google_ortools//bazel:scip.BUILD",
-        patches = ["@com_google_ortools//bazel:scip.patch"],
+        build_file = "@com_google_ortools//bazel:scip.BUILD.bazel",
+        patches = ["@com_google_ortools//bazel:scip-v900.patch"],
         patch_args = ["-p1"],
-        tag = "v803",
+        tag = "v900",
         remote = "https://github.com/scipopt/scip.git",
     )
     maybe(
         http_archive,
         name = "bliss",
-        build_file = "@com_google_ortools//bazel:bliss.BUILD",
+        build_file = "@com_google_ortools//bazel:bliss.BUILD.bazel",
         patches = ["@com_google_ortools//bazel:bliss-0.73.patch"],
         sha256 = "f57bf32804140cad58b1240b804e0dbd68f7e6bf67eba8e0c0fa3a62fd7f0f84",
         url = "https://github.com/google/or-tools/releases/download/v9.0/bliss-0.73.zip",
         #url = "http://www.tcs.hut.fi/Software/bliss/bliss-0.73.zip",
     )
     maybe(
-        http_archive,
+        new_git_repository,
         name = "eigen",
-        sha256 = "37f0a3859e42112b0b4ea4e7ba2e8167159cbb00dc6cf03cf46b877e360e6dfd",
-        strip_prefix = "eigen-454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3",
-        url = "https://gitlab.com/libeigen/eigen/-/archive/454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3/eigen-454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3.tar.gz",
+        tag = "3.4.0",
+        remote = "https://gitlab.com/libeigen/eigen.git",
         build_file_content = """
 cc_library(
     name = 'eigen3',
     srcs = [],
     includes = ['.'],
     hdrs = glob(['Eigen/**']),
+    defines = ["EIGEN_MPL2_ONLY",],
     visibility = ['//visibility:public'],
 )
 """,

diff --git a/dependency_support/com_google_ortools/scip.patch b/dependency_support/com_google_ortools/scip.patch
diff --git a/dependency_support/com_google_protobuf/com_google_protobuf.bzl b/dependency_support/com_google_protobuf/com_google_protobuf.bzl
@@ -21,9 +21,9 @@ def com_google_protobuf():
     maybe(
         http_archive,
         name = "com_google_protobuf",
-        urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v23.3/protobuf-23.3.tar.gz"],
-        strip_prefix = "protobuf-23.3",
-        integrity = "sha256-Ol9HrTqhAZLFV3/whrJLlzmjaTfDTOq225EqFqPvf44=",
+        urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v26.1/protobuf-26.1.tar.gz"],
+        strip_prefix = "protobuf-26.1",
+        sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8",
         patch_args = ["-p1"],
-        patches = ["@com_google_ortools//patches:protobuf-v23.3.patch"],
+        patches = ["@com_google_ortools//patches:protobuf-v26.1.patch"],
     )