WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 61fed48

Browse files
committed
Move formatter to an independent folder.
1 parent 5b5c0ee commit 61fed48

File tree

8 files changed

+56
-29
lines changed

8 files changed

+56
-29
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ build
55
local.properties
66
*.iml
77
/bazel-*
8+
**/bazel-*
89
MODULE.bazel.lock
910
*/bin/*

REPO.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ignore_directories(["bzl-examples", "**/bin"])
1+
ignore_directories(["bzl-examples", "formatter", "**/bin"])

bzl-examples/bzlmod/BUILD.bazel

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +0,0 @@
1-
load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
2-
load("@rules_java//java:defs.bzl", "java_binary")
3-
4-
java_binary(
5-
name = "ktfmt",
6-
main_class = "com.facebook.ktfmt.cli.Main",
7-
runtime_deps = ["@ktfmt//jar"],
8-
)
9-
10-
format_multirun(
11-
name = "format",
12-
kotlin = ":ktfmt",
13-
protocol_buffer = "@rules_buf_toolchains//:buf",
14-
starlark = "@buildifier_prebuilt//:buildifier",
15-
visibility = ["//visibility:public"],
16-
)

bzl-examples/bzlmod/MODULE.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ module(
66
bazel_dep(name = "protobuf", version = "32.0")
77
bazel_dep(name = "rules_kotlin", version = "2.1.9")
88
bazel_dep(name = "rules_jvm_external", version = "6.8")
9-
bazel_dep(name = "rules_java", version = "8.15.1")
10-
11-
bazel_dep(name = "aspect_rules_lint", version = "1.5.3", dev_dependency = True)
12-
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True)
13-
bazel_dep(name = "rules_buf", version = "0.5.2", dev_dependency = True)
14-
159
bazel_dep(name = "grpc_kotlin", version = "0.0.0")
1610
local_path_override(
1711
module_name = "grpc_kotlin",
@@ -34,9 +28,3 @@ maven.install(
3428
strict_visibility = True,
3529
)
3630
use_repo(maven, "grpc_kotlin_maven", "maven")
37-
38-
install_ktfmt = use_extension("//:extensions.bzl", "install_ktfmt")
39-
use_repo(install_ktfmt, "ktfmt")
40-
41-
buf = use_extension("@rules_buf//buf:extensions.bzl", "buf")
42-
use_repo(buf, "rules_buf_toolchains")

formatter/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8.3.1

formatter/BUILD.bazel

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
2+
load("@rules_java//java:defs.bzl", "java_binary")
3+
4+
java_binary(
5+
name = "ktfmt",
6+
main_class = "com.facebook.ktfmt.cli.Main",
7+
runtime_deps = ["@ktfmt//jar"],
8+
)
9+
10+
java_binary(
11+
name = "java-format",
12+
jvm_flags = [
13+
"--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
14+
"--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
15+
"--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
16+
"--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
17+
"--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
18+
],
19+
main_class = "com.google.googlejavaformat.java.Main",
20+
runtime_deps = ["@google-java-format//jar"],
21+
)
22+
23+
format_multirun(
24+
name = "format",
25+
java = ":java-format",
26+
kotlin = ":ktfmt",
27+
protocol_buffer = "@rules_buf_toolchains//:buf",
28+
starlark = "@buildifier_prebuilt//:buildifier",
29+
yaml = "@aspect_rules_lint//format:yamlfmt",
30+
)

formatter/MODULE.bazel

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module(
2+
name = "formatter",
3+
version = "1.0",
4+
)
5+
6+
bazel_dep(name = "aspect_rules_lint", version = "1.6.0")
7+
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
8+
bazel_dep(name = "rules_buf", version = "0.5.2")
9+
bazel_dep(name = "rules_java", version = "8.15.1")
10+
11+
http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")
12+
13+
http_jar(
14+
name = "google-java-format",
15+
sha256 = "33068bbbdce1099982ec1171f5e202898eb35f2919cf486141e439fc6e3a4203",
16+
url = "https://github.com/google/google-java-format/releases/download/v1.17.0/google-java-format-1.17.0-all-deps.jar",
17+
)
18+
19+
install_ktfmt = use_extension("//:extensions.bzl", "install_ktfmt")
20+
use_repo(install_ktfmt, "ktfmt")
21+
22+
buf = use_extension("@rules_buf//buf:extensions.bzl", "buf")
23+
use_repo(buf, "rules_buf_toolchains")

0 commit comments

Comments
 (0)