commit eb169469ad8f6e90cb61902c8cdc9aaa961f68b1
author David Pursehouse <dpursehouse@collab.net> Mon May 20 12:57:46 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon May 20 15:04:20 2019 +0900
tree ef1db8b73da6b80d9bd4ed520d2c246add034393
parent 3d993c4031aea6912d161b57037016afe66b3a1e

Make transitive starlark loads explicit

This fixes the build with bazel 0.25.

Bug: Issue 10855
Change-Id: I1e56f8f3127edaf7b20be8242df92537d2c185d3

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 16952c2..b14c61b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "39310fb43f4eaaad2e338b3bcbf393a2f4e11293",
+    commit = "62c3c8e0b4b767d1f3b78998ad1aba42a44a9661",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

tools/bzl/classpath.bzl

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

tools/bzl/plugin.bzl

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index a280a0f..9568c84 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,10 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "GWT_PLUGIN_DEPS",
-    "PLUGIN_DEPS",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _gwt_plugin_deps = "GWT_PLUGIN_DEPS",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+GWT_PLUGIN_DEPS = _gwt_plugin_deps
+PLUGIN_DEPS = _plugin_deps