Merge branch 'stable-2.15'
* stable-2.15:
bazlets: Replace native.git_repository with skylark rule
Format all Bazel build files with buildifier
Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
Update bazlets to latest stable-2.14 to build with 2.14.15 API
Update bazlets to latest stable-2.15 and build with released 2.15.4 API
Format all Bazel build files with buildifier
Update bazlets to latest stable-2.14 to build with 2.14.14 API
Update bazlets to latest stable-2.14 to build with 2.14.13 API
Change-Id: I1ed45509ea65a63575c00b50a3ede2a17241ea6c
diff --git a/BUILD b/BUILD
index 2bb92e7..a680446 100644
--- a/BUILD
+++ b/BUILD
@@ -1,10 +1,10 @@
load("//tools/bzl:junit.bzl", "junit_tests")
load(
"//tools/bzl:plugin.bzl",
- "gerrit_plugin",
"PLUGIN_DEPS",
"PLUGIN_DEPS_NEVERLINK",
"PLUGIN_TEST_DEPS",
+ "gerrit_plugin",
)
gerrit_plugin(
diff --git a/WORKSPACE b/WORKSPACE
index b820da4..4bba546 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -9,21 +9,21 @@
#Snapshot Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
- "gerrit_api_maven_local",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
# Load snapshot Plugin API
gerrit_api_maven_local()
# Release Plugin API
-# load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-# "gerrit_api",
-# )
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
# Load release Plugin API
-# gerrit_api()
+#gerrit_api()
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/bazlets.bzl b/bazlets.bzl
index e14e488..f089af4 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,17 +1,18 @@
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
NAME = "com_googlesource_gerrit_bazlets"
def load_bazlets(
- commit,
- local_path = None
- ):
- if not local_path:
- native.git_repository(
- name = NAME,
- remote = "https://gerrit.googlesource.com/bazlets",
- commit = commit,
- )
- else:
- native.local_repository(
- name = NAME,
- path = local_path,
- )
+ commit,
+ local_path = None):
+ if not local_path:
+ git_repository(
+ name = NAME,
+ remote = "https://gerrit.googlesource.com/bazlets",
+ commit = commit,
+ )
+ else:
+ native.local_repository(
+ name = NAME,
+ path = local_path,
+ )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 895cfc5..a839df4 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,14 +1,14 @@
load("//tools/bzl:maven_jar.bzl", "maven_jar")
def external_plugin_deps():
- maven_jar(
- name = 'javamelody-core',
- artifact = 'net.bull.javamelody:javamelody-core:1.74.0',
- sha1 = '208ab93932b32be209d264502ed153f18034500f',
- )
+ maven_jar(
+ name = "javamelody-core",
+ artifact = "net.bull.javamelody:javamelody-core:1.74.0",
+ sha1 = "208ab93932b32be209d264502ed153f18034500f",
+ )
- maven_jar(
- name = 'jrobin',
- artifact = 'org.jrobin:jrobin:1.5.9',
- sha1 = 'bd9a84484c67de930fa841f23cd6a93108b05cd0',
- )
+ maven_jar(
+ name = "jrobin",
+ artifact = "org.jrobin:jrobin:1.5.9",
+ sha1 = "bd9a84484c67de930fa841f23cd6a93108b05cd0",
+ )
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl
index dfcbe9c..d5764f7 100644
--- a/tools/bzl/classpath.bzl
+++ b/tools/bzl/classpath.bzl
@@ -1,2 +1,4 @@
-load("@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
- "classpath_collector")
+load(
+ "@com_googlesource_gerrit_bazlets//tools:classpath.bzl",
+ "classpath_collector",
+)
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 3e8b08f..d21bdf4 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,7 +1,7 @@
load(
"@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
- "gerrit_plugin",
"PLUGIN_DEPS",
"PLUGIN_DEPS_NEVERLINK",
"PLUGIN_TEST_DEPS",
+ "gerrit_plugin",
)