Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Change-Id: Ibd5217954fe8c09092ab09173910c41fb4886aa6
diff --git a/gerrit_plugin.bzl b/gerrit_plugin.bzl
index 6ef51c7..dd7b4a8 100644
--- a/gerrit_plugin.bzl
+++ b/gerrit_plugin.bzl
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
load(
"//tools:commons.bzl",
_plugin_deps = "PLUGIN_DEPS",
@@ -39,8 +40,7 @@
if gwt_module:
static_jars = [":%s-static" % name]
gwt_deps = GWT_PLUGIN_DEPS_NEVERLINK
-
- native.java_library(
+ java_library(
name = name + "__plugin",
srcs = srcs,
resources = resources,
@@ -48,8 +48,7 @@
visibility = ["//visibility:public"],
**kwargs
)
-
- native.java_binary(
+ java_binary(
name = "%s__non_stamped" % name,
deploy_manifest_lines = manifest_entries + ["Gerrit-ApiType: plugin"],
main_class = "Dummy",
@@ -60,7 +59,7 @@
)
if gwt_module:
- native.java_library(
+ java_library(
name = name + "__gwt_module",
resources = depset(srcs + resources).to_list(),
runtime_deps = deps + GWT_PLUGIN_DEPS,
diff --git a/lib/prolog/BUILD b/lib/prolog/BUILD
index 8f78045..0d6af48 100644
--- a/lib/prolog/BUILD
+++ b/lib/prolog/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary", "java_library")
+
java_binary(
name = "compiler-bin",
main_class = "PrologCompiler",
diff --git a/lib/prolog/prolog.bzl b/lib/prolog/prolog.bzl
index 5d9d3f3..26d54f4 100644
--- a/lib/prolog/prolog.bzl
+++ b/lib/prolog/prolog.bzl
@@ -12,6 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+load("@rules_java//java:defs.bzl", "java_library")
+
def prolog_cafe_library(
name,
srcs,
@@ -26,7 +28,7 @@
tools = ["@com_googlesource_gerrit_bazlets//lib/prolog:compiler-bin"],
outs = [name + ".srcjar"],
)
- native.java_library(
+ java_library(
name = name,
srcs = [":" + name + "__pl2j"],
deps = ["@prolog-runtime//jar:neverlink"] + deps,
diff --git a/tools/java.bzl b/tools/java.bzl
index 7c41fbe..8996b69 100644
--- a/tools/java.bzl
+++ b/tools/java.bzl
@@ -15,11 +15,13 @@
# Syntactic sugar for native java_library() rule:
# accept exported_deps attributes
+load("@rules_java//java:defs.bzl", "java_library")
+
def java_library2(deps = [], exported_deps = [], exports = [], **kwargs):
if exported_deps:
deps = deps + exported_deps
exports = exports + exported_deps
- native.java_library(
+ java_library(
deps = deps,
exports = exports,
**kwargs
diff --git a/tools/junit.bzl b/tools/junit.bzl
index b4cd558..58869ff 100644
--- a/tools/junit.bzl
+++ b/tools/junit.bzl
@@ -18,6 +18,8 @@
# See https://github.com/bazelbuild/bazel/issues/1017 for background.
+load("@rules_java//java:defs.bzl", "java_test")
+
_OUTPUT = """import org.junit.runners.Suite;
import org.junit.runner.RunWith;
@@ -71,7 +73,7 @@
srcs = srcs,
outname = s_name,
)
- native.java_test(
+ java_test(
name = name,
test_class = s_name,
srcs = srcs + [":" + s_name],
