Skip to content

Commit a5ac006

Browse files
committed
Run buildifier -lint=fix -warnings=all -r .
Apparently, I had been formatting my BUILD files wrong for the longest time, so I am happy that this tool exists. Also, I am a little wary of the `@rules_cc`/`@rules_java` stuff -- they appear to be referencing external repositories, and I have no such repositories in my WORKSPACE file, but the build seems to work anyway. Furthermore, the corresponding GitHub repositories (https://github.com/bazelbuild/rules_cc and https://github.com/bazelbuild/rules_java) seem half abandoned, and the `rules_cc` README even states that there is no need to use those rules yet. Oh well, as long as the build works, I am happy.
1 parent 408cc75 commit a5ac006

File tree

114 files changed

+559
-331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+559
-331
lines changed

WORKSPACE

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
load("//cpp:deps.bzl", "cpp_dependencies")
2+
23
cpp_dependencies()
34

45
load("//java:repos.bzl", "java_repositories")
6+
57
java_repositories()
8+
69
load("//java:deps.bzl", "java_dependencies")
10+
711
java_dependencies()
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "{{.FullDay}}",
3-
hdrs = ["{{.FullDay}}.h"],
45
srcs = ["{{.FullDay}}.cc"],
6+
hdrs = ["{{.FullDay}}.h"],
57
deps = ["//cpp:adventofcode"],
68
)
79

810
cc_test(
911
name = "test",
1012
srcs = ["test.cc"],
13+
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
1114
deps = [
1215
":{{.FullDay}}",
1316
"@googletest//:gtest_main",
1417
],
15-
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
1618
)
1719

1820
cc_binary(
1921
name = "benchmark",
2022
srcs = ["benchmark.cc"],
23+
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
2124
deps = [
2225
":{{.FullDay}}",
2326
"@googlebenchmark//:benchmark_main",
2427
],
25-
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
2628
)
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1+
load("@rules_java//java:defs.bzl", "java_binary", "java_library")
2+
13
java_library(
24
name = "benchmark_library",
35
srcs = glob(["*.java"]),
6+
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
7+
plugins = ["//java/src/benchmark:annotation_processor"],
48
deps = [
9+
"//java/src/main/java/com/github/saser/adventofcode/{{.FullYear}}/{{.FullDay}}",
510
"@maven//:org_openjdk_jmh_jmh_core",
6-
"//java/src/main/java/com/github/saser/adventofcode/{{.FullYear}}/{{.FullDay}}:{{.FullDay}}",
711
],
8-
plugins = ["//java/src/benchmark:annotation_processor"],
9-
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
1012
)
1113

1214
java_binary(
1315
name = "benchmark",
1416
main_class = "org.openjdk.jmh.Main",
1517
runtime_deps = [
16-
"@maven//:org_openjdk_jmh_jmh_core",
1718
":benchmark_library",
19+
"@maven//:org_openjdk_jmh_jmh_core",
1820
],
1921
)
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
load("@rules_java//java:defs.bzl", "java_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
java_library(
46
name = "{{.FullDay}}",
57
srcs = glob(["*.java"]),
6-
deps = ["//java/src/main/java/com/github/saser/adventofcode:adventofcode"],
8+
deps = ["//java/src/main/java/com/github/saser/adventofcode"],
79
)
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
load("@rules_java//java:defs.bzl", "java_test")
2+
13
java_test(
24
name = "test",
35
srcs = glob(["*.java"]),
6+
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
47
test_class = "com.github.saser.adventofcode.{{.FullYear}}.{{.FullDay}}.Day{{.PaddedDay}}Test",
58
deps = [
9+
"//java/src/main/java/com/github/saser/adventofcode",
10+
"//java/src/main/java/com/github/saser/adventofcode/{{.FullYear}}/{{.FullDay}}",
611
"@maven//:junit_junit",
7-
"//java/src/main/java/com/github/saser/adventofcode:adventofcode",
8-
"//java/src/main/java/com/github/saser/adventofcode/{{.FullYear}}/{{.FullDay}}:{{.FullDay}}",
912
],
10-
data = ["//inputs:{{.Year}}/{{.PaddedDay}}"],
1113
)

cpp/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_library")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
cc_library(
46
name = "adventofcode",
5-
hdrs = ["adventofcode.h"],
67
srcs = ["adventofcode.cc"],
8+
hdrs = ["adventofcode.h"],
79
)

cpp/year2019/day01/BUILD.bazel

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day01",
3-
hdrs = ["day01.h"],
45
srcs = ["day01.cc"],
6+
hdrs = ["day01.h"],
57
deps = ["//cpp:adventofcode"],
68
)
79

