Update dependency versions, fixing build warnings.

world-federation-of-advertisers · Dec 12, 2024 · 7f751ef · 7f751ef
1 parent 6fd0b66
commit 7f751ef
Show file tree

Hide file tree

Showing 9 changed files with 4,590 additions and 2,016 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -13,9 +13,6 @@ build --repo_env='CC=clang'
 # Use C++17 language features.
 build --cxxopt='-std=c++17'
 
-# Target JDK11.
-build --java_runtime_version=remotejdk_11
-
 # Build with address sanitizer (ASAN).
 build:asan --strip=never
 build:asan --copt -fsanitize=address

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.0.1
+7.4.1
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -8,25 +8,26 @@ BORINGSSL_VERSION = "0.0.0-20230215-5c22014"
 # Bazel Central Registry modules.
 bazel_dep(
     name = "rules_cc",
-    version = "0.0.9",
+    version = "0.0.17",
 )
 bazel_dep(
-    name = "rules_proto",
-    version = "5.3.0-21.7",
+    name = "protobuf",
+    version = "27.3",
+    repo_name = "com_google_protobuf",
 )
 bazel_dep(
     name = "abseil-cpp",
-    version = "20230802.0.bcr.1",
+    version = "20240722.0.bcr.2",
     repo_name = "com_google_absl",
 )
 bazel_dep(
     name = "googletest",
-    version = "1.14.0",
+    version = "1.15.2",
     repo_name = "com_google_googletest",
 )
 bazel_dep(
     name = "glog",
-    version = "0.6.0",
+    version = "0.7.1",
     repo_name = "com_github_google_glog",
 )
 bazel_dep(

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/src/main/proto/wfa/any_sketch/BUILD.bazel b/src/main/proto/wfa/any_sketch/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/src/main/proto/wfa/any_sketch/crypto/BUILD.bazel b/src/main/proto/wfa/any_sketch/crypto/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/src/main/proto/wfa/frequency_count/BUILD.bazel b/src/main/proto/wfa/frequency_count/BUILD.bazel
@@ -1,5 +1,5 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -31,9 +31,6 @@ proto_library(
     name = "secret_share_methods_proto",
     srcs = ["secret_share_methods.proto"],
     strip_import_prefix = IMPORT_PREFIX,
-    deps = [
-        ":secret_share_proto",
-    ],
 )
 
 cc_proto_library(

diff --git a/src/main/proto/wfa/frequency_count/secret_share_methods.proto b/src/main/proto/wfa/frequency_count/secret_share_methods.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package wfa.frequency_count;
 
-import "wfa/frequency_count/secret_share.proto";
-
 option java_package = "org.wfanet.frequencycount";
 option java_multiple_files = true;
 

diff --git a/src/test/cc/any_sketch/crypto/BUILD.bazel b/src/test/cc/any_sketch/crypto/BUILD.bazel
@@ -9,6 +9,7 @@ cc_test(
         "//src/main/proto/wfa/any_sketch/crypto:sketch_encryption_methods_cc_proto",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
+        "@com_google_protobuf//:differencer",
         "@wfa_common_cpp//src/main/cc/common_cpp/testing:random",
         "@wfa_common_cpp//src/main/cc/common_cpp/testing:status",
     ],