Add missing java and shell load statements (#1318)

Bencodes · web-flow · commit 75db69a216ab · 2025-05-30T12:52:14.000-07:00
* Add missing java and shell load statements

* Remove the install.tools make command now that the build target exists

* And update .bazelci/presubmit.yml to use the latest

* Add missing rules_shell
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -13,7 +13,7 @@ matrix:
 validate_config: 1
 bazel: 7.3.0
 buildifier:
-  version: 7.1.1
+  version: 8.2.0
   # no lint warnings for the moment. They are basically a smoke alarm in hell.
   # keep this argument in sync with .pre-commit-config.yaml
   warnings: "-confusing-name,-constant-glob,-duplicated-name,-function-docstring,-function-docstring-args,-function-docstring-header,-module-docstring,-name-conventions,-no-effect,-constant-glob,-provider-params,-print,-rule-impl-return,-bzl-visibility,-unnamed-macro,-uninitialized,-unreachable"
diff --git a/BUILD b/BUILD
@@ -1,3 +1,4 @@
+load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 load("//kotlin:lint.bzl", "ktlint_config")
 
 # Copyright 2018 The Bazel Authors. All rights reserved.
@@ -81,3 +82,20 @@ filegroup(
     ],
     visibility = ["//:__subpackages__"],
 )
+
+buildifier(
+    name = "buildifier.check",
+    exclude_patterns = [
+        "./.git/*",
+    ],
+    lint_mode = "warn",
+    mode = "diff",
+)
+
+buildifier(
+    name = "buildifier.fix",
+    exclude_patterns = [
+        "./.git/*",
+    ],
+    lint_mode = "fix",
+)
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -15,6 +15,9 @@ bazel_dep(name = "rules_java", version = "8.9.0")
 bazel_dep(name = "rules_python", version = "0.23.1")
 bazel_dep(name = "rules_android", version = "0.6.4")
 bazel_dep(name = "bazel_features", version = "1.25.0")
+bazel_dep(name = "rules_shell", version = "0.4.1")
+
+bazel_dep(name = "buildifier_prebuilt", version = "8.0.3", dev_dependency = True)
 
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
diff --git a/Makefile b/Makefile
@@ -35,6 +35,3 @@ docs.regen:
 
 proto.regen:
 	scripts/gen_proto_jars
