Run buildifier over BUILD and WORKSPACE files

atthaboon · Nov 12, 2019 · f3a4901 · f3a4901
1 parent edfbeed
commit f3a4901
Show file tree

Hide file tree

Showing 39 changed files with 158 additions and 142 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -10,8 +10,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_jvm_external",
-    strip_prefix = "rules_jvm_external-2.10",
     sha256 = "1bbf2e48d07686707dd85357e9a94da775e1dbd7c464272b3664283c9c716d26",
+    strip_prefix = "rules_jvm_external-2.10",
     url = "https://github.com/bazelbuild/rules_jvm_external/archive/2.10.zip",
 )
 
@@ -23,7 +23,6 @@ load("@maven//:defs.bzl", "pinned_maven_install")
 
 pinned_maven_install()
 
-
 http_archive(
     name = "io_bazel_rules_closure",
     sha256 = "2e95ba060acd74f3662547a38814ffff60317be047b7168d25498aea52f3e732",
@@ -70,17 +69,19 @@ install_bazel_dependencies()
 
 http_archive(
     name = "rules_python",
+    sha256 = "b556b165ea1311bf68b6b0bc86d95e5cfca2e839aa6fbd232781bb3930f3d392",
+    strip_prefix = "rules_python-e0644961d74b9bbb8a975a01bebb045abfd5d1bd",
     urls = [
-      "https://github.com/bazelbuild/rules_python/archive/e0644961d74b9bbb8a975a01bebb045abfd5d1bd.zip"
+        "https://github.com/bazelbuild/rules_python/archive/e0644961d74b9bbb8a975a01bebb045abfd5d1bd.zip",
     ],
-    strip_prefix = "rules_python-e0644961d74b9bbb8a975a01bebb045abfd5d1bd",
-    sha256 = "b556b165ea1311bf68b6b0bc86d95e5cfca2e839aa6fbd232781bb3930f3d392",
 )
 
 # This call should always be present.
 load("@rules_python//python:repositories.bzl", "py_repositories")
+
 py_repositories()
 
 # This one is only needed if you're using the packaging rules.
 load("@rules_python//python:pip.bzl", "pip_repositories")
+
 pip_repositories()
diff --git a/dotnet/src/support/BUILD.bazel b/dotnet/src/support/BUILD.bazel
@@ -16,10 +16,10 @@ load(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
+    out = "merged/{}/WebDriver.Support.dll".format(framework),
     target_frameworks = [
         "{}".format(framework),
     ],
-    out = "merged/{}/WebDriver.Support.dll".format(framework),
     visibility = ["//visibility:public"],
     deps = [
         "@net//:System",
@@ -40,10 +40,10 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
+    out = "merged/netstandard2.0/WebDriver.Support.dll",
     target_frameworks = [
         "netstandard2.0",
     ],
-    out = "merged/netstandard2.0/WebDriver.Support.dll",
     visibility = ["//visibility:public"],
     deps = [
         "//dotnet/src/webdriver:netstandard2.0assembly",
@@ -59,11 +59,11 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
+    out = "strongnamed/{}/WebDriver.Support.dll".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
     target_frameworks = [
         "{}".format(framework),
     ],
-    out = "strongnamed/{}/WebDriver.Support.dll".format(framework),
-    keyfile = "//dotnet:WebDriver.snk",
     visibility = ["//visibility:public"],
     deps = [
         "@net//:System",
@@ -84,11 +84,11 @@ csharp_library(
         "PageObjects/**/*.cs",
         "UI/*.cs",
     ]),
+    out = "strongnamed/netstandard2.0/WebDriver.Support.dll",
+    keyfile = "//dotnet:WebDriver.snk",
     target_frameworks = [
         "netstandard2.0",
     ],
-    out = "strongnamed/netstandard2.0/WebDriver.Support.dll",
-    keyfile = "//dotnet:WebDriver.snk",
     visibility = ["//visibility:public"],
     deps = [
         "//dotnet/src/webdriver:netstandard2.0assembly-strongnamed",

diff --git a/dotnet/src/webdriver/BUILD.bazel b/dotnet/src/webdriver/BUILD.bazel
@@ -28,14 +28,15 @@ load(
         "Support/*.cs",
     ]),
     resources = [
-        "//javascript/webdriver/atoms:get-attribute.js",
         "//javascript/atoms/fragments:is-displayed.js",
+        "//javascript/webdriver/atoms:get-attribute.js",
     ],
     target_frameworks = [
         "{}".format(framework),
     ],
     visibility = ["//visibility:public"],
     deps = [
+        "@json.net//:Newtonsoft.Json",
         "@net//:System",
         "@net//:System.Core",
         "@net//:System.Data",
@@ -45,7 +46,6 @@ load(
         "@net//:System.Net.Http",
         "@net//:System.Runtime.Serialization",
         "@net//:System.Xml",
-        "@json.net//:Newtonsoft.Json",
     ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
@@ -68,8 +68,8 @@ csharp_library(
         "Support/*.cs",
     ]),
     resources = [
-        "//javascript/webdriver/atoms:get-attribute.js",
         "//javascript/atoms/fragments:is-displayed.js",
+        "//javascript/webdriver/atoms:get-attribute.js",
     ],
     target_frameworks = [
         "netstandard2.0",
@@ -100,14 +100,15 @@ csharp_library(
     ]),
     keyfile = "//dotnet:WebDriver.snk",
     resources = [
-        "//javascript/webdriver/atoms:get-attribute.js",
         "//javascript/atoms/fragments:is-displayed.js",
+        "//javascript/webdriver/atoms:get-attribute.js",
     ],
     target_frameworks = [
         "{}".format(framework),
     ],
     visibility = ["//visibility:public"],
     deps = [
+        "@json.net//:Newtonsoft.Json",
         "@net//:System",
         "@net//:System.Core",
         "@net//:System.Data",
@@ -117,11 +118,9 @@ csharp_library(
         "@net//:System.Net.Http",
         "@net//:System.Runtime.Serialization",
         "@net//:System.Xml",
-        "@json.net//:Newtonsoft.Json",
     ],
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
-
 csharp_library(
     name = "netstandard2.0assembly-strongnamed",
     srcs = glob([
@@ -142,8 +141,8 @@ csharp_library(
     ]),
     keyfile = "//dotnet:WebDriver.snk",
     resources = [
-        "//javascript/webdriver/atoms:get-attribute.js",
         "//javascript/atoms/fragments:is-displayed.js",
+        "//javascript/webdriver/atoms:get-attribute.js",
     ],
     target_frameworks = [
         "netstandard2.0",
@@ -158,11 +157,11 @@ csharp_library(
     name = "{}".format(framework),
     out = "merged/{}/WebDriver.dll".format(framework),
     src_assembly = ":{}assembly".format(framework),
+    target_framework = "{}".format(framework),
     visibility = ["//visibility:public"],
     deps = [
         "@json.net//:Newtonsoft.Json",
     ],
-    target_framework = "{}".format(framework),
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 copy_file(
@@ -175,13 +174,13 @@ copy_file(
 [merged_assembly(
     name = "{}-strongnamed".format(framework),
     out = "strongnamed/{}/WebDriver.dll".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
     src_assembly = ":{}assembly-strongnamed".format(framework),
+    target_framework = "{}".format(framework),
     visibility = ["//visibility:public"],
-    keyfile = "//dotnet:WebDriver.snk",
     deps = [
         "@json.net//:Newtonsoft.Json",
     ],
-    target_framework = "{}".format(framework),
 ) for framework in SUPPORTED_NET_FRAMEWORKS]
 
 copy_file(

diff --git a/dotnet/src/webdriverbackedselenium/BUILD.bazel b/dotnet/src/webdriverbackedselenium/BUILD.bazel
@@ -13,6 +13,7 @@ load(
         "*.cs",
         "Internal/**/*.cs",
     ]),
+    out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -31,7 +32,6 @@ load(
     target_frameworks = [
         "{}".format(framework),
     ],
-    out = "merged/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
     visibility = ["//visibility:public"],
     deps = [
         "@net//:System",
@@ -53,6 +53,7 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
+    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -71,7 +72,6 @@ csharp_library(
     target_frameworks = [
         "netstandard2.0",
     ],
-    out = "merged/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
     visibility = ["//visibility:public"],
     deps = [
         "//dotnet/src/webdriver:netstandard2.0assembly",
@@ -84,6 +84,8 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
+    out = "strongnamed/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
+    keyfile = "//dotnet:WebDriver.snk",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -102,8 +104,6 @@ csharp_library(
     target_frameworks = [
         "{}".format(framework),
     ],
-    out = "strongnamed/{}/Selenium.WebDriverBackedSelenium.dll".format(framework),
-    keyfile = "//dotnet:WebDriver.snk",
     visibility = ["//visibility:public"],
     deps = [
         "@net//:System",
@@ -125,6 +125,8 @@ csharp_library(
         "*.cs",
         "Internal/**/*.cs",
     ]),
+    out = "strongnamed/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
+    keyfile = "//dotnet:WebDriver.snk",
     resources = [
         "//java/client/src/com/thoughtworks/selenium/webdriven:htmlutils.js",
         "//java/client/src/com/thoughtworks/selenium/webdriven:injectableSelenium.js",
@@ -143,8 +145,6 @@ csharp_library(
     target_frameworks = [
         "netstandard2.0",
     ],
-    out = "strongnamed/netstandard2.0/Selenium.WebDriverBackedSelenium.dll",
-    keyfile = "//dotnet:WebDriver.snk",
     visibility = ["//visibility:public"],
     deps = [
         "//dotnet/src/webdriver:netstandard2.0assembly-strongnamed",

diff --git a/java/BUILD.bazel b/java/BUILD.bazel
@@ -27,11 +27,11 @@ java_library(
     exported_plugins = [
         ":auto-service-plugin",
     ],
+    visibility = [
+        "//java:__subpackages__",
+    ],
     exports = [
         artifact("com.google.auto.service:auto-service"),
         artifact("com.google.auto.service:auto-service-annotations"),
     ],
-    visibility = [
-        "//java:__subpackages__",
-    ]
 )
diff --git a/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel b/java/client/src/com/thoughtworks/selenium/webdriven/BUILD.bazel
@@ -42,7 +42,6 @@ java_library(
         "//java/server/src/com/thoughtworks/selenium/webdriven:__pkg__",
         "//java/server/src/org/openqa/grid/selenium:__pkg__",
         "//java/server/src/org/openqa/selenium/server/htmlrunner:__pkg__",
-        "//java/server/src/org/openqa/selenium/server/htmlrunner:__pkg__",
     ],
     exports = [
         ":emulation-api",

diff --git a/java/client/src/org/openqa/selenium/BUILD.bazel b/java/client/src/org/openqa/selenium/BUILD.bazel
@@ -34,10 +34,10 @@ java_export(
     exports = [
         ":core",
         "//java/client/src/org/openqa/selenium/chrome",
-        "//java/client/src/org/openqa/selenium/firefox",
-        "//java/client/src/org/openqa/selenium/firefox/xpi",
         "//java/client/src/org/openqa/selenium/edge:edgeium",
         "//java/client/src/org/openqa/selenium/edge/edgehtml",
+        "//java/client/src/org/openqa/selenium/firefox",
+        "//java/client/src/org/openqa/selenium/firefox/xpi",
         "//java/client/src/org/openqa/selenium/ie",
         "//java/client/src/org/openqa/selenium/opera",
         "//java/client/src/org/openqa/selenium/remote",
@@ -52,13 +52,13 @@ java_dist_zip(
         "//:license",
         "//java:CHANGELOG",
     ],
-    deps = [
-        ":client-combined",
-    ],
     third_party_prefixes = [
         "@maven//",
         "//third_party",
-    ]
+    ],
+    deps = [
+        ":client-combined",
+    ],
 )
 
 java_import(
@@ -79,8 +79,8 @@ genrule(
       echo "Build-Revision = " $$(grep GIT_REVISION bazel-out/stable-status.txt | cut -d' ' -f 2) >>META-INF/selenium-build.properties &&
       $(location @bazel_tools//tools/zip:zipper) c $@ META-INF/selenium-build.properties
     """ % SE_VERSION,
+    stamp = True,
     tools = [
         "@bazel_tools//tools/zip:zipper",
     ],
-    stamp = True,
 )
diff --git a/java/client/src/org/openqa/selenium/firefox/BUILD.bazel b/java/client/src/org/openqa/selenium/firefox/BUILD.bazel
@@ -6,9 +6,9 @@ load("//:copy_file.bzl", "copy_file")
 java_export(
     name = "firefox",
     srcs = glob(["*.java"]),
-    resources = [":prefs"],
     maven_coordinates = "org.seleniumhq.selenium:selenium-firefox-driver:%s" % SE_VERSION,
     pom_template = "//java/client/src/org/openqa/selenium:template-pom",
+    resources = [":prefs"],
     visibility = ["//visibility:public"],
     deps = [
         "//java:auto-service",

diff --git a/java/client/src/org/openqa/selenium/firefox/xpi/BUILD.bazel b/java/client/src/org/openqa/selenium/firefox/xpi/BUILD.bazel
@@ -6,13 +6,13 @@ load("//:copy_file.bzl", "copy_file")
 java_export(
     name = "xpi",
     srcs = glob(["*.java"]),
+    maven_coordinates = "org.seleniumhq.selenium:selenium-firefox-xpi-driver:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     resources = [
         ":amd64",
         ":i386",
         ":webdriver_xpi",
     ],
-    maven_coordinates = "org.seleniumhq.selenium:selenium-firefox-xpi-driver:%s" % SE_VERSION,
-    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     deps = [
         "//java:auto-service",

diff --git a/java/client/src/org/openqa/selenium/lift/BUILD.bazel b/java/client/src/org/openqa/selenium/lift/BUILD.bazel
@@ -15,6 +15,6 @@ java_export(
         "//java/client/src/org/openqa/selenium/support",
         artifact("com.google.guava:guava"),
         artifact("org.hamcrest:hamcrest-all"),
-        artifact("junit:junit")
+        artifact("junit:junit"),
     ],
 )
diff --git a/java/client/src/org/openqa/selenium/remote/BUILD.bazel b/java/client/src/org/openqa/selenium/remote/BUILD.bazel
@@ -61,13 +61,13 @@ java_export(
         "mobile/AddNetworkConnection.java",
     ],
     maven_coordinates = "org.seleniumhq.selenium:selenium-remote-driver:%s" % SE_VERSION,
-    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     module_uses_services = [
         "io.opentracing.Tracer",
         "org.openqa.selenium.remote.session.CapabilitiesFilter",
         "org.openqa.selenium.remote.session.CapabilityTransform",
         "org.openqa.selenium.remote.service.DriverService$Builder",
     ],
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
     visibility = ["//visibility:public"],
     exports = [
         ":api",
@@ -87,8 +87,8 @@ java_export(
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/io",
         "//java/client/src/org/openqa/selenium/os",
-        "//java/client/src/org/openqa/selenium/remote/http/okhttp",
         "//java/client/src/org/openqa/selenium/remote/http/netty",
+        "//java/client/src/org/openqa/selenium/remote/http/okhttp",
         artifact("net.bytebuddy:byte-buddy"),
         artifact("com.google.guava:guava"),
     ],