Skip to content

Commit 989e3b3

Browse files
committed
Run buildifier over the tree
The command used was: buildifier -r -lint fix -mode fix .
1 parent d27b27a commit 989e3b3

File tree

11 files changed

+45
-49
lines changed

11 files changed

+45
-49
lines changed

WORKSPACE

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
4848

4949
bazel_skylib_workspace()
5050

51-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5251
http_archive(
5352
name = "rules_python",
5453
sha256 = "954aa89b491be4a083304a2cb838019c8b8c3720a7abb9c4cb81ac7a24230cea",
@@ -164,13 +163,15 @@ rules_closure_toolchains()
164163

165164
http_archive(
166165
name = "rules_pkg",
166+
sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d",
167167
urls = [
168168
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
169169
"https://github.com/bazelbuild/rules_pkg/releases/download/0.5.1/rules_pkg-0.5.1.tar.gz",
170170
],
171-
sha256 = "a89e203d3cf264e564fcb96b6e06dd70bc0557356eb48400ce4b5d97c2c3720d",
172171
)
172+
173173
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
174+
174175
rules_pkg_dependencies()
175176

176177
http_archive(

common/repositories.bzl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# This file has been generated using `bazel run scripts:pinned_browsers`
32

43
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -15,28 +14,28 @@ def pin_browsers():
1514
sha256 = "9d06897b80d77cfb59e1c8bd4dfc427590b058616ae634e52cfe272af06f9b32",
1615
build_file_content = "exports_files([\"firefox\"])",
1716
)
18-
17+
1918
dmg_archive(
2019
name = "mac_firefox",
2120
url = "https://ftp.mozilla.org/pub/firefox/releases/93.0/mac/en-US/Firefox%2093.0.dmg",
2221
sha256 = "b4c78628c2bf68ee431e15d998383fb6168dbfa916f848f27aba73db67410bc6",
2322
build_file_content = "exports_files([\"Firefox.app\"])",
2423
)
25-
24+
2625
http_archive(
2726
name = "linux_geckodriver",
2827
url = "https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz",
2928
sha256 = "12c37f41d11ed982b7be43d02411ff2c75fb7a484e46966d000b47d1665baa88",
3029
build_file_content = "exports_files([\"geckodriver\"])",
3130
)
32-
31+
3332
http_archive(
3433
name = "mac_geckodriver",
3534
url = "https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-macos.tar.gz",
3635
sha256 = "560ba192666c1fe8796404153cfdf2d12551515601c4b3937aabcba6ee300f8c",
3736
build_file_content = "exports_files([\"geckodriver\"])",
3837
)
39-
38+
4039
pkg_archive(
4140
name = "mac_edge",
4241
url = "https://officecdn-microsoft-com.akamaized.net/pr/C1297A47-86C4-4C1F-97FA-950631F94777/MacAutoupdate/MicrosoftEdge-94.0.992.50.pkg?platform=Mac&Consent=0&channel=Stable",
@@ -46,40 +45,39 @@ def pin_browsers():
4645
},
4746
build_file_content = "exports_files([\"Edge.app\"])",
4847
)
49-
48+
5049
http_archive(
5150
name = "mac_edgedriver",
5251
url = "https://msedgedriver.azureedge.net/94.0.992.50/edgedriver_mac64.zip",
5352
sha256 = "f5446a97c7ccd9d80904b1888b28fa5c9eb624b233aa05f046f825b1d8965f3f",
5453
build_file_content = "exports_files([\"msedgedriver\"])",
5554
)
56-
55+
5756
http_archive(
5857
name = "linux_chrome",
5958
url = "https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/919578/chrome-linux.zip",
6059
sha256 = "b20c00667ed3a40ae88ba164ebe6ec3547782c3049f1ea8bdac48c2151e4660c",
6160
build_file_content = "exports_files([\"chrome-linux\"])",
6261
)
63-
62+
6463
http_archive(
6564
name = "mac_chrome",
6665
url = "https://storage.googleapis.com/chromium-browser-snapshots/Mac/919578/chrome-mac.zip",
6766
sha256 = "5ca3dbfe33032ad01f32c0054098b02e2bd12ff6527f2154d4da41792ae6bc99",
6867
strip_prefix = "chrome-mac",
6968
build_file_content = "exports_files([\"Chromium.app\"])",
7069
)
71-
70+
7271
http_archive(
7372
name = "linux_chromedriver",
7473
url = "https://chromedriver.storage.googleapis.com/94.0.4606.61/chromedriver_linux64.zip",
7574
sha256 = "d2011e5b7c7c13225d6d0e237d8cfbb2a52601c1a91005841a38358c31d2f4d0",
7675
build_file_content = "exports_files([\"chromedriver\"])",
7776
)
78-
77+
7978
http_archive(
8079
name = "mac_chromedriver",
8180
url = "https://chromedriver.storage.googleapis.com/94.0.4606.61/chromedriver_mac64.zip",
8281
sha256 = "3b91860aa4d71330e68cac11da586ac39adcead361ae95b3fa856fd3da5383ac",
8382
build_file_content = "exports_files([\"chromedriver\"])",
8483
)
85-

