diff --git a/BUILD.bazel b/BUILD.bazel index 6023c2479d..d76269a5a5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_gazelle//:def.bzl", "gazelle") +load("@gazelle//:def.bzl", "gazelle") load("@rules_license//rules:license.bzl", "license") # Expose license for external usage through bazel. diff --git a/Dependencies.txt b/Dependencies.txt index c9ebed0a22..b1dc1ed9b7 100644 --- a/Dependencies.txt +++ b/Dependencies.txt @@ -1,8 +1,8 @@ ZLIB=1.3.1 -abseil-cpp=20250127.1 -Protobuf=v30.2 +abseil-cpp=20250512.0 +Protobuf=v31.0 Eigen=3.4.0 -Re2=2024-04-01 +Re2=2024-07-02 CoinUtils=2.11.12 Osi=0.108.11 Clp=1.17.10 @@ -16,5 +16,5 @@ pybind11=v2.13.6 pybind11_abseil=v202402.0 pybind11_protobuf=84653a591aea5df482dc2bde42c19efafbd53a57 # Testing -googletest=v1.16.0 -benchmark=v1.9.1 +googletest=v1.17.0 +benchmark=v1.9.2 diff --git a/MODULE.bazel b/MODULE.bazel index 0d6e05df49..97c5a55401 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,26 +13,26 @@ module( ) # see https://registry.bazel.build/ -bazel_dep(name = "abseil-cpp", version = "20250127.1") +bazel_dep(name = "abseil-cpp", version = "20250512.0") bazel_dep(name = "bazel_skylib", version = "1.7.1") bazel_dep(name = "bzip2", version = "1.0.8.bcr.2") bazel_dep(name = "contrib_rules_jvm", version = "0.28.0") bazel_dep(name = "eigen", version = "3.4.0.bcr.3") -bazel_dep(name = "fuzztest", version = "20250214.0", repo_name = "com_google_fuzztest") +bazel_dep(name = "fuzztest", version = "20250214.0") bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c") # otherwise fuzztest use a borken version -bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle") +bazel_dep(name = "gazelle", version = "0.43.0") bazel_dep(name = "glpk", version = "5.0.bcr.3") -bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_benchmark") -bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest") +bazel_dep(name = "google_benchmark", version = "1.9.2") +bazel_dep(name = "googletest", version = "1.17.0") bazel_dep(name = "highs", version = "1.10.0") bazel_dep(name = "platforms", version = "0.0.11") -bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf") +bazel_dep(name = "protobuf", version = "31.0") bazel_dep(name = "pybind11_abseil", version = "202402.0") bazel_dep(name = "pybind11_bazel", version = "2.13.6") bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729") -bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_google_re2") +bazel_dep(name = "re2", version = "2024-07-02.bcr.1") bazel_dep(name = "rules_cc", version = "0.1.1") -bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go") +bazel_dep(name = "rules_go", version = "0.53.0") bazel_dep(name = "rules_java", version = "8.11.0") bazel_dep(name = "rules_jvm_external", version = "6.7") bazel_dep(name = "rules_license", version = "1.0.0") @@ -131,10 +131,10 @@ maven.install( ) use_repo(maven, "maven") -go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") +go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk") go_sdk.download(version = "1.22.4") -go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") +go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps") go_deps.module( path = "github.com/golang/glog", sum = "h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=", diff --git a/bazel/notebook_requirements.in b/bazel/notebook_requirements.in index 56402811ad..af64100600 100644 --- a/bazel/notebook_requirements.in +++ b/bazel/notebook_requirements.in @@ -1,8 +1,8 @@ # OR-Tools code dependencies -absl-py==2.1.0 -immutabledict==3.0.0 +absl-py==2.2.2 +immutabledict==4.2.1 numpy==2.2.0 -protobuf==6.30.2 +protobuf==6.31.0 requests==2.32.3 scipy==1.14.1 typing-extensions==4.13.1 @@ -21,10 +21,10 @@ svgwrite==1.4.3 plotly==5.15.0 # Notebook -jupyterlab==4.4.1 -notebook==7.4.1 -jupyter-server==2.15.0 -tornado==6.4.2 -Pygments==2.15.0 -jsonschema==4.19.0 +jupyterlab==4.4.2 +notebook==7.4.2 +jupyter-server==2.16.0 +tornado==6.5.0 +Pygments==2.19.1 +jsonschema==4.23.0 jinja2==3.1.6 diff --git a/bazel/notebook_requirements.txt b/bazel/notebook_requirements.txt index 88cdc1bd3f..7fbe03c9bc 100644 --- a/bazel/notebook_requirements.txt +++ b/bazel/notebook_requirements.txt @@ -4,7 +4,7 @@ # # bazel run //bazel:notebook_requirements.update # -absl-py==2.1.0 +absl-py==2.2.2 # via -r bazel/notebook_requirements.in anyio==4.0.0 # via @@ -75,7 +75,7 @@ idna==3.7 # httpx # jsonschema # requests -immutabledict==3.0.0 +immutabledict==4.2.1 # via -r bazel/notebook_requirements.in ipykernel==6.25.2 # via jupyterlab @@ -96,7 +96,7 @@ json5==0.9.14 # via jupyterlab-server jsonpointer==2.4 # via jsonschema -jsonschema[format-nongpl]==4.19.0 +jsonschema[format-nongpl]==4.23.0 # via # -r bazel/notebook_requirements.in # jupyter-events @@ -122,7 +122,7 @@ jupyter-events==0.12.0 # via jupyter-server jupyter-lsp==2.2.2 # via jupyterlab -jupyter-server==2.15.0 +jupyter-server==2.16.0 # via # -r bazel/notebook_requirements.in # jupyter-lsp @@ -132,7 +132,7 @@ jupyter-server==2.15.0 # notebook-shim jupyter-server-terminals==0.4.4 # via jupyter-server -jupyterlab==4.4.1 +jupyterlab==4.4.2 # via # -r bazel/notebook_requirements.in # notebook @@ -171,7 +171,7 @@ nbformat==5.9.2 # nbconvert nest-asyncio==1.5.7 # via ipykernel -notebook==7.4.1 +notebook==7.4.2 # via -r bazel/notebook_requirements.in notebook-shim==0.2.3 # via @@ -217,7 +217,7 @@ prometheus-client==0.17.1 # via jupyter-server prompt-toolkit==3.0.39 # via ipython -protobuf==6.30.2 +protobuf==6.31.0 # via # -r bazel/notebook_requirements.in # mypy-protobuf @@ -231,7 +231,7 @@ pure-eval==0.2.2 # via stack-data pycparser==2.21 # via cffi -pygments==2.15.0 +pygments==2.19.1 # via # -r bazel/notebook_requirements.in # ipython @@ -301,7 +301,7 @@ terminado==0.17.1 # jupyter-server-terminals tinycss2==1.2.1 # via nbconvert -tornado==6.4.2 +tornado==6.5 # via # -r bazel/notebook_requirements.in # ipykernel @@ -340,7 +340,7 @@ virtualenv==20.28.1 # via -r bazel/notebook_requirements.in wcwidth==0.2.6 # via prompt-toolkit -webcolors==1.13 +webcolors==24.11.1 # via jsonschema webencodings==0.5.1 # via diff --git a/bazel/ortools_requirements.in b/bazel/ortools_requirements.in index 5dc2da0ffe..0b4c89ab40 100644 --- a/bazel/ortools_requirements.in +++ b/bazel/ortools_requirements.in @@ -1,8 +1,8 @@ # OR-Tools code dependencies -absl-py==2.1.0 -immutabledict==3.0.0 +absl-py==2.2.2 +immutabledict==4.2.1 numpy==2.2.0 -protobuf==6.30.2 +protobuf==6.31.0 requests==2.32.3 scipy==1.14.1 typing-extensions==4.13.1 @@ -15,4 +15,6 @@ black==24.8.0 # Example dependencies pandas==2.2.3 + +# Visualization dependencies svgwrite==1.4.3 diff --git a/bazel/ortools_requirements.txt b/bazel/ortools_requirements.txt index 2c6f29d454..820668e036 100644 --- a/bazel/ortools_requirements.txt +++ b/bazel/ortools_requirements.txt @@ -4,7 +4,7 @@ # # bazel run //bazel:ortools_requirements.update # -absl-py==2.1.0 +absl-py==2.2.2 # via -r bazel/ortools_requirements.in black==24.8.0 # via -r bazel/ortools_requirements.in @@ -20,7 +20,7 @@ filelock==3.12.2 # via virtualenv idna==3.7 # via requests -immutabledict==3.0.0 +immutabledict==4.2.1 # via -r bazel/ortools_requirements.in mypy==1.6.1 # via -r bazel/ortools_requirements.in @@ -45,7 +45,7 @@ platformdirs==3.10.0 # via # black # virtualenv -protobuf==6.30.2 +protobuf==6.31.0 # via # -r bazel/ortools_requirements.in # mypy-protobuf diff --git a/deps.bzl b/deps.bzl index 9f3ef22a53..0df804bae9 100644 --- a/deps.bzl +++ b/deps.bzl @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@bazel_gazelle//:deps.bzl", "go_repository") +load("@gazelle//:deps.bzl", "go_repository") def go_dependencies(): go_repository( diff --git a/examples/contrib/BUILD.bazel b/examples/contrib/BUILD.bazel index b6f58fc0c8..e29c6af2d0 100644 --- a/examples/contrib/BUILD.bazel +++ b/examples/contrib/BUILD.bazel @@ -11,6 +11,6 @@ cc_binary( "@abseil-cpp//absl/container:btree", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/examples/cpp/BUILD.bazel b/examples/cpp/BUILD.bazel index 93647cc9ec..51716946da 100644 --- a/examples/cpp/BUILD.bazel +++ b/examples/cpp/BUILD.bazel @@ -33,7 +33,7 @@ cc_binary( "@abseil-cpp//absl/container:btree", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -52,7 +52,7 @@ cc_test( "//ortools/packing:multiple_dimensions_bin_packing_cc_proto", "//ortools/sat:cp_model", "@abseil-cpp//absl/flags:flag", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -200,7 +200,7 @@ cc_binary( "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/flags:parse", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -216,7 +216,7 @@ cc_test( "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/flags:parse", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -232,7 +232,7 @@ cc_binary( "//ortools/sat:cp_model", "//ortools/sat:cp_model_solver", "@abseil-cpp//absl/flags:flag", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -250,7 +250,7 @@ cc_test( "//ortools/packing:multiple_dimensions_bin_packing_cc_proto", "//ortools/sat:cp_model", "@abseil-cpp//absl/flags:flag", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -405,7 +405,7 @@ cc_binary( "//ortools/util:filelineiter", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -433,7 +433,7 @@ cc_test( "//ortools/util:filelineiter", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -607,7 +607,7 @@ cc_binary( "//ortools/routing", "//ortools/util:random_engine", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -623,7 +623,7 @@ cc_binary( "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -766,7 +766,7 @@ cc_binary( "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -787,7 +787,7 @@ cc_test( "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -943,7 +943,7 @@ cc_binary( "//ortools/util:qap_reader", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -977,7 +977,7 @@ cc_binary( "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/flags:parse", "@abseil-cpp//absl/random", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/algorithms/BUILD.bazel b/ortools/algorithms/BUILD.bazel index 2d520cb7da..c1dacf06bc 100644 --- a/ortools/algorithms/BUILD.bazel +++ b/ortools/algorithms/BUILD.bazel @@ -86,7 +86,7 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/time", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -127,7 +127,7 @@ cc_test( "@abseil-cpp//absl/random:bit_gen_ref", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -141,7 +141,7 @@ cc_library( "@abseil-cpp//absl/random", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -439,6 +439,6 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) diff --git a/ortools/base/BUILD.bazel b/ortools/base/BUILD.bazel index 97cb61d29d..1e53dc3b5e 100644 --- a/ortools/base/BUILD.bazel +++ b/ortools/base/BUILD.bazel @@ -162,8 +162,8 @@ cc_test( "@abseil-cpp//absl/random", "@abseil-cpp//absl/random:bit_gen_ref", "@abseil-cpp//absl/random:distributions", - "@com_google_benchmark//:benchmark", - "@com_google_googletest//:gtest_main", + "@google_benchmark//:benchmark", + "@googletest//:gtest_main", ], ) @@ -200,7 +200,7 @@ cc_test( deps = [ ":dump_vars", "@abseil-cpp//absl/strings", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -253,7 +253,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", "@bzip2//:bz2", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", "@zlib", ], ) @@ -264,10 +264,10 @@ cc_library( hdrs = ["fuzztest.h"], deps = [ "@abseil-cpp//absl/log:check", - "@com_google_fuzztest//fuzztest", - "@com_google_fuzztest//fuzztest:googletest_fixture_adapter", - "@com_google_fuzztest//fuzztest:init_fuzztest", - "@com_google_protobuf//:protobuf", + "@fuzztest//fuzztest", + "@fuzztest//fuzztest:googletest_fixture_adapter", + "@fuzztest//fuzztest:init_fuzztest", + "@protobuf//:protobuf", ], ) @@ -277,7 +277,7 @@ cc_library( deps = [ ":message_matchers", ":status_matchers", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -285,7 +285,7 @@ cc_library( name = "gmock_main", deps = [ ":gmock", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -423,8 +423,8 @@ cc_library( hdrs = ["message_matchers.h"], deps = [ "@abseil-cpp//absl/strings", - "@com_google_googletest//:gtest", - "@com_google_protobuf//:protobuf", + "@googletest//:gtest", + "@protobuf//:protobuf", ], ) @@ -459,7 +459,7 @@ cc_library( hdrs = ["parse_text_proto.h"], deps = [ "@abseil-cpp//absl/log:check", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -469,7 +469,7 @@ cc_library( deps = [ ":gmock", "@abseil-cpp//absl/log:check", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -495,7 +495,7 @@ cc_library( ":timer", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -504,7 +504,7 @@ cc_library( hdrs = ["proto_enum_utils.h"], deps = [ "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -523,7 +523,7 @@ cc_library( ":logging", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", "@zlib", ], ) @@ -558,7 +558,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", - "@com_google_googletest//:gtest", + "@googletest//:gtest", ], ) @@ -605,7 +605,7 @@ cc_test( "@abseil-cpp//absl/numeric:int128", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/ortools/bop/BUILD.bazel b/ortools/bop/BUILD.bazel index ae847c0fd4..fcab0d1ee3 100644 --- a/ortools/bop/BUILD.bazel +++ b/ortools/bop/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -119,7 +119,7 @@ cc_library( "//ortools/util:stats", "//ortools/util:time_limit", "@abseil-cpp//absl/random", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -149,7 +149,7 @@ cc_library( "//ortools/util:time_limit", "@abseil-cpp//absl/random", "@abseil-cpp//absl/cleanup", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -258,7 +258,7 @@ cc_library( "//ortools/base:threadpool", "//ortools/util:bitset", "//ortools/util:time_limit", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", "//ortools/util:stats", ], ) @@ -291,6 +291,6 @@ cc_library( "//ortools/util:bitset", "//ortools/util:stats", "//ortools/util:time_limit", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/constraint_solver/BUILD.bazel b/ortools/constraint_solver/BUILD.bazel index bf15499a69..33bf13b813 100644 --- a/ortools/constraint_solver/BUILD.bazel +++ b/ortools/constraint_solver/BUILD.bazel @@ -13,10 +13,10 @@ # Home of constraint solver constraint_solver -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") load("@rules_python//python:defs.bzl", "py_library") diff --git a/ortools/glop/BUILD.bazel b/ortools/glop/BUILD.bazel index ac1b3756ca..95860dd0c0 100644 --- a/ortools/glop/BUILD.bazel +++ b/ortools/glop/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package( diff --git a/ortools/graph/BUILD.bazel b/ortools/graph/BUILD.bazel index ce0aeeba3c..9c04dee929 100644 --- a/ortools/graph/BUILD.bazel +++ b/ortools/graph/BUILD.bazel @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -56,7 +56,7 @@ cc_test( "@abseil-cpp//absl/random", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -111,7 +111,7 @@ cc_test( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/random", "@abseil-cpp//absl/random:distributions", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -132,7 +132,7 @@ cc_test( ":minimum_vertex_cover", "//ortools/base:gmock_main", "@abseil-cpp//absl/algorithm:container", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -229,7 +229,7 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -290,7 +290,7 @@ cc_test( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -310,7 +310,7 @@ cc_test( ":graph", "//ortools/base:gmock_main", "@abseil-cpp//absl/base:core_headers", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -337,7 +337,7 @@ cc_test( "@abseil-cpp//absl/base:core_headers", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -430,7 +430,7 @@ cc_test( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -467,7 +467,7 @@ cc_test( "//ortools/base:gmock_main", "//ortools/base:path", "//ortools/util:file_util", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -498,7 +498,7 @@ cc_test( "@abseil-cpp//absl/random:bit_gen_ref", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -541,7 +541,7 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ":graph", # Using CLP because GLOP is too slow in non-opt mode. "//ortools/algorithms:binary_search", @@ -598,7 +598,7 @@ cc_test( "//ortools/base:gmock_main", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/random:distributions", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -641,7 +641,7 @@ cc_test( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -754,7 +754,7 @@ cc_test( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/random", "@abseil-cpp//absl/status", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -790,7 +790,7 @@ cc_test( "@abseil-cpp//absl/random", "@abseil-cpp//absl/status", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -810,7 +810,7 @@ cc_test( "@abseil-cpp//absl/random", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) diff --git a/ortools/gscip/BUILD.bazel b/ortools/gscip/BUILD.bazel index 690ab7ccb8..1c7e016f10 100644 --- a/ortools/gscip/BUILD.bazel +++ b/ortools/gscip/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package( diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel index f561c458c9..4a7ed5e0ad 100644 --- a/ortools/linear_solver/BUILD.bazel +++ b/ortools/linear_solver/BUILD.bazel @@ -13,9 +13,9 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") load("@bazel_skylib//rules:copy_file.bzl", "copy_file") -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) diff --git a/ortools/linear_solver/proto_solver/BUILD.bazel b/ortools/linear_solver/proto_solver/BUILD.bazel index 4f8587c492..3693aa44d6 100644 --- a/ortools/linear_solver/proto_solver/BUILD.bazel +++ b/ortools/linear_solver/proto_solver/BUILD.bazel @@ -20,7 +20,7 @@ cc_library( deps = [ "//ortools/port:proto_utils", "@abseil-cpp//absl/log:check", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/lp_data/BUILD.bazel b/ortools/lp_data/BUILD.bazel index 5cfd838912..84b4b74471 100644 --- a/ortools/lp_data/BUILD.bazel +++ b/ortools/lp_data/BUILD.bazel @@ -250,7 +250,7 @@ cc_library( "//ortools/linear_solver:linear_solver_cc_proto", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", - "@com_google_re2//:re2", + "@re2//:re2", ], ) diff --git a/ortools/math_opt/BUILD.bazel b/ortools/math_opt/BUILD.bazel index 5ee4a2102d..808fb161c6 100644 --- a/ortools/math_opt/BUILD.bazel +++ b/ortools/math_opt/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") package(default_visibility = ["//visibility:public"]) @@ -22,7 +22,7 @@ proto_library( srcs = ["callback.proto"], deps = [ ":sparse_containers_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) @@ -64,7 +64,7 @@ proto_library( deps = [ ":solution_proto", ":sparse_containers_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) @@ -113,7 +113,7 @@ proto_library( "//ortools/math_opt/solvers:osqp_proto", "//ortools/pdlp:solvers_proto", "//ortools/sat:sat_parameters_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) @@ -137,7 +137,7 @@ proto_library( "//ortools/gscip:gscip_proto", "//ortools/math_opt/solvers:osqp_proto", "//ortools/pdlp:solve_log_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) diff --git a/ortools/math_opt/core/BUILD.bazel b/ortools/math_opt/core/BUILD.bazel index 5f0d2ff780..a914190703 100644 --- a/ortools/math_opt/core/BUILD.bazel +++ b/ortools/math_opt/core/BUILD.bazel @@ -51,7 +51,7 @@ cc_library( "//ortools/math_opt:sparse_containers_cc_proto", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -228,7 +228,7 @@ cc_library( "@abseil-cpp//absl/algorithm:container", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/math_opt/cpp/BUILD.bazel b/ortools/math_opt/cpp/BUILD.bazel index 04799b7d48..22bbe52c84 100644 --- a/ortools/math_opt/cpp/BUILD.bazel +++ b/ortools/math_opt/cpp/BUILD.bazel @@ -63,7 +63,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -296,7 +296,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/time", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -326,7 +326,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/synchronization", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/math_opt/elemental/BUILD.bazel b/ortools/math_opt/elemental/BUILD.bazel index 1fbe3dbf27..039c7eafc8 100644 --- a/ortools/math_opt/elemental/BUILD.bazel +++ b/ortools/math_opt/elemental/BUILD.bazel @@ -78,7 +78,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -98,7 +98,7 @@ cc_test( "//ortools/base:gmock_main", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/status", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -152,7 +152,7 @@ cc_test( ":element_storage", "//ortools/base:gmock_main", "@abseil-cpp//absl/status", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -221,7 +221,7 @@ cc_test( ":attr_storage", ":symmetry", "//ortools/base:gmock_main", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -278,7 +278,7 @@ cc_test( "@abseil-cpp//absl/meta:type_traits", "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) diff --git a/ortools/math_opt/python/BUILD.bazel b/ortools/math_opt/python/BUILD.bazel index a97fa830be..facc0b7e87 100644 --- a/ortools/math_opt/python/BUILD.bazel +++ b/ortools/math_opt/python/BUILD.bazel @@ -560,7 +560,7 @@ py_library( name = "normalize", srcs = ["normalize.py"], visibility = ["//ortools/math_opt/python:__subpackages__"], - deps = ["@com_google_protobuf//:protobuf_python"], + deps = ["@protobuf//:protobuf_python"], ) py_test( diff --git a/ortools/math_opt/python/ipc/BUILD.bazel b/ortools/math_opt/python/ipc/BUILD.bazel index ccf05ed987..79d3dd9911 100644 --- a/ortools/math_opt/python/ipc/BUILD.bazel +++ b/ortools/math_opt/python/ipc/BUILD.bazel @@ -24,7 +24,7 @@ py_library( requirement("requests"), "//ortools/math_opt:rpc_py_pb2", "//ortools/math_opt/python:mathopt", - "@com_google_protobuf//:protobuf_python", + "@protobuf//:protobuf_python", ], ) @@ -35,6 +35,6 @@ py_library( "//ortools/math_opt:rpc_py_pb2", "//ortools/math_opt/python:normalize", "//ortools/service/v1:optimization_py_pb2", - "@com_google_protobuf//:protobuf_python", + "@protobuf//:protobuf_python", ], ) diff --git a/ortools/math_opt/python/testing/BUILD.bazel b/ortools/math_opt/python/testing/BUILD.bazel index ef4cbc954f..289d42b5b1 100644 --- a/ortools/math_opt/python/testing/BUILD.bazel +++ b/ortools/math_opt/python/testing/BUILD.bazel @@ -23,7 +23,7 @@ py_library( deps = [ requirement("absl-py"), "//ortools/math_opt/python:normalize", - "@com_google_protobuf//:protobuf_python", + "@protobuf//:protobuf_python", ], ) @@ -44,7 +44,7 @@ py_library( srcs = ["proto_matcher.py"], deps = [ "//ortools/math_opt/python:normalize", - "@com_google_protobuf//:protobuf_python", + "@protobuf//:protobuf_python", ], ) diff --git a/ortools/math_opt/solvers/BUILD.bazel b/ortools/math_opt/solvers/BUILD.bazel index f007b60c52..d01605400e 100644 --- a/ortools/math_opt/solvers/BUILD.bazel +++ b/ortools/math_opt/solvers/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:cc_library.bzl", "cc_library") load("@rules_cc//cc:cc_test.bzl", "cc_test") @@ -66,7 +66,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/time", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", "@scip", ], alwayslink = 1, @@ -187,7 +187,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/time", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], alwayslink = 1, ) diff --git a/ortools/math_opt/storage/BUILD.bazel b/ortools/math_opt/storage/BUILD.bazel index 605fcbe9ae..17878bd805 100644 --- a/ortools/math_opt/storage/BUILD.bazel +++ b/ortools/math_opt/storage/BUILD.bazel @@ -130,7 +130,7 @@ cc_library( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/strings:string_view", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -170,7 +170,7 @@ cc_library( "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log:check", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/math_opt/validators/BUILD.bazel b/ortools/math_opt/validators/BUILD.bazel index c14541ff38..f2e725a7a8 100644 --- a/ortools/math_opt/validators/BUILD.bazel +++ b/ortools/math_opt/validators/BUILD.bazel @@ -122,7 +122,7 @@ cc_library( "//ortools/math_opt/core:model_summary", "//ortools/port:proto_utils", "@abseil-cpp//absl/status", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -184,7 +184,7 @@ cc_library( "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -205,7 +205,7 @@ cc_library( "//ortools/util:status_macros", "@abseil-cpp//absl/status", "@abseil-cpp//absl/time", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/packing/BUILD.bazel b/ortools/packing/BUILD.bazel index c6b75b43fb..a2ce3c9cf0 100644 --- a/ortools/packing/BUILD.bazel +++ b/ortools/packing/BUILD.bazel @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) diff --git a/ortools/pdlp/BUILD.bazel b/ortools/pdlp/BUILD.bazel index 8c3bb36edc..233b229c81 100644 --- a/ortools/pdlp/BUILD.bazel +++ b/ortools/pdlp/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -149,7 +149,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/time", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", "@eigen", ], ) diff --git a/ortools/port/BUILD.bazel b/ortools/port/BUILD.bazel index e5eedc3da9..59dffc25bb 100644 --- a/ortools/port/BUILD.bazel +++ b/ortools/port/BUILD.bazel @@ -32,7 +32,7 @@ cc_library( "//ortools/util:parse_proto", "@abseil-cpp//absl/log", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/routing/BUILD.bazel b/ortools/routing/BUILD.bazel index 83675e15cc..bbe029185c 100644 --- a/ortools/routing/BUILD.bazel +++ b/ortools/routing/BUILD.bazel @@ -11,10 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -79,7 +79,7 @@ proto_library( "//ortools/constraint_solver:solver_parameters_proto", "//ortools/sat:sat_parameters_proto", "//ortools/util:optional_boolean_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) @@ -125,7 +125,7 @@ cc_library( "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/time", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -289,7 +289,7 @@ cc_library( "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/time", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/routing/parsers/BUILD.bazel b/ortools/routing/parsers/BUILD.bazel index 359020913f..925717864c 100644 --- a/ortools/routing/parsers/BUILD.bazel +++ b/ortools/routing/parsers/BUILD.bazel @@ -11,8 +11,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -43,7 +43,7 @@ cc_test( deps = [ ":simple_graph", "@abseil-cpp//absl/hash:hash_testing", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -60,7 +60,7 @@ cc_library( "//ortools/base:zipfile", "//ortools/util:filelineiter", "@abseil-cpp//absl/strings", - "@com_google_re2//:re2", + "@re2//:re2", ], ) @@ -77,7 +77,7 @@ cc_test( "//ortools/base", "//ortools/base:file", "//ortools/base:gmock", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -108,7 +108,7 @@ cc_test( ":lilim_parser", "//ortools/base:path", "@abseil-cpp//absl/flags:flag", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -184,7 +184,7 @@ cc_test( "//ortools/base:path", "@abseil-cpp//absl/flags:flag", "@abseil-cpp//absl/hash:hash_testing", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -218,7 +218,7 @@ cc_test( ":pdtsp_parser", "//ortools/base", "//ortools/base:path", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -239,7 +239,7 @@ cc_library( "//ortools/util:filelineiter", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/strings", - "@com_google_re2//:re2", + "@re2//:re2", ], ) @@ -266,7 +266,7 @@ cc_test( "@abseil-cpp//absl/container:btree", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) @@ -300,7 +300,7 @@ cc_test( deps = [ ":tsptw_parser", "//ortools/base", - "@com_google_googletest//:gtest_main", + "@googletest//:gtest_main", ], ) diff --git a/ortools/sat/BUILD.bazel b/ortools/sat/BUILD.bazel index b9ad165420..e7094dc654 100644 --- a/ortools/sat/BUILD.bazel +++ b/ortools/sat/BUILD.bazel @@ -13,11 +13,11 @@ # Home of CP/SAT solver (which includes SAT, max-SAT and PB problems). -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") -load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@rules_go//proto:def.bzl", "go_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") package(default_visibility = ["//visibility:public"]) @@ -149,7 +149,7 @@ cc_library( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -236,7 +236,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -496,7 +496,7 @@ cc_test( ":parameters_validation", ":sat_parameters_cc_proto", "//ortools/base:gmock_main", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -632,7 +632,7 @@ cc_library( "@abseil-cpp//absl/synchronization", "@abseil-cpp//absl/time", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -760,7 +760,7 @@ cc_library( "@abseil-cpp//absl/synchronization", "@abseil-cpp//absl/time", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -1114,7 +1114,7 @@ cc_library( "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -1230,7 +1230,7 @@ cc_library( "@abseil-cpp//absl/meta:type_traits", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -2099,7 +2099,7 @@ cc_test( "//ortools/util:strong_integers", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -2554,7 +2554,7 @@ cc_library( "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/meta:type_traits", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -3154,7 +3154,7 @@ cc_library( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -3180,7 +3180,7 @@ cc_test( "@abseil-cpp//absl/random", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -3361,7 +3361,7 @@ cc_test( "@abseil-cpp//absl/random:bit_gen_ref", "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -3442,7 +3442,7 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -3514,8 +3514,8 @@ cc_test( "@abseil-cpp//absl/random:distributions", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", - "@com_google_fuzztest//fuzztest:fuzztest_gtest_main", + "@google_benchmark//:benchmark", + "@fuzztest//fuzztest:fuzztest_gtest_main", ], ) @@ -3996,7 +3996,7 @@ cc_binary( "@abseil-cpp//absl/log:flags", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -4072,7 +4072,7 @@ cc_library( "@abseil-cpp//absl/status", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/types:span", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/sat/go/cpmodel/BUILD.bazel b/ortools/sat/go/cpmodel/BUILD.bazel index 3b12cff8df..8fdf87ee0c 100644 --- a/ortools/sat/go/cpmodel/BUILD.bazel +++ b/ortools/sat/go/cpmodel/BUILD.bazel @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") +load("@rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "cpmodel", diff --git a/ortools/sat/java/BUILD.bazel b/ortools/sat/java/BUILD.bazel index 7eb15d49fa..dc1589eb1e 100644 --- a/ortools/sat/java/BUILD.bazel +++ b/ortools/sat/java/BUILD.bazel @@ -24,7 +24,7 @@ ortools_java_wrap_cc( "//ortools/sat:cp_model_java_proto", "//ortools/sat:sat_parameters_java_proto", "//ortools/util/java:sorted_interval_list", - "@com_google_protobuf//java/core", + "@protobuf//java/core", ], package = "com.google.ortools.sat", swig_includes = [ diff --git a/ortools/sat/python/BUILD.bazel b/ortools/sat/python/BUILD.bazel index 25b9f6fe8e..d73f0fa96f 100644 --- a/ortools/sat/python/BUILD.bazel +++ b/ortools/sat/python/BUILD.bazel @@ -73,7 +73,7 @@ py_library( deps = [ ":cp_model_helper", requirement("numpy"), - "@com_google_protobuf//:protobuf_python", + "@protobuf//:protobuf_python", ], ) diff --git a/ortools/sat/samples/code_samples.bzl b/ortools/sat/samples/code_samples.bzl index 5629b3c152..a1b1d3ce3f 100644 --- a/ortools/sat/samples/code_samples.bzl +++ b/ortools/sat/samples/code_samples.bzl @@ -13,7 +13,7 @@ """Helper macro to compile and test code samples.""" -load("@io_bazel_rules_go//go:def.bzl", "go_test") +load("@rules_go//go:def.bzl", "go_test") load("@pip_deps//:requirements.bzl", "requirement") load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_test") load("@rules_java//java:defs.bzl", "java_test") diff --git a/ortools/scheduling/BUILD.bazel b/ortools/scheduling/BUILD.bazel index 4a3f0c93f0..4a3394ef61 100644 --- a/ortools/scheduling/BUILD.bazel +++ b/ortools/scheduling/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -22,7 +22,7 @@ proto_library( name = "jobshop_scheduling_proto", srcs = ["jobshop_scheduling.proto"], deps = [ - "@com_google_protobuf//:wrappers_proto", + "@protobuf//:wrappers_proto", ], ) @@ -41,7 +41,7 @@ cc_library( "//ortools/base:path", "//ortools/util:filelineiter", "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/ortools/service/v1/BUILD.bazel b/ortools/service/v1/BUILD.bazel index 018e3dbcd8..83bcc12f15 100644 --- a/ortools/service/v1/BUILD.bazel +++ b/ortools/service/v1/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") package(default_visibility = [ "//ortools/math_opt:__subpackages__", diff --git a/ortools/service/v1/mathopt/BUILD.bazel b/ortools/service/v1/mathopt/BUILD.bazel index 7498077bb2..9e685616b8 100644 --- a/ortools/service/v1/mathopt/BUILD.bazel +++ b/ortools/service/v1/mathopt/BUILD.bazel @@ -11,10 +11,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") package(default_visibility = [ "//ortools/math_opt:__subpackages__", @@ -68,7 +68,7 @@ proto_library( srcs = ["result.proto"], deps = [ ":solution_proto", - "@com_google_protobuf//:duration_proto", + "@protobuf//:duration_proto", ], ) @@ -134,7 +134,7 @@ py_proto_library( proto_library( name = "parameters_proto", srcs = ["parameters.proto"], - deps = ["@com_google_protobuf//:duration_proto"], + deps = ["@protobuf//:duration_proto"], ) proto_library( diff --git a/ortools/set_cover/BUILD.bazel b/ortools/set_cover/BUILD.bazel index b4a82fa92f..00386cafe3 100644 --- a/ortools/set_cover/BUILD.bazel +++ b/ortools/set_cover/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test") package(default_visibility = ["//visibility:public"]) @@ -59,7 +59,7 @@ cc_test( ":base_types", "//ortools/base:gmock_main", "@abseil-cpp//absl/types:span", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) @@ -241,7 +241,7 @@ cc_test( "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", "@abseil-cpp//absl/strings", - "@com_google_benchmark//:benchmark", + "@google_benchmark//:benchmark", ], ) diff --git a/ortools/util/BUILD.bazel b/ortools/util/BUILD.bazel index 2818939d83..43ecadd813 100644 --- a/ortools/util/BUILD.bazel +++ b/ortools/util/BUILD.bazel @@ -11,9 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") -load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library") -load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library") +load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library") +load("@protobuf//bazel:proto_library.bzl", "proto_library") +load("@protobuf//bazel:py_proto_library.bzl", "py_proto_library") load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) @@ -289,7 +289,7 @@ cc_library( # "//net/proto2/io/public:io", # "//net/proto2/public", # "//net/proto2/util/public:json", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -398,7 +398,7 @@ cc_library( "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", "@abseil-cpp//absl/strings:str_format", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) @@ -522,7 +522,7 @@ cc_library( hdrs = ["parse_proto.h"], deps = [ "@abseil-cpp//absl/strings", - "@com_google_protobuf//:protobuf", + "@protobuf//:protobuf", ], ) diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel index 6ca758d659..22f2795c84 100644 --- a/patches/BUILD.bazel +++ b/patches/BUILD.bazel @@ -12,9 +12,9 @@ # limitations under the License. exports_files([ - "abseil-cpp-20250127.1.patch", + "abseil-cpp-20250512.0.patch", "highs-v1.10.patch", - "protobuf-v30.2.patch", + "protobuf-v31.0.patch", "pybind11_bazel.patch", "pybind11_abseil.patch", "pybind11_protobuf.patch",