Remove deprecated WORKSPACE and update dependencies

PiperOrigin-RevId: 711808404
google · Jan 3, 2025 · c662ca9 · c662ca9
1 parent 7e5c87a
commit c662ca9
Show file tree

Hide file tree

Showing 11 changed files with 3,848 additions and 124 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1 +1 @@
-build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --java_runtime_version=21
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -9,61 +9,109 @@ module(
 
 bazel_dep(
     name = "rules_license",
-    version = "0.0.7",
+    version = "1.0.0",
 )
-
 bazel_dep(
     name = "rules_proto",
-    version = "6.0.0-rc2",
+    version = "7.1.0",
 )
-
 bazel_dep(
     name = "rules_go",
     version = "0.46.0",
     repo_name = "io_bazel_rules_go",
 )
-
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.9",
+    version = "0.1.0",
 )
-
 bazel_dep(
     name = "protobuf",
-    version = "27.0",
+    version = "29.1",
     repo_name = "com_google_protobuf",
 )
-
 bazel_dep(
     name = "abseil-cpp",
-    version = "20230802.1",
+    version = "20240722.0",
+    repo_name = "com_google_absl",
 )
-
 bazel_dep(
     name = "boringssl",
-    version = "0.0.0-20240126-22d349c",
+    version = "0.20240930.0",
 )
-
 bazel_dep(
     name = "googletest",
-    version = "1.14.0",
+    version = "1.15.2",
     repo_name = "com_github_google_googletest",
 )
-
 bazel_dep(
     name = "google_benchmark",
     version = "1.8.3",
     repo_name = "com_github_google_benchmark",
 )
-
 bazel_dep(
     name = "gflags",
     version = "2.2.2",
     repo_name = "com_github_gflags_gflags",
 )
-
 bazel_dep(
     name = "glog",
     version = "0.7.0",
     repo_name = "com_github_google_glog",
 )
+bazel_dep(
+    name = "rapidjson",
+    version = "1.1.0.bcr.20241007",
+)
+bazel_dep(
+    name = "tink_cc",
+    version = "2.3.0",
+)
+bazel_dep(
+    name = "cppitertools",
+    version = "2.1",
+)
+bazel_dep(
+    name = "riegeli",
+    version = "0.0.0-20240927-cdfb25a",
+)
+bazel_dep(
+    name = "highway",
+    version = "1.2.0",
+)
+
+http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+# IREE for cc_embed_data.
+# https://github.com/google/iree
+http_archive(
+    name = "com_github_google_iree",
+    sha256 = "aa369b29a5c45ae9d7aa8bf49ea1308221d1711277222f0755df6e0a575f6879",
+    strip_prefix = "iree-7e6012468cbaafaaf30302748a2943771b40e2c3",
+    urls = [
+        "https://github.com/google/iree/archive/7e6012468cbaafaaf30302748a2943771b40e2c3.zip",
+    ],
+)
+
+# Farmhash.
+# https://github.com/google/farmhash
+http_archive(
+    name = "com_github_google_farmhash",
+    add_prefix = "farmhash",
+    build_file = "@//:bazel/farmhash.BUILD",
+    sha256 = "470e87745d1393cc2793f49e9bfbd2c2cf282feeeb0c367f697996fa7e664fc5",
+    strip_prefix = "farmhash-0d859a811870d10f53a594927d0d0b97573ad06d/src",
+    urls = [
+        "https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.zip",
+    ],
+)
+
+# SHELL for uint256.
+# https://github.com/google/shell-encryption
+http_archive(
+    name = "com_github_google_shell-encryption",
+    sha256 = "e4db301b036879fe422da7b5f0f6c6bdc5b15c5cec2a3817c2561ddc2cfa1046",
+    strip_prefix = "shell-encryption-b381c4ef6b6c3c11f9da3a39c75f0cb835ee296a",
+    urls = [
+        "https://github.com/google/shell-encryption/archive/b381c4ef6b6c3c11f9da3a39c75f0cb835ee296a.zip",
+    ],
+)
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
diff --git a/dcf/BUILD b/dcf/BUILD
@@ -33,13 +33,13 @@ cc_library(
         "//dpf:distributed_point_function_cc_proto",
         "//dpf:status_macros",
         "//dpf/internal:maybe_deref_span",
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/meta:type_traits",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/types:span",
+        "@highway//:hwy",
     ],
 )
 