dotnet/src/webdriver/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ generated_assembly_info(
5555
resources = [
5656
"//javascript/atoms/fragments:find-elements.js",
5757
"//javascript/atoms/fragments:is-displayed.js",
58-
"//javascript/webdriver/atoms:get-attribute.js",
5958
"//javascript/cdp-support:mutation-listener.js",
59+
"//javascript/webdriver/atoms:get-attribute.js",
6060
"//third_party/js/selenium:webdriver_json",
6161
],
6262
target_frameworks = [
@@ -101,8 +101,8 @@ generated_assembly_info(
101101
resources = [
102102
"//javascript/atoms/fragments:find-elements.js",
103103
"//javascript/atoms/fragments:is-displayed.js",
104-
"//javascript/webdriver/atoms:get-attribute.js",
105104
"//javascript/cdp-support:mutation-listener.js",
105+
"//javascript/webdriver/atoms:get-attribute.js",
106106
"//third_party/js/selenium:webdriver_json",
107107
],
108108
target_frameworks = [
@@ -139,8 +139,8 @@ generated_assembly_info(
139139
resources = [
140140
"//javascript/atoms/fragments:find-elements.js",
141141
"//javascript/atoms/fragments:is-displayed.js",
142-
"//javascript/webdriver/atoms:get-attribute.js",
143142
"//javascript/cdp-support:mutation-listener.js",
143+
"//javascript/webdriver/atoms:get-attribute.js",
144144
"//third_party/js/selenium:webdriver_json",
145145
],
146146
target_frameworks = [
@@ -186,8 +186,8 @@ generated_assembly_info(
186186
resources = [
187187
"//javascript/atoms/fragments:find-elements.js",
188188
"//javascript/atoms/fragments:is-displayed.js",
189-
"//javascript/webdriver/atoms:get-attribute.js",
190189
"//javascript/cdp-support:mutation-listener.js",
190+
"//javascript/webdriver/atoms:get-attribute.js",
191191
"//third_party/js/selenium:webdriver_json",
192192
],
193193
target_frameworks = [

java/test/com/thoughtworks/selenium/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@rules_jvm_external//:defs.bzl", "artifact")
2-
load("//java:defs.bzl", "java_library", "java_test_suite", "java_selenium_test_suite")
2+
load("//java:defs.bzl", "java_library", "java_selenium_test_suite")
33

44
java_library(
55
name = "test-base",
@@ -31,9 +31,6 @@ java_library(
3131
java_selenium_test_suite(
3232
name = "LargeTests",
3333
size = "large",
34-
browsers = [
35-
"firefox",
36-
],
3734
srcs = glob(
3835
[
3936
"*.java",
@@ -44,6 +41,9 @@ java_selenium_test_suite(
4441
"InternalSelenseTestBase.java",
4542
],
4643
),
44+
browsers = [
45+
"firefox",
46+
],
4747
jvm_flags = [
4848
"-Dselenium.browser=chrome",
4949
],

java/test/com/thoughtworks/selenium/webdriven/BUILD.bazel

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
load("@rules_jvm_external//:defs.bzl", "artifact")
2-
load("//java/private:selenium_test.bzl", "BROWSERS")
32
load("//java:defs.bzl", "java_selenium_test_suite")
43

54
java_selenium_test_suite(
65
name = "LargeTests",
76
size = "large",
7+
srcs = glob(["*Test.java"]),
88
browsers = [
99
"firefox",
1010
],
11-
srcs = glob(["*Test.java"]),
1211
javacopts = [
1312
"--release",
1413
"11",
1514
],
1615
deps = [
1716
"//java/src/com/thoughtworks/selenium",
18-
"//java/src/org/openqa/selenium/remote",
19-
"//java/test/org/openqa/selenium/environment",
20-
"//java/test/org/openqa/selenium/remote/tracing:tracing-support",
21-
"//java/test/org/openqa/selenium/testing",
2217
"//java/src/com/thoughtworks/selenium/webdriven",
2318
"//java/src/org/openqa/selenium/grid",
2419
"//java/src/org/openqa/selenium/jre/server",
20+
"//java/src/org/openqa/selenium/remote",
2521
"//java/src/org/openqa/selenium/remote/server",
22+
"//java/test/org/openqa/selenium/environment",
23+
"//java/test/org/openqa/selenium/remote/tracing:tracing-support",
24+
"//java/test/org/openqa/selenium/testing",
2625
artifact("io.opentelemetry:opentelemetry-api"),
2726
artifact("junit:junit"),
2827
artifact("org.mockito:mockito-core"),

java/test/org/openqa/selenium/chrome/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ java_selenium_test_suite(
1111
data = [
1212
"//third_party/chrome_ext:backspace.crx",
1313
],
14-
tags = [
15-
"selenium-remote",
16-
],
1714
javacopts = [
1815
"--release",
1916
"11",
2017
],
18+
tags = [
19+
"selenium-remote",
20+
],
2121
deps = [
2222
"//java/src/org/openqa/selenium/chrome",
2323
"//java/src/org/openqa/selenium/remote",

java/test/org/openqa/selenium/edge/BUILD.bazel

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ java_selenium_test_suite(
1111
data = [
1212
"//third_party/chrome_ext:backspace.crx",
1313
],
14-
tags = [
15-
"selenium-remote",
16-
],
17-
deps = [
14+
javacopts = [
15+
"--release",
16+
"11",
17+
],
18+
tags = [
19+
"selenium-remote",
20+
],
21+
deps = [
1822
"//java/src/org/openqa/selenium/edge",
1923
"//java/src/org/openqa/selenium/remote",
2024
"//java/src/org/openqa/selenium/support",
2125
"//java/test/org/openqa/selenium/build",
2226
"//java/test/org/openqa/selenium/testing:annotations",
23-
"//java/test/org/openqa/selenium/testing/drivers" ,
2427
"//java/test/org/openqa/selenium/testing:test-base",
28+
"//java/test/org/openqa/selenium/testing/drivers",
2529
artifact("com.google.guava:guava"),
2630
artifact("junit:junit"),
2731
artifact("org.assertj:assertj-core"),
2832
artifact("org.mockito:mockito-core"),
2933
],
30-
javacopts = [
31-
"--release",
32-
"11",
33-
],
3434
)

java/test/org/openqa/selenium/firefox/BUILD.bazel

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ java_selenium_test_suite(
5252
"//third_party/firebug:firebug-1.5.0-fx.xpi",
5353
"//third_party/firebug:mooltipass-1.1.87.xpi",
5454
],
55-
tags = [
56-
"selenium-remote",
57-
],
5855
resources = [
5956
"//third_party/firebug:favourite_colour-1.1-an+fx.xpi",
6057
"//third_party/firebug:firebug-1.5.0-fx.xpi",
6158
"//third_party/firebug:mooltipass-1.1.87.xpi",
6259
],
60+
tags = [
61+
"selenium-remote",
62+
],
6363
deps = [
6464
"//java/src/org/openqa/selenium/firefox",
6565
"//java/src/org/openqa/selenium/remote",
@@ -108,7 +108,6 @@ java_selenium_test_suite(
108108
],
109109
)
110110

111-
112111
copy_file(
113112
name = "firebug_xpi",
114113
src = "//third_party/firebug:firebug-1.5.0-fx.xpi",

java/test/org/openqa/selenium/safari/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ java_selenium_test_suite(
88
browsers = [
99
"safari",
1010
],
11-
tags = [
12-
"selenium-remote",
13-
],
14-
deps = [
11+
tags = [
12+
"selenium-remote",
13+
],
14+
deps = [
1515
"//java/src/org/openqa/selenium/remote",
1616
"//java/src/org/openqa/selenium/safari",
1717
"//java/src/org/openqa/selenium/support",

javascript/cdp-support/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package(default_visibility = [
2-
"//java/src/org/openqa/selenium/devtools:__pkg__",
32
"//dotnet/src/webdriver:__pkg__",
3+
"//java/src/org/openqa/selenium/devtools:__pkg__",
44
])
55

66
exports_files([

0 commit comments

Comments
 (0)