Make transitive starlark loads explicit
This fixes the build with bazel 0.25.
Bug: Issue 10855
Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d
diff --git a/WORKSPACE b/WORKSPACE
index c434606..21ce476 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+ commit = "70d6ae0cee03c456fa4b32c807f3d13c032ef498",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index d5764f7..c921d01 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,4 +1,6 @@
load(
"@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
- "classpath_collector",
+ _classpath_collector = "classpath_collector",
)
+
+classpath_collector = _classpath_collector
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index 21fb670..fb20419 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -1 +1,12 @@
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar")
+load(
+ "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
+ _gerrit = "GERRIT",
+ _maven_central = "MAVEN_CENTRAL",
+ _maven_jar = "maven_jar",
+ _maven_local = "MAVEN_LOCAL",
+)
+
+GERRIT = _gerrit
+MAVEN_CENTRAL = _maven_central
+MAVEN_LOCAL = _maven_local
+maven_jar = _maven_jar
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index c157125..89a1643 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,5 +1,8 @@
load(
"@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
- "PLUGIN_DEPS",
- "gerrit_plugin",
+ _gerrit_plugin = "gerrit_plugin",
+ _plugin_deps = "PLUGIN_DEPS",
)
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps