Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse2018-08-30 06:27:20 +0000
committerDavid Pursehouse2018-08-30 06:27:20 +0000
commit487571e604d726be7cf5eb00123a1764f44d16c9 (patch)
tree03f7bf96e21dae4b1334de9550433e07a3a65a11
parentee56e5fc042a903b03773608ede62731452420ca (diff)
downloadjgit-487571e604d726be7cf5eb00123a1764f44d16c9.tar.gz
jgit-487571e604d726be7cf5eb00123a1764f44d16c9.tar.xz
jgit-487571e604d726be7cf5eb00123a1764f44d16c9.zip
Bazel: Format all build files with buildifier 0.15.0
Change-Id: I8343b723da6e40d5ae7fc45c84f64c31276bd5dc Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
-rw-r--r--lib/BUILD6
-rw-r--r--org.eclipse.jgit.test/BUILD10
-rw-r--r--org.eclipse.jgit.test/tests.bzl80
-rw-r--r--tools/bazlets.bzl27
4 files changed, 61 insertions, 62 deletions
diff --git a/lib/BUILD b/lib/BUILD
index 827e6b6fc6..ffe66a3d89 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -115,9 +115,9 @@ java_library(
testonly = 1,
visibility = ["//visibility:public"],
exports = [
- "@junit//jar",
- "@hamcrest_core//jar",
- "@hamcrest_library//jar",
+ "@hamcrest_core//jar",
+ "@hamcrest_library//jar",
+ "@junit//jar",
],
)
diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD
index ae6f24223c..bbda838f00 100644
--- a/org.eclipse.jgit.test/BUILD
+++ b/org.eclipse.jgit.test/BUILD
@@ -33,7 +33,7 @@ DATA = [
tests(glob(
["tst/**/*.java"],
- exclude = HELPERS + DATA
+ exclude = HELPERS + DATA,
))
java_library(
@@ -54,8 +54,8 @@ java_import(
)
genrule2(
- name = 'tst_rsrc_jar',
- cmd = 'o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .',
- srcs = glob(['tst-rsrc/**']),
- outs = ['tst_rsrc.jar',],
+ name = "tst_rsrc_jar",
+ srcs = glob(["tst-rsrc/**"]),
+ outs = ["tst_rsrc.jar"],
+ cmd = "o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .",
)
diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index 9cadc7463a..8ae0065a4c 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -4,45 +4,45 @@ load(
)
def tests(tests):
- for src in tests:
- name = src[len('tst/'):len(src)-len('.java')].replace('/', '_')
- labels = []
- if name.startswith('org_eclipse_jgit_'):
- l = name[len('org.eclipse.jgit_'):]
- if l.startswith('internal_storage_'):
- l = l[len('internal.storage_'):]
- i = l.find('_')
- if i > 0:
- labels.append(l[:i])
- else:
- labels.append(i)
- if 'lib' not in labels:
- labels.append('lib')
+ for src in tests:
+ name = src[len("tst/"):len(src) - len(".java")].replace("/", "_")
+ labels = []
+ if name.startswith("org_eclipse_jgit_"):
+ l = name[len("org.eclipse.jgit_"):]
+ if l.startswith("internal_storage_"):
+ l = l[len("internal.storage_"):]
+ i = l.find("_")
+ if i > 0:
+ labels.append(l[:i])
+ else:
+ labels.append(i)
+ if "lib" not in labels:
+ labels.append("lib")
- additional_deps = []
- if src.endswith("RootLocaleTest.java"):
- additional_deps = [
- '//org.eclipse.jgit.pgm:pgm',
- '//org.eclipse.jgit.ui:ui',
- ]
- if src.endswith("WalkEncryptionTest.java"):
- additional_deps = [
- '//org.eclipse.jgit:insecure_cipher_factory',
- ]
+ additional_deps = []
+ if src.endswith("RootLocaleTest.java"):
+ additional_deps = [
+ "//org.eclipse.jgit.pgm:pgm",
+ "//org.eclipse.jgit.ui:ui",
+ ]
+ if src.endswith("WalkEncryptionTest.java"):
+ additional_deps = [
+ "//org.eclipse.jgit:insecure_cipher_factory",
+ ]
- junit_tests(
- name = name,
- tags = labels,
- srcs = [src],
- deps = additional_deps + [
- ':helpers',
- ':tst_rsrc',
- '//lib:javaewah',
- '//lib:junit',
- '//lib:slf4j-api',
- '//org.eclipse.jgit:jgit',
- '//org.eclipse.jgit.junit:junit',
- '//org.eclipse.jgit.lfs:jgit-lfs',
- ],
- jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
- )
+ junit_tests(
+ name = name,
+ tags = labels,
+ srcs = [src],
+ deps = additional_deps + [
+ ":helpers",
+ ":tst_rsrc",
+ "//lib:javaewah",
+ "//lib:junit",
+ "//lib:slf4j-api",
+ "//org.eclipse.jgit:jgit",
+ "//org.eclipse.jgit.junit:junit",
+ "//org.eclipse.jgit.lfs:jgit-lfs",
+ ],
+ jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
+ )
diff --git a/tools/bazlets.bzl b/tools/bazlets.bzl
index e14e488492..f97b72c828 100644
--- a/tools/bazlets.bzl
+++ b/tools/bazlets.bzl
@@ -1,17 +1,16 @@
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:
+ native.git_repository(
+ name = NAME,
+ remote = "https://gerrit.googlesource.com/bazlets",
+ commit = commit,
+ )
+ else:
+ native.local_repository(
+ name = NAME,
+ path = local_path,
+ )

Back to the top