Skip to content

Commit dd147c1

Browse files
committed
Format build files using buildifier
Release-Notes: skip Change-Id: I67afcff877e2f14574c15e7d60d7bf2a70c59d1e
1 parent ac53f6e commit dd147c1

2 files changed

Lines changed: 26 additions & 9 deletions

File tree

BUILD

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1+
load("@rules_antlr//antlr:antlr4.bzl", "antlr")
2+
load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
3+
load("//tools/bzl:js.bzl", "gerrit_js_bundle")
4+
load("//tools/bzl:junit.bzl", "junit_tests")
15
load(
26
"//tools/bzl:plugin.bzl",
37
"PLUGIN_DEPS",
48
"PLUGIN_TEST_DEPS",
59
"gerrit_plugin",
610
)
7-
load("//tools/bzl:js.bzl", "gerrit_js_bundle")
811
load("//tools/js:eslint.bzl", "eslint")
9-
load("//tools/bzl:junit.bzl", "junit_tests")
10-
load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
11-
load("@rules_antlr//antlr:antlr4.bzl", "antlr")
1212

1313
plugin_name = "task"
14+
1415
test_factory_provider_plugin_name = "names-factory-provider"
1516

1617
java_plugin(
@@ -47,6 +48,12 @@ java_library(
4748
gerrit_plugin(
4849
name = plugin_name,
4950
srcs = glob(["src/main/java/**/*.java"]),
51+
javacopts = [
52+
"-Werror",
53+
"-Xlint:all",
54+
"-Xlint:-classfile",
55+
"-Xlint:-processing",
56+
],
5057
manifest_entries = [
5158
"Gerrit-PluginName: " + plugin_name,
5259
"Implementation-Title: Task Plugin",
@@ -60,7 +67,6 @@ gerrit_plugin(
6067
":task_reference_parser",
6168
"@antlr4_runtime//jar",
6269
],
63-
javacopts = [ "-Werror", "-Xlint:all", "-Xlint:-classfile", "-Xlint:-processing"],
6470
)
6571

6672
gerrit_js_bundle(
@@ -78,8 +84,8 @@ junit_tests(
7884

7985
gerrit_plugin(
8086
name = test_factory_provider_plugin_name,
81-
dir_name = plugin_name,
8287
srcs = ["src/main/java/com/googlesource/gerrit/plugins/task/extensions/PluginProvidedTaskNamesFactory.java"] + glob(["src/test/java/**/names_factory_provider/*.java"]),
88+
dir_name = plugin_name,
8389
manifest_entries = [
8490
"Gerrit-PluginName: " + test_factory_provider_plugin_name,
8591
"Gerrit-Module: com.googlesource.gerrit.plugins.names_factory_provider.Module",
@@ -91,8 +97,19 @@ sh_test(
9197
name = "docker-tests",
9298
size = "medium",
9399
srcs = ["test/docker/run.sh"],
94-
args = ["--gerrit-war", "$(location //:gerrit.war)", "--task-plugin-jar", "$(location :task)", "--names-factory-provider-plugin-jar", "$(location :names-factory-provider)"],
95-
data = ["//:gerrit.war", plugin_name, test_factory_provider_plugin_name] + glob(["test/**"]) + glob(["src/main/resources/Documentation/*"]),
100+
args = [
101+
"--gerrit-war",
102+
"$(location //:gerrit.war)",
103+
"--task-plugin-jar",
104+
"$(location :task)",
105+
"--names-factory-provider-plugin-jar",
106+
"$(location :names-factory-provider)",
107+
],
108+
data = [
109+
"//:gerrit.war",
110+
plugin_name,
111+
test_factory_provider_plugin_name,
112+
] + glob(["test/**"]) + glob(["src/main/resources/Documentation/*"]),
96113
local = True,
97114
tags = ["docker"],
98115
)

external_plugin_deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools/bzl:maven_jar.bzl", "maven_jar")
21
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
load("//tools/bzl:maven_jar.bzl", "maven_jar")
33

44
def external_plugin_deps():
55
AUTO_VALUE_VERSION = "1.7.4"

0 commit comments

Comments
 (0)