810
cc_test(
911
name = "test",
1012
srcs = ["test.cc"],
13+
data = ["//inputs:2019/01"],
1114
deps = [
1215
":day01",
1316
"@googletest//:gtest_main",
1417
],
15-
data = ["//inputs:2019/01"],
1618
)
1719

1820
cc_binary(
1921
name = "benchmark",
2022
srcs = ["benchmark.cc"],
23+
data = ["//inputs:2019/01"],
2124
deps = [
2225
":day01",
2326
"@googlebenchmark//:benchmark_main",
2427
],
25-
data = ["//inputs:2019/01"],
2628
)

cpp/year2019/day02/BUILD.bazel

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day02",
3-
hdrs = ["day02.h"],
45
srcs = ["day02.cc"],
6+
hdrs = ["day02.h"],
57
deps = [
6-
"@abseil//absl/strings:strings",
78
"//cpp:adventofcode",
8-
"//cpp/year2019/intcode:intcode",
9+
"//cpp/year2019/intcode",
10+
"@abseil//absl/strings",
911
],
1012
)
1113

1214
cc_test(
1315
name = "test",
1416
srcs = ["test.cc"],
17+
data = ["//inputs:2019/02"],
1518
deps = [
1619
":day02",
1720
"@googletest//:gtest_main",
1821
],
19-
data = ["//inputs:2019/02"],
2022
)
2123

2224
cc_binary(
2325
name = "benchmark",
2426
srcs = ["benchmark.cc"],
27+
data = ["//inputs:2019/02"],
2528
deps = [
2629
":day02",
2730
"@googlebenchmark//:benchmark_main",
2831
],
29-
data = ["//inputs:2019/02"],
3032
)

cpp/year2019/day03/BUILD.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day03",
3-
hdrs = ["day03.h"],
45
srcs = ["day03.cc"],
6+
hdrs = ["day03.h"],
57
deps = [
6-
"@abseil//absl/strings:strings",
78
"//cpp:adventofcode",
9+
"@abseil//absl/strings",
810
],
911
)
1012

1113
cc_test(
1214
name = "test",
1315
srcs = ["test.cc"],
16+
data = glob(["testdata/*"]) + ["//inputs:2019/03"],
1417
deps = [
1518
":day03",
1619
"@googletest//:gtest_main",
1720
],
18-
data = glob(["testdata/*"]) + ["//inputs:2019/03"],
1921
)
2022

2123
cc_binary(
2224
name = "benchmark",
2325
srcs = ["benchmark.cc"],
26+
data = ["//inputs:2019/03"],
2427
deps = [
2528
":day03",
2629
"@googlebenchmark//:benchmark_main",
2730
],
28-
data = ["//inputs:2019/03"],
2931
)

cpp/year2019/day04/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day04",
3-
hdrs = ["day04.h"],
45
srcs = ["day04.cc"],
6+
hdrs = ["day04.h"],
57
deps = [
6-
"@abseil//absl/strings:strings",
7-
"//cpp:adventofcode",
88
":internal",
9+
"//cpp:adventofcode",
10+
"@abseil//absl/strings",
911
],
1012
)
1113

1214
cc_test(
1315
name = "test",
1416
srcs = ["test.cc"],
17+
data = ["//inputs:2019/04"],
1518
deps = [
1619
":day04",
1720
"@googletest//:gtest_main",
1821
],
19-
data = ["//inputs:2019/04"],
2022
)
2123

