Merge branch 'stable-2.16'
* stable-2.16:
Add Eclipse project generation
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Make transitive starlark loads explicit
Change-Id: Ic6b546ae27c6baa4933067c56acdc890468cd7ae
diff --git a/BUILD b/BUILD
index af8b40f..e1a13dd 100644
--- a/BUILD
+++ b/BUILD
@@ -27,7 +27,16 @@
srcs = ["src/test/java/com/googlesource/gerrit/plugins/verifystatus/VerifyStatusIT.java"],
tags = ["verify-status"],
test_class = "com.googlesource.gerrit.plugins.verifystatus.VerifyStatusIT",
- deps = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
+ deps = [
+ ":verify-status__plugin_test_deps",
+ ],
+)
+
+java_library(
+ name = "verify-status__plugin_test_deps",
+ testonly = 1,
+ visibility = ["//visibility:public"],
+ exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":verify-status__plugin",
],
)
diff --git a/WORKSPACE b/WORKSPACE
index c9ebced..9957123 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "a5525ae2c43e61cf113dacc03691cb2bcf44fb12",
+ commit = "d100b6aad6b37e7db8fa141020c882dc97fb7723",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
new file mode 100644
index 0000000..c921d01
--- /dev/null
+++ b/tools/bzl/classpath.bzl
@@ -0,0 +1,6 @@
+load(
+ "@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
+ _classpath_collector = "classpath_collector",
+)
+
+classpath_collector = _classpath_collector
diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl
index 3af7e58..97307bd 100644
--- a/tools/bzl/junit.bzl
+++ b/tools/bzl/junit.bzl
@@ -1,4 +1,6 @@
load(
"@com_googlesource_gerrit_bazlets//tools:junit.bzl",
- "junit_tests",
+ _junit_tests = "junit_tests",
)
+
+junit_tests = _junit_tests
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 0b25d23..ea73147 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,12 @@
load(
"@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
- "PLUGIN_DEPS",
- "PLUGIN_TEST_DEPS",
- "gerrit_plugin",
+ _gerrit_plugin = "gerrit_plugin",
+ _gwt_plugin_deps = "GWT_PLUGIN_DEPS",
+ _plugin_deps = "PLUGIN_DEPS",
+ _plugin_test_deps = "PLUGIN_TEST_DEPS",
)
+
+gerrit_plugin = _gerrit_plugin
+GWT_PLUGIN_DEPS = _gwt_plugin_deps
+PLUGIN_DEPS = _plugin_deps
+PLUGIN_TEST_DEPS = _plugin_test_deps
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
new file mode 100644
index 0000000..75d59dd
--- /dev/null
+++ b/tools/eclipse/BUILD
@@ -0,0 +1,15 @@
+load("//tools/bzl:classpath.bzl", "classpath_collector")
+load(
+ "//tools/bzl:plugin.bzl",
+ "GWT_PLUGIN_DEPS",
+)
+
+classpath_collector(
+ name = "main_classpath_collect",
+ testonly = 1,
+ deps = GWT_PLUGIN_DEPS + [
+ "//external:gwt-dev",
+ "//external:gwt-user",
+ "//:verify-status__plugin_test_deps",
+ ],
+)
diff --git a/tools/eclipse/project.sh b/tools/eclipse/project.sh
new file mode 100755
index 0000000..6883319
--- /dev/null
+++ b/tools/eclipse/project.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+`bazel query @com_googlesource_gerrit_bazlets//tools/eclipse:project --output location | sed s/BUILD:.*//`project.py -n verify-status -r .