-
-install.tools:
-	go get github.com/bazelbuild/buildtools/buildifier
diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
+
 sh_test(
     name = "are_docs_up_to_date_test",
     srcs = ["are_docs_up_to_date_test.sh"],
diff --git a/examples/dagger/BUILD b/examples/dagger/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_binary.bzl", "java_binary")
+
 # Copyright 2018 The Bazel Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/examples/dagger/third_party/BUILD.bazel b/examples/dagger/third_party/BUILD.bazel
@@ -1,3 +1,6 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+load("@rules_java//java:java_plugin.bzl", "java_plugin")
+
 java_plugin(
     name = "dagger_component_plugin",
     generates_api = True,
diff --git a/examples/deps/libJava1/BUILD.bazel b/examples/deps/libJava1/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+
 java_library(
     name = "src_main",
     srcs = glob(["src/main/java/**/*.java"]),
diff --git a/examples/deps/libJava2/BUILD.bazel b/examples/deps/libJava2/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+
 java_library(
     name = "src_main",
     srcs = glob(["src/main/java/**/*.java"]),
diff --git a/examples/deps/libJava3/BUILD.bazel b/examples/deps/libJava3/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+
 java_library(
     name = "src_main",
     srcs = glob(["src/main/java/**/*.java"]),
diff --git a/examples/deps/libJava4/BUILD.bazel b/examples/deps/libJava4/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_library.bzl", "java_library")
+
 java_library(
     name = "src_main",
     srcs = glob(["src/main/java/**/*.java"]),
diff --git a/examples/trivial/BUILD b/examples/trivial/BUILD
@@ -1,5 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_library")
 load("@rules_kotlin//kotlin:lint.bzl", "ktlint_config")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/kotlin/internal/jvm/jvm.bzl b/kotlin/internal/jvm/jvm.bzl
@@ -93,6 +93,7 @@ kt_jvm_binary(
 """
 
 load("@rules_java//java:defs.bzl", "JavaInfo")
+load("@rules_java//java/common:java_plugin_info.bzl", "JavaPluginInfo")
 load(
     "//kotlin/internal:defs.bzl",
     "KtPluginConfiguration",
diff --git a/src/main/protobuf/BUILD b/src/main/protobuf/BUILD
@@ -1,5 +1,6 @@
 load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
 load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:java_library.bzl", "java_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/src/main/starlark/core/compile/cli/BUILD.bazel b/src/main/starlark/core/compile/cli/BUILD.bazel
@@ -1,3 +1,5 @@
+load("@rules_java//java:java_binary.bzl", "java_binary")
+load("@rules_java//java:java_import.bzl", "java_import")
 load("//kotlin/compiler:compiler.bzl", _KOTLIN_STDLIBS = "KOTLIN_STDLIBS")
 load("//src/main/starlark/core/compile:common.bzl", "TYPE")
 load("//src/main/starlark/core/repositories:versions.bzl", "versions")
diff --git a/src/main/starlark/core/compile/cli/toolchain.bzl b/src/main/starlark/core/compile/cli/toolchain.bzl
@@ -1,3 +1,5 @@
+load("@rules_java//java/common:java_common.bzl", "java_common")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("//src/main/starlark/core/compile:common.bzl", "JAVA_RUNTIME_TOOLCHAIN_TYPE", "JAVA_TOOLCHAIN_TYPE")
 load(":compile.bzl", "build_deploy_jar", "compile_kotlin_for_jvm", "write_jvm_launcher")
 
diff --git a/src/test/starlark/compile/cli/BUILD.bazel b/src/test/starlark/compile/cli/BUILD.bazel
@@ -1,4 +1,5 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
+load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("//src/main/starlark/core/compile:rules.bzl", "core_kt_jvm_binary")
 
 want = "Hello From Koltinc"
diff --git a/src/test/starlark/compile/rule_tests.bzl b/src/test/starlark/compile/rule_tests.bzl
@@ -1,3 +1,4 @@
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("//kotlin:jvm.bzl", "kt_jvm_library")
 load("//src/main/starlark/core/compile:common.bzl", "KtJvmInfo")
 load("//src/main/starlark/core/compile:rules.bzl", "core_kt_jvm_binary", "core_kt_jvm_library")
diff --git a/src/test/starlark/core/plugin/test.bzl b/src/test/starlark/core/plugin/test.bzl
@@ -1,3 +1,4 @@
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
 load("//kotlin:core.bzl", "kt_compiler_plugin", "kt_plugin_cfg")
 load("//kotlin:jvm.bzl", "kt_jvm_import", "kt_jvm_library")
diff --git a/src/test/starlark/internal/jvm/jvm_deps_tests.bzl b/src/test/starlark/internal/jvm/jvm_deps_tests.bzl
@@ -1,4 +1,5 @@
 load("@bazel_skylib//lib:structs.bzl", _structs = "structs")
+load("@rules_java//java/common:java_info.bzl", "JavaInfo")
 load("@rules_testing//lib:analysis_test.bzl", "analysis_test")
 load("@rules_testing//lib:test_suite.bzl", "test_suite")
 load("@rules_testing//lib:util.bzl", "util")

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_shell//shell:sh_test.bzl", "sh_test")`
	`2`	`+`
`1`	`3`	`sh_test(`
`2`	`4`	`name = "are_docs_up_to_date_test",`
`3`	`5`	`srcs = ["are_docs_up_to_date_test.sh"],`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_java//java:java_binary.bzl", "java_binary")`
	`2`	`+`
`1`	`3`	`# Copyright 2018 The Bazel Authors. All rights reserved.`
`2`	`4`	`#`
`3`	`5`	`# Licensed under the Apache License, Version 2.0 (the "License");`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+load("@rules_java//java:java_library.bzl", "java_library")`
	`2`	`+`
`1`	`3`	`java_library(`
`2`	`4`	`name = "src_main",`
`3`	`5`	`srcs = glob(["src/main/java/*/.java"]),`