Load java rules from rules_java.

Signed-off-by: Benjamin Peterson <benjamin@engflow.com>
EngFlow · Dec 5, 2024 · 0d673b0 · 0d673b0
1 parent e405d89
commit 0d673b0
Show file tree

Hide file tree

Showing 33 changed files with 64 additions and 4 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.2.1
+7.4.1
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -11,6 +11,7 @@ module(
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
 bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "rules_java", version = "8.6.1")
 bazel_dep(name = "rules_jvm_external", version = "6.2")
 bazel_dep(name = "rules_proto", version = "6.0.2")
 bazel_dep(name = "protobuf", version = "27.2")

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/bazelprofile/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/bazelprofile/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 TYPES = [
     "BazelProfileConstants.java",
     "BazelProfilePhase.java",

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/core/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/core/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "core",
     srcs = glob(["*.java"]),

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/dataproviders/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/dataproviders/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 TYPES = [
     "ActionStats.java",
     "BazelPhaseDescription.java",

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/dataproviders/remoteexecution/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/dataproviders/remoteexecution/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 TYPES = [
     "CriticalPathQueuingDuration.java",
     "QueuingObserved.java",

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "suggestionproviders",
     srcs = glob(["*.java"]),

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/time/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/time/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 package(default_visibility = ["//visibility:public"])
 
 java_library(

diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/traceeventformat/BUILD b/analyzer/java/com/engflow/bazel/invocation/analyzer/traceeventformat/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "traceeventformat",
     srcs = glob(["*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "test_base",
     testonly = True,
@@ -14,7 +16,7 @@ java_library(
         "//third_party/jsr305",
         "//third_party/junit",
         "//third_party/mockito",
-        "@bazel_tools//tools/java/runfiles",
+        "@rules_java//java/runfiles",
     ],
 )
 

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/bazelprofile/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/bazelprofile/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "bazelprofile",
     srcs = glob(["**/*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/core/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/core/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
 TYPES = [
     "TestDatum.java",
 ]

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/dataproviders/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/dataproviders/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
 java_test(
     name = "dataproviders",
     srcs = glob(

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/dataproviders/remoteexecution/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/dataproviders/remoteexecution/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "remoteexecution",
     srcs = glob(["**/*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/integrationtests/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/integrationtests/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "integrationtests",
     srcs = glob(["**/*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/suggestionproviders/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/suggestionproviders/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "suggestionproviders",
     srcs = glob(["**/*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/time/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/time/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "time",
     srcs = glob(["**/*.java"]),

diff --git a/analyzer/javatests/com/engflow/bazel/invocation/analyzer/traceeventformat/BUILD b/analyzer/javatests/com/engflow/bazel/invocation/analyzer/traceeventformat/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "traceeventformat",
     srcs = glob(["**/*.java"]),

diff --git a/cli/BUILD b/cli/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary")
+
 java_binary(
     name = "cli",
     main_class = "com.engflow.bazel.invocation.analyzer.Main",

diff --git a/cli/java/com/engflow/bazel/invocation/analyzer/BUILD b/cli/java/com/engflow/bazel/invocation/analyzer/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "analyzer",
     srcs = glob(["*.java"]),

diff --git a/cli/java/com/engflow/bazel/invocation/analyzer/consoleoutput/BUILD b/cli/java/com/engflow/bazel/invocation/analyzer/consoleoutput/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "consoleoutput",
     srcs = glob(

diff --git a/cli/java/com/engflow/bazel/invocation/analyzer/options/BUILD b/cli/java/com/engflow/bazel/invocation/analyzer/options/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "options",
     srcs = glob(

diff --git a/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/BUILD b/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_test")
+
 java_test(
     name = "consoleoutput",
     srcs = glob(["*.java"]),

diff --git a/proto/BUILD b/proto/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(

diff --git a/third_party/buildifier/BUILD b/third_party/buildifier/BUILD
@@ -1,7 +1,7 @@
-package(default_visibility = ["//infra:__subpackages__"])
-
 load("@buildifier_prebuilt//:rules.bzl", "buildifier_binary")
 
+package(default_visibility = ["//infra:__subpackages__"])
+
 buildifier_binary(
     name = "buildifier",
     visibility = ["//visibility:public"],

diff --git a/third_party/commons-cli/BUILD b/third_party/commons-cli/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "commons_cli",
     visibility = ["//visibility:public"],

diff --git a/third_party/google-java-format/BUILD b/third_party/google-java-format/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary")
+
 package(default_visibility = ["//infra:__subpackages__"])
 
 java_binary(

diff --git a/third_party/gson/BUILD b/third_party/gson/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "gson",
     visibility = ["//visibility:public"],

diff --git a/third_party/guava/BUILD b/third_party/guava/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "guava",
     visibility = ["//visibility:public"],

diff --git a/third_party/jsr305/BUILD b/third_party/jsr305/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "jsr305",
     visibility = ["//visibility:public"],

diff --git a/third_party/junit/BUILD b/third_party/junit/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "junit",
     testonly = 1,

diff --git a/third_party/mockito/BUILD b/third_party/mockito/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "mockito",
     testonly = 1,

diff --git a/third_party/truth/BUILD b/third_party/truth/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
 java_library(
     name = "truth",
     testonly = 1,