2224
cc_library(
2325
name = "internal",
24-
hdrs = ["internal.h"],
2526
srcs = ["internal.cc"],
27+
hdrs = ["internal.h"],
2628
)
2729

2830
cc_test(
@@ -37,9 +39,9 @@ cc_test(
3739
cc_binary(
3840
name = "benchmark",
3941
srcs = ["benchmark.cc"],
42+
data = ["//inputs:2019/04"],
4043
deps = [
4144
":day04",
4245
"@googlebenchmark//:benchmark_main",
4346
],
44-
data = ["//inputs:2019/04"],
4547
)

cpp/year2019/day05/BUILD.bazel

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day05",
3-
hdrs = ["day05.h"],
45
srcs = ["day05.cc"],
6+
hdrs = ["day05.h"],
57
deps = [
6-
"@abseil//absl/strings:str_format",
78
"//cpp:adventofcode",
8-
"//cpp/year2019/intcode:intcode",
9+
"//cpp/year2019/intcode",
10+
"@abseil//absl/strings:str_format",
911
],
1012
)
1113

1214
cc_test(
1315
name = "test",
1416
srcs = ["test.cc"],
17+
data = ["//inputs:2019/05"],
1518
deps = [
1619
":day05",
1720
"@googletest//:gtest_main",
1821
],
19-
data = ["//inputs:2019/05"],
2022
)
2123

2224
cc_binary(
2325
name = "benchmark",
2426
srcs = ["benchmark.cc"],
27+
data = ["//inputs:2019/05"],
2528
deps = [
2629
":day05",
2730
"@googlebenchmark//:benchmark_main",
2831
],
29-
data = ["//inputs:2019/05"],
3032
)

cpp/year2019/day06/BUILD.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day06",
3-
hdrs = ["day06.h"],
45
srcs = ["day06.cc"],
6+
hdrs = ["day06.h"],
57
deps = [
6-
"@abseil//absl/strings:strings",
78
"//cpp:adventofcode",
9+
"@abseil//absl/strings",
810
],
911
)
1012

1113
cc_test(
1214
name = "test",
1315
srcs = ["test.cc"],
16+
data = glob(["testdata/*"]) + ["//inputs:2019/06"],
1417
deps = [
1518
":day06",
1619
"@googletest//:gtest_main",
1720
],
18-
data = glob(["testdata/*"]) + ["//inputs:2019/06"],
1921
)
2022

2123
cc_binary(
2224
name = "benchmark",
2325
srcs = ["benchmark.cc"],
26+
data = ["//inputs:2019/06"],
2427
deps = [
2528
":day06",
2629
"@googlebenchmark//:benchmark_main",
2730
],
28-
data = ["//inputs:2019/06"],
2931
)

cpp/year2019/day07/BUILD.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1+
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
2+
13
cc_library(
24
name = "day07",
3-
hdrs = ["day07.h"],
45
srcs = ["day07.cc"],
6+
hdrs = ["day07.h"],
57
deps = [
68
"//cpp:adventofcode",
7-
"//cpp/year2019/intcode:intcode",
9+
"//cpp/year2019/intcode",
810
],
911
)
1012

1113
cc_test(
1214
name = "test",
1315
srcs = ["test.cc"],
16+
data = glob(["testdata/*"]) + ["//inputs:2019/07"],
1417
deps = [
1518
":day07",
1619
"@googletest//:gtest_main",
1720
],
18-
data = glob(["testdata/*"]) + ["//inputs:2019/07"],
1921
)
2022

2123
cc_binary(
2224
name = "benchmark",
2325
srcs = ["benchmark.cc"],
26+
data = ["//inputs:2019/07"],
2427
deps = [
2528
":day07",
2629
"@googlebenchmark//:benchmark_main",
2730
],
28-
data = ["//inputs:2019/07"],
2931
)

0 commit comments

Comments
 (0)