commit b17731d7f8af045abca96fdae55521ff8e130046
author David Pursehouse <dpursehouse@collab.net> Mon May 20 12:57:45 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon May 20 13:41:49 2019 +0900
tree 8350245baad79b37e0b7af7d551c920ccc44d866
parent 69792fdc988deebaf0617a4ae7c9ffe34fd2c53e

Make transitive starlark loads explicit

This fixes the build with bazel 0.25.

Bug: Issue 10855
Change-Id: I480b5a929a48ce327daf95d7f74e167e50aeed6d

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 58465e3..5317605 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",
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 443eb71..c07795a 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,4 +1,4 @@
-load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "maven_jar")
+load("//tools/bzl:maven_jar.bzl", "GERRIT", "maven_jar")
 
 COMMONMARK_VERSION = "0.6.0"
 

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/maven_jar.bzl

diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index 5b38026..528bffe 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -1 +1,10 @@
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "maven_jar")
+load(
+    "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
+    _gerrit = "GERRIT",
+    _maven_central = "MAVEN_CENTRAL",
+    _maven_jar = "maven_jar",
+)
+
+GERRIT = _gerrit
+MAVEN_CENTRAL = _maven_central
+maven_jar = _maven_jar

tools/bzl/plugin.bzl

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