Skip to content

Commit dbf78f7

Browse files
lperronlperron
committed
bump all bazel modules; bump go deps; use py_proto_library from protobuf
1 parent 7fe44a2 commit dbf78f7

File tree

18 files changed

+35
-33
lines changed

18 files changed

+35
-33
lines changed

‎MODULE.bazel

+16-16
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@ module(
1313
)
1414

1515
# see https://registry.bazel.build/
16-
bazel_dep(name = "abseil-cpp", version = "20240722.0.bcr.2", repo_name = "com_google_absl")
16+
bazel_dep(name = "abseil-cpp", version = "20250127.0", repo_name = "com_google_absl")
1717
bazel_dep(name = "bazel_skylib", version = "1.7.1")
18-
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
19-
bazel_dep(name = "eigen", version = "3.4.0.bcr.2")
20-
bazel_dep(name = "fuzztest", version = "20241028.0", repo_name = "com_google_fuzztest")
21-
bazel_dep(name = "gazelle", version = "0.39.1", repo_name = "bazel_gazelle")
22-
bazel_dep(name = "glpk", version = "5.0.bcr.2")
23-
bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_benchmark")
24-
bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
18+
bazel_dep(name = "contrib_rules_jvm", version = "0.28.0")
19+
bazel_dep(name = "eigen", version = "4.0.0-20241125.bcr.1")
20+
bazel_dep(name = "fuzztest", version = "20250214.0", repo_name = "com_google_fuzztest")
21+
bazel_dep(name = "gazelle", version = "0.42.0", repo_name = "bazel_gazelle")
22+
bazel_dep(name = "glpk", version = "5.0.bcr.3")
23+
bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_google_benchmark")
24+
bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
2525
bazel_dep(name = "highs", version = "1.9.0")
26-
bazel_dep(name = "platforms", version = "0.0.10")
26+
bazel_dep(name = "platforms", version = "0.0.11")
2727
bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "pybind11_abseil", version = "202402.0")
2929
bazel_dep(name = "pybind11_bazel", version = "2.13.6")
3030
bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
31-
bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_google_re2")
31+
bazel_dep(name = "re2", version = "2024-07-02.bcr.1", repo_name = "com_google_re2")
3232
bazel_dep(name = "rules_cc", version = "0.1.1")
33-
bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")
34-
bazel_dep(name = "rules_java", version = "8.6.3")
35-
bazel_dep(name = "rules_jvm_external", version = "6.6")
33+
bazel_dep(name = "rules_go", version = "0.53.0", repo_name = "io_bazel_rules_go")
34+
bazel_dep(name = "rules_java", version = "8.9.0")
35+
bazel_dep(name = "rules_jvm_external", version = "6.7")
3636
bazel_dep(name = "rules_license", version = "1.0.0")
3737
bazel_dep(name = "rules_proto", version = "7.1.0")
38-
bazel_dep(name = "rules_python", version = "1.0.0")
39-
bazel_dep(name = "scip", version = "9.2.0.bcr.3")
38+
bazel_dep(name = "rules_python", version = "1.2.0")
39+
bazel_dep(name = "scip", version = "9.2.1")
4040
bazel_dep(name = "swig", version = "4.3.0")
41-
bazel_dep(name = "zlib", version = "1.3.1.bcr.4")
41+
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
4242

4343
git_override(
4444
module_name = "pybind11_abseil",

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/google/or-tools
33
go 1.22.2
44

55
require (
6-
github.com/golang/glog v1.2.2
7-
google.golang.org/protobuf v1.34.2
6+
github.com/golang/glog v1.2.2
7+
google.golang.org/protobuf v1.36.5
88
)

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
44
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
55
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
66
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
7+
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
8+
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

‎ortools/bop/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

‎ortools/constraint_solver/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1717
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
1818
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
19+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1920
load("@rules_cc//cc:defs.bzl", "cc_library")
2021
load("@rules_python//python:defs.bzl", "py_library")
21-
load("@rules_python//python:proto.bzl", "py_proto_library")
2222

2323
package(default_visibility = ["//visibility:public"])
2424

‎ortools/glop/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(
2020
default_visibility = ["//visibility:public"],

‎ortools/gscip/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(
2020
default_visibility = ["//visibility:public"],

‎ortools/linear_solver/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
1515
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
1616
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1717
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
18+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1819
load("@rules_cc//cc:defs.bzl", "cc_library")
19-
load("@rules_python//python:proto.bzl", "py_proto_library")
2020

2121
package(default_visibility = ["//visibility:public"])
2222

‎ortools/math_opt/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16-
load("@rules_python//python:proto.bzl", "py_proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1717

1818
package(default_visibility = ["//visibility:public"])
1919

‎ortools/math_opt/solvers/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16-
load("@rules_python//python:proto.bzl", "py_proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1717

1818
package(default_visibility = ["//ortools/math_opt:__subpackages__"])
1919

‎ortools/pdlp/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

‎ortools/routing/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
1616
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
17+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1718
load("@rules_cc//cc:defs.bzl", "cc_library")
18-
load("@rules_python//python:proto.bzl", "py_proto_library")
1919

2020
package(default_visibility = ["//visibility:public"])
2121

‎ortools/sat/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1717
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
1818
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
19+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1920
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
2021
load("@rules_cc//cc:defs.bzl", "cc_library")
21-
load("@rules_python//python:proto.bzl", "py_proto_library")
2222

2323
package(default_visibility = ["//visibility:public"])
2424

‎ortools/scheduling/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

‎ortools/service/v1/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16-
load("@rules_python//python:proto.bzl", "py_proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1717

1818
package(default_visibility = [
1919
"//ortools/math_opt:__subpackages__",

‎ortools/service/v1/mathopt/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
1616
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
17+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1818

1919
package(default_visibility = [
2020
"//ortools/math_opt:__subpackages__",

‎ortools/set_cover/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

‎ortools/util/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
1515
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
16+
load("@com_google_protobuf//bazel:py_proto_library.bzl", "py_proto_library")
1617
load("@rules_cc//cc:defs.bzl", "cc_library")
17-
load("@rules_python//python:proto.bzl", "py_proto_library")
1818

1919
package(default_visibility = ["//visibility:public"])
2020

0 commit comments

Comments
 (0)