From 85cea8c583ea08dab8cf8de2daafcb4ba9629ae5 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Thu, 5 Sep 2019 09:46:59 +0900 Subject: Bazel: Add fixes for --incompatible_load_java_rules_from_bzl Change-Id: I24746335db132bf20f400cb3db400737596d4542 Signed-off-by: David Pursehouse --- org.eclipse.jgit.test/BUILD | 1 + 1 file changed, 1 insertion(+) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 89bc90f384..da88862bfa 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -1,3 +1,4 @@ +load("@rules_java//java:defs.bzl", "java_import", "java_library") load(":tests.bzl", "tests") load( "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl", -- cgit v1.2.3 From 1fd09a19a2ac7d8953ea0abed81d906aef197bab Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Sun, 8 Sep 2019 10:09:07 +0900 Subject: Bazel: Format BUILD files with buildifier Change-Id: I8b4abf67fba592be42b2b5b029fa0e972d746dcb Signed-off-by: David Pursehouse --- lib/BUILD | 2 +- org.eclipse.jgit.test/BUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'org.eclipse.jgit.test') diff --git a/lib/BUILD b/lib/BUILD index a4b449185b..7403ce27ff 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -179,8 +179,8 @@ java_library( testonly = 1, visibility = ["//visibility:public"], exports = [ - "@bytebuddy//jar", "@bytebuddy-agent//jar", + "@bytebuddy//jar", "@mockito//jar", "@objenesis//jar", ], diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 708dd7d19a..1f33fa3d7d 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -50,8 +50,8 @@ java_library( deps = [ "//lib:jsch", "//lib:junit", - "//lib:slf4j-simple", "//lib:mockito", + "//lib:slf4j-simple", "//org.eclipse.jgit:jgit", "//org.eclipse.jgit.junit:junit", ], -- cgit v1.2.3 From 22973d13ea4eaef390a9ce00d448317808e07ced Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 8 Sep 2019 14:59:29 +0200 Subject: Format BUILD files with buildifier Using buildifier from master branch and the command: $ buildifier -r -lint fix -warnings all . Change-Id: I52a18c09a1f192e2141f4156f9c1aabbbdbc910a Signed-off-by: Matthias Sohn --- org.eclipse.jgit.http.test/BUILD | 2 +- org.eclipse.jgit.lfs.server.test/BUILD | 2 +- org.eclipse.jgit.lfs.test/BUILD | 3 +-- org.eclipse.jgit.pgm.test/BUILD | 2 +- org.eclipse.jgit.test/BUILD | 2 +- tools/BUILD | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) (limited to 'org.eclipse.jgit.test') diff --git a/org.eclipse.jgit.http.test/BUILD b/org.eclipse.jgit.http.test/BUILD index 95ed575784..09316adc6f 100644 --- a/org.eclipse.jgit.http.test/BUILD +++ b/org.eclipse.jgit.http.test/BUILD @@ -1,8 +1,8 @@ -load("@rules_java//java:defs.bzl", "java_library") load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") junit_tests( name = "http", diff --git a/org.eclipse.jgit.lfs.server.test/BUILD b/org.eclipse.jgit.lfs.server.test/BUILD index 9460f6f9d1..76a0870a88 100644 --- a/org.eclipse.jgit.lfs.server.test/BUILD +++ b/org.eclipse.jgit.lfs.server.test/BUILD @@ -1,8 +1,8 @@ -load("@rules_java//java:defs.bzl", "java_library") load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") TEST_BASE = ["tst/org/eclipse/jgit/lfs/server/fs/LfsServerTest.java"] diff --git a/org.eclipse.jgit.lfs.test/BUILD b/org.eclipse.jgit.lfs.test/BUILD index 3dfda86058..ee2402aee0 100644 --- a/org.eclipse.jgit.lfs.test/BUILD +++ b/org.eclipse.jgit.lfs.test/BUILD @@ -1,9 +1,8 @@ -load("@rules_java//java:defs.bzl", "java_library") - load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) diff --git a/org.eclipse.jgit.pgm.test/BUILD b/org.eclipse.jgit.pgm.test/BUILD index 5ccd457089..86413b5ff8 100644 --- a/org.eclipse.jgit.pgm.test/BUILD +++ b/org.eclipse.jgit.pgm.test/BUILD @@ -1,8 +1,8 @@ -load("@rules_java//java:defs.bzl", "java_library") load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +load("@rules_java//java:defs.bzl", "java_library") junit_tests( name = "pgm", diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index ebc9bc3439..28584272b9 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -1,8 +1,8 @@ -load("@rules_java//java:defs.bzl", "java_import", "java_library") load( "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl", "genrule2", ) +load("@rules_java//java:defs.bzl", "java_import", "java_library") load(":tests.bzl", "tests") PKG = "tst/org/eclipse/jgit/" diff --git a/tools/BUILD b/tools/BUILD index f6f29ba5b6..6741d23397 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -1,9 +1,9 @@ -load("@rules_java//java:defs.bzl", "java_package_configuration") load( "@bazel_tools//tools/jdk:default_java_toolchain.bzl", "JDK9_JVM_OPTS", "default_java_toolchain", ) +load("@rules_java//java:defs.bzl", "java_package_configuration") default_java_toolchain( name = "error_prone_warnings_toolchain", -- cgit v1.2.3