From dd5e500a57fce994331dd9c9a03cb9577998a4a8 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Fri, 20 Jan 2017 13:03:03 +0900 Subject: [PATCH] Format Bazel files with buildifier Change-Id: I934114315d2c7cab917f1011b8e55c52367d429f Signed-off-by: David Pursehouse --- BUILD | 32 +++++----- WORKSPACE | 99 +++++++++++++++--------------- org.eclipse.jgit.archive/BUILD | 25 ++++---- org.eclipse.jgit.http.server/BUILD | 19 +++--- org.eclipse.jgit.junit/BUILD | 19 +++--- org.eclipse.jgit/BUILD | 42 +++++++------ 6 files changed, 123 insertions(+), 113 deletions(-) diff --git a/BUILD b/BUILD index 79c5e3f385..3d9389afc4 100644 --- a/BUILD +++ b/BUILD @@ -1,19 +1,19 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) genrule( - name = 'all', - srcs = [ - '//org.eclipse.jgit:jgit', - '//org.eclipse.jgit.archive:jgit-archive', - '//org.eclipse.jgit.http.server:jgit-servlet', - '//org.eclipse.jgit.junit:junit', - ], - cmd = ' && '.join([ - 'p=$$PWD', - 't=$$(mktemp -d || mktemp -d -t bazel-tmp)', - 'cp $(SRCS) $$t', - 'cd $$t', - 'zip -qr $$p/$@ .', - ]), - outs = ['all.zip'], + name = "all", + srcs = [ + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.archive:jgit-archive", + "//org.eclipse.jgit.http.server:jgit-servlet", + "//org.eclipse.jgit.junit:junit", + ], + outs = ["all.zip"], + cmd = " && ".join([ + "p=$$PWD", + "t=$$(mktemp -d || mktemp -d -t bazel-tmp)", + "cp $(SRCS) $$t", + "cd $$t", + "zip -qr $$p/$@ .", + ]), ) diff --git a/WORKSPACE b/WORKSPACE index 902c6b24d6..3551c1ae01 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,97 +1,100 @@ -workspace(name="jgit") +workspace(name = "jgit") load("//tools:bazlets.bzl", "load_bazlets") + load_bazlets(commit = "3afbeab55ece585dbfc7a980bf7214b24ddbbe86") -load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", - "maven_jar" + +load( + "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", + "maven_jar", ) maven_jar( - name = 'jsch', - artifact = 'com.jcraft:jsch:0.1.53', - sha1 = '658b682d5c817b27ae795637dfec047c63d29935', + name = "jsch", + artifact = "com.jcraft:jsch:0.1.53", + sha1 = "658b682d5c817b27ae795637dfec047c63d29935", ) maven_jar( - name = 'javaewah', - artifact = 'com.googlecode.javaewah:JavaEWAH:1.1.6', - sha1 = '94ad16d728b374d65bd897625f3fbb3da223a2b6', + name = "javaewah", + artifact = "com.googlecode.javaewah:JavaEWAH:1.1.6", + sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6", ) maven_jar( - name = 'httpclient', - artifact = 'org.apache.httpcomponents:httpclient:4.3.6', - sha1 = '4c47155e3e6c9a41a28db36680b828ced53b8af4', + name = "httpclient", + artifact = "org.apache.httpcomponents:httpclient:4.3.6", + sha1 = "4c47155e3e6c9a41a28db36680b828ced53b8af4", ) maven_jar( - name = 'httpcore', - artifact = 'org.apache.httpcomponents:httpcore:4.3.3', - sha1 = 'f91b7a4aadc5cf486df6e4634748d7dd7a73f06d', + name = "httpcore", + artifact = "org.apache.httpcomponents:httpcore:4.3.3", + sha1 = "f91b7a4aadc5cf486df6e4634748d7dd7a73f06d", ) maven_jar( - name = 'commons_logging', - artifact = 'commons-logging:commons-logging:1.1.3', - sha1 = 'f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f', + name = "commons_logging", + artifact = "commons-logging:commons-logging:1.1.3", + sha1 = "f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f", ) maven_jar( - name = 'log_api', - artifact = 'org.slf4j:slf4j-api:1.7.2', - sha1 = '0081d61b7f33ebeab314e07de0cc596f8e858d97', + name = "log_api", + artifact = "org.slf4j:slf4j-api:1.7.2", + sha1 = "0081d61b7f33ebeab314e07de0cc596f8e858d97", ) maven_jar( - name = 'slf4j_simple', - artifact = 'org.slf4j:slf4j-simple:1.7.2', - sha1 = '760055906d7353ba4f7ce1b8908bc6b2e91f39fa', + name = "slf4j_simple", + artifact = "org.slf4j:slf4j-simple:1.7.2", + sha1 = "760055906d7353ba4f7ce1b8908bc6b2e91f39fa", ) maven_jar( - name = 'servlet_api_3_1', - artifact = 'javax.servlet:javax.servlet-api:3.1.0', - sha1 = '3cd63d075497751784b2fa84be59432f4905bf7c', + name = "servlet_api_3_1", + artifact = "javax.servlet:javax.servlet-api:3.1.0", + sha1 = "3cd63d075497751784b2fa84be59432f4905bf7c", ) maven_jar( - name = 'commons_compress', - artifact = 'org.apache.commons:commons-compress:1.6', - sha1 = 'c7d9b580aff9e9f1998361f16578e63e5c064699', + name = "commons_compress", + artifact = "org.apache.commons:commons-compress:1.6", + sha1 = "c7d9b580aff9e9f1998361f16578e63e5c064699", ) maven_jar( - name = 'tukaani_xz', - artifact = 'org.tukaani:xz:1.3', - sha1 = '66db21c8484120cb6a51b5b3ea47b6f383942bec', + name = "tukaani_xz", + artifact = "org.tukaani:xz:1.3", + sha1 = "66db21c8484120cb6a51b5b3ea47b6f383942bec", ) maven_jar( - name = 'args4j', - artifact = 'args4j:args4j:2.0.15', - sha1 = '139441471327b9cc6d56436cb2a31e60eb6ed2ba', + name = "args4j", + artifact = "args4j:args4j:2.0.15", + sha1 = "139441471327b9cc6d56436cb2a31e60eb6ed2ba", ) maven_jar( - name = 'junit', - artifact = 'junit:junit:4.11', - sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0', + name = "junit", + artifact = "junit:junit:4.11", + sha1 = "4e031bb61df09069aeb2bffb4019e7a5034a4ee0", ) maven_jar( - name = 'hamcrest_library', - artifact = 'org.hamcrest:hamcrest-library:1.3', - sha1 = '4785a3c21320980282f9f33d0d1264a69040538f', + name = "hamcrest_library", + artifact = "org.hamcrest:hamcrest-library:1.3", + sha1 = "4785a3c21320980282f9f33d0d1264a69040538f", ) maven_jar( - name = 'hamcrest_core', - artifact = 'org.hamcrest:hamcrest-core:1.3', - sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0', + name = "hamcrest_core", + artifact = "org.hamcrest:hamcrest-core:1.3", + sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0", ) maven_jar( - name = 'gson', - artifact = 'com.google.code.gson:gson:2.2.4', - sha1 = 'a60a5e993c98c864010053cb901b7eab25306568', + name = "gson", + artifact = "com.google.code.gson:gson:2.2.4", + sha1 = "a60a5e993c98c864010053cb901b7eab25306568", ) diff --git a/org.eclipse.jgit.archive/BUILD b/org.eclipse.jgit.archive/BUILD index c74f6d8a20..e15fcfacea 100644 --- a/org.eclipse.jgit.archive/BUILD +++ b/org.eclipse.jgit.archive/BUILD @@ -1,15 +1,16 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) java_library( - name = 'jgit-archive', - srcs = glob( - ['src/**'], - exclude = ['src/org/eclipse/jgit/archive/FormatActivator.java'], - ), - resources = glob(['resources/**']), - resource_strip_prefix = 'org.eclipse.jgit.archive/resources', - deps = [ # We want these deps to be provided_deps - '//org.eclipse.jgit:jgit', - '@commons_compress//jar', - ], + name = "jgit-archive", + srcs = glob( + ["src/**"], + exclude = ["src/org/eclipse/jgit/archive/FormatActivator.java"], + ), + resource_strip_prefix = "org.eclipse.jgit.archive/resources", + resources = glob(["resources/**"]), + deps = [ + # We want these deps to be provided_deps + "//org.eclipse.jgit:jgit", + "@commons_compress//jar", + ], ) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index 88dc8040bf..19992086bd 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -1,12 +1,13 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) java_library( - name = 'jgit-servlet', - srcs = glob(['src/**']), - resources = glob(['resources/**']), - resource_strip_prefix = 'org.eclipse.jgit.http.server/resources', - deps = [ # We want these deps to be provided_deps - '//org.eclipse.jgit:jgit', - '@servlet_api_3_1//jar', - ], + name = "jgit-servlet", + srcs = glob(["src/**"]), + resource_strip_prefix = "org.eclipse.jgit.http.server/resources", + resources = glob(["resources/**"]), + deps = [ + # We want these deps to be provided_deps + "//org.eclipse.jgit:jgit", + "@servlet_api_3_1//jar", + ], ) diff --git a/org.eclipse.jgit.junit/BUILD b/org.eclipse.jgit.junit/BUILD index e0b358ae31..6d6462d27d 100644 --- a/org.eclipse.jgit.junit/BUILD +++ b/org.eclipse.jgit.junit/BUILD @@ -1,12 +1,13 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) java_library( - name = 'junit', - srcs = glob(['src/**']), - resources = glob(['resources/**']), - resource_strip_prefix = 'org.eclipse.jgit.junit/resources', - deps = [ # We want these deps to be provided_deps - '//org.eclipse.jgit:jgit', - '@junit//jar', - ], + name = "junit", + srcs = glob(["src/**"]), + resource_strip_prefix = "org.eclipse.jgit.junit/resources", + resources = glob(["resources/**"]), + deps = [ + # We want these deps to be provided_deps + "//org.eclipse.jgit:jgit", + "@junit//jar", + ], ) diff --git a/org.eclipse.jgit/BUILD b/org.eclipse.jgit/BUILD index 2abf228082..a9b01e9ea6 100644 --- a/org.eclipse.jgit/BUILD +++ b/org.eclipse.jgit/BUILD @@ -1,29 +1,33 @@ -package(default_visibility = ['//visibility:public']) +package(default_visibility = ["//visibility:public"]) INSECURE_CIPHER_FACTORY = [ - 'src/org/eclipse/jgit/transport/InsecureCipherFactory.java', + "src/org/eclipse/jgit/transport/InsecureCipherFactory.java", ] -SRCS = glob(['src/**'], exclude=INSECURE_CIPHER_FACTORY) -RESOURCES = glob(['resources/**']) +SRCS = glob( + ["src/**"], + exclude = INSECURE_CIPHER_FACTORY, +) + +RESOURCES = glob(["resources/**"]) java_library( - name = 'jgit', - srcs = SRCS, - resources = RESOURCES, - resource_strip_prefix = 'org.eclipse.jgit/resources', - deps = [ - ':insecure_cipher_factory', - '@javaewah//jar', - '@jsch//jar', - '@httpclient//jar', - '@servlet_api_3_1//jar', - '@log_api//jar', - ], + name = "jgit", + srcs = SRCS, + resource_strip_prefix = "org.eclipse.jgit/resources", + resources = RESOURCES, + deps = [ + ":insecure_cipher_factory", + "@httpclient//jar", + "@javaewah//jar", + "@jsch//jar", + "@log_api//jar", + "@servlet_api_3_1//jar", + ], ) java_library( - name = 'insecure_cipher_factory', - srcs = INSECURE_CIPHER_FACTORY, - javacopts = ['-Xep:InsecureCipherMode:OFF'], + name = "insecure_cipher_factory", + srcs = INSECURE_CIPHER_FACTORY, + javacopts = ["-Xep:InsecureCipherMode:OFF"], ) -- 2.39.5