diff --git a/dpf/BUILD b/dpf/BUILD
@@ -84,7 +84,6 @@ cc_library(
         "//dpf/internal:proto_validator",
         "//dpf/internal:value_type_helpers",
         "@boringssl//:crypto",
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:inlined_vector",
@@ -100,6 +99,7 @@ cc_library(
         "@com_google_absl//absl/types:span",
         "@com_google_protobuf//:protobuf",
         "@com_google_protobuf//:protobuf_lite",
+        "@highway//:hwy",
     ],
 )
 
@@ -154,7 +154,6 @@ cc_test(
         ":distributed_point_function",
         "@com_github_google_benchmark//:benchmark",
         "@com_github_google_googletest//:gtest_main",
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/numeric:int128",
@@ -165,6 +164,7 @@ cc_test(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
         "@com_google_protobuf//:protobuf",
+        "@highway//:hwy",
     ],
 )
 
@@ -182,6 +182,7 @@ cc_library(
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
     ],
 )

diff --git a/dpf/aes_128_fixed_key_hash.cc b/dpf/aes_128_fixed_key_hash.cc
@@ -26,6 +26,7 @@
 #include "absl/numeric/int128.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
 #include "absl/types/span.h"
 #include "openssl/err.h"
 

diff --git a/dpf/internal/BUILD b/dpf/internal/BUILD
@@ -145,14 +145,14 @@ cc_library(
         "//dpf:aes_128_fixed_key_hash",
         "//dpf:status_macros",
         "@boringssl//:crypto",
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/base:config",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:inlined_vector",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/types:span",
+        "@highway//:hwy",
     ],
 )
 
@@ -166,11 +166,11 @@ cc_test(
         ":status_matchers",
         "//dpf:aes_128_fixed_key_hash",
         "@com_github_google_googletest//:gtest_main",
-        "@com_github_google_highway//:hwy",
-        "@com_github_google_highway//:hwy_test_util",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
+        "@highway//:hwy",
+        "@highway//:hwy_test_util",
     ],
 )
 
@@ -179,8 +179,8 @@ cc_library(
     srcs = ["get_hwy_mode.cc"],
     hdrs = ["get_hwy_mode.h"],
     deps = [
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/strings",
+        "@highway//:hwy",
     ],
 )
 
@@ -190,8 +190,8 @@ cc_library(
         "aes_128_fixed_key_hash_hwy.h",
     ],
     deps = [
-        "@com_github_google_highway//:hwy",
         "@com_google_absl//absl/numeric:int128",
+        "@highway//:hwy",
     ],
 )
 
@@ -217,14 +217,14 @@ cc_test(
         "//dpf:aes_128_fixed_key_hash",
         "@boringssl//:crypto",
         "@com_github_google_googletest//:gtest_main",
-        "@com_github_google_highway//:hwy",
-        "@com_github_google_highway//:hwy_test_util",
         "@com_google_absl//absl/flags:parse",
         "@com_google_absl//absl/log:absl_log",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/types:span",
+        "@highway//:hwy",
+        "@highway//:hwy_test_util",
     ],
 )
 

diff --git a/experiments/BUILD b/experiments/BUILD
@@ -27,9 +27,6 @@ cc_binary(
         "//dpf:distributed_point_function",
         "//dpf:distributed_point_function_cc_proto",
         "@com_github_google_benchmark//:benchmark",
-        "@com_github_google_riegeli//riegeli/bytes:fd_reader",
-        "@com_github_google_riegeli//riegeli/lines:line_reading",
-        "@com_github_ryanhaining_cppitertools//cppitertools",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
@@ -41,5 +38,8 @@ cc_binary(
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:span",
+        "@cppitertools",
+        "@riegeli//riegeli/bytes:fd_reader",
+        "@riegeli//riegeli/lines:line_reading",
     ],
 )
diff --git a/experiments/synthetic_data_benchmarks.cc b/experiments/synthetic_data_benchmarks.cc
@@ -36,9 +36,9 @@
 #include "absl/time/time.h"
 #include "absl/types/span.h"
 #include "benchmark/benchmark.h"  // third_party/benchmark
-#include "cppitertools/imap.hpp"
 #include "dpf/distributed_point_function.h"
 #include "dpf/distributed_point_function.pb.h"
+#include "imap.hpp"  // cppitertools
 #include "riegeli/bytes/fd_reader.h"
 #include "riegeli/lines/line_reading.h"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
		build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --java_runtime_version=21