Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .bazelignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
bzl-examples
bzl-examples
tools/format
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.1
8.4.0
12 changes: 10 additions & 2 deletions .github/workflows/bazel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ jobs:
mkdir -p "${GITHUB_WORKSPACE}/bin/"
mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
- name: Lint - Please run `bazelisk run //:format`
- name: Lint - Please run `bazelisk run @format//:format`
run: |
cd "${GITHUB_WORKSPACE}"
"${GITHUB_WORKSPACE}/bin/bazel" run //:format.check
"${GITHUB_WORKSPACE}/bin/bazel" run @format//:format.check
- name: Build
uses: nick-invision/retry@v3
with:
Expand All @@ -38,6 +38,14 @@ jobs:
command: |
cd "${GITHUB_WORKSPACE}"
"${GITHUB_WORKSPACE}/bin/bazel" build //...
- name: Build --ignore_dev_dependency
uses: nick-invision/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
command: |
cd "${GITHUB_WORKSPACE}"
"${GITHUB_WORKSPACE}/bin/bazel" build //... --ignore_dev_dependency
- name: Test
uses: nick-invision/retry@v3
with:
Expand Down
41 changes: 0 additions & 41 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,41 +0,0 @@
load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
load("@rules_java//java:defs.bzl", "java_binary")
load("@rules_multirun//:defs.bzl", "command")

java_binary(
name = "ktfmt",
main_class = "com.facebook.ktfmt.cli.Main",
tags = ["manual"],
runtime_deps = ["@ktfmt//jar"],
)

command(
name = "ktfmt_wrapper",
arguments = ["--google-style"],
command = ":ktfmt",
tags = ["manual"],
)

java_binary(
name = "java-format",
jvm_flags = [
"--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
],
main_class = "com.google.googlejavaformat.java.Main",
tags = ["manual"],
runtime_deps = ["@google-java-format//jar"],
)

format_multirun(
name = "format",
java = ":java-format",
kotlin = ":ktfmt_wrapper",
protocol_buffer = "@rules_buf_toolchains//:buf",
starlark = "@buildifier_prebuilt//:buildifier",
tags = ["manual"],
yaml = "@aspect_rules_lint//format:yamlfmt",
)
25 changes: 6 additions & 19 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,17 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "protobuf", version = "31.1")
bazel_dep(name = "protobuf", version = "31.1") # Max version without causing compiler errors.
bazel_dep(name = "rules_kotlin", version = "2.1.9")
bazel_dep(name = "rules_java", version = "8.15.1")
bazel_dep(name = "rules_java", version = "8.15.2")
bazel_dep(name = "rules_jvm_external", version = "6.8")
bazel_dep(name = "grpc-java", version = "1.71.0")

# Formatter.
bazel_dep(name = "aspect_rules_lint", version = "1.6.0", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2", dev_dependency = True)
bazel_dep(name = "rules_buf", version = "0.5.2", dev_dependency = True)
bazel_dep(name = "rules_multirun", version = "0.13.0", dev_dependency = True)

http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")

http_jar(
name = "google-java-format",
sha256 = "33068bbbdce1099982ec1171f5e202898eb35f2919cf486141e439fc6e3a4203",
url = "https://github.com/google/google-java-format/releases/download/v1.17.0/google-java-format-1.17.0-all-deps.jar",
bazel_dep(name = "format", version = "0.0.0", dev_dependency = True)
local_path_override(
module_name = "format",
path = "tools/format",
)

grpc_kotlin_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
Expand All @@ -48,9 +41,3 @@ grpc_kotlin_maven.install(
strict_visibility = True,
)
use_repo(grpc_kotlin_maven, "grpc_kotlin_maven")

install_ktfmt = use_extension("//:extensions.bzl", "install_ktfmt", dev_dependency = True)
use_repo(install_ktfmt, "ktfmt")

buf = use_extension("@rules_buf//buf:extensions.bzl", "buf", dev_dependency = True)
use_repo(buf, "rules_buf_toolchains")
2 changes: 1 addition & 1 deletion bzl-examples/bzlmod/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.3.1
8.4.0
1 change: 1 addition & 0 deletions tools/format/.bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8.4.0
43 changes: 43 additions & 0 deletions tools/format/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
load("@aspect_rules_lint//format:defs.bzl", "format_multirun")
load("@rules_java//java:defs.bzl", "java_binary")
load("@rules_multirun//:defs.bzl", "command")

package(default_visibility = ["//visibility:private"])

java_binary(
name = "ktfmt",
main_class = "com.facebook.ktfmt.cli.Main",
tags = ["manual"],
runtime_deps = ["@ktfmt//jar"],
)

command(
name = "ktfmt_wrapper",
arguments = ["--google-style"],
command = ":ktfmt",
tags = ["manual"],
)

java_binary(
name = "java-format",
jvm_flags = [
"--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
],
main_class = "com.google.googlejavaformat.java.Main",
tags = ["manual"],
runtime_deps = ["@google-java-format//jar"],
)

format_multirun(
name = "format",
java = ":java-format",
kotlin = ":ktfmt_wrapper",
protocol_buffer = "@rules_buf_toolchains//:buf",
starlark = "@buildifier_prebuilt//:buildifier",
tags = ["manual"],
yaml = "@aspect_rules_lint//format:yamlfmt",
)
25 changes: 25 additions & 0 deletions tools/format/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module(
name = "format",
version = "1.0.0",
compatibility_level = 1,
)

bazel_dep(name = "aspect_rules_lint", version = "1.7.0")
bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
bazel_dep(name = "rules_buf", version = "0.5.2")
bazel_dep(name = "rules_java", version = "8.15.2")
bazel_dep(name = "rules_multirun", version = "0.13.0")

http_jar = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_jar")

http_jar(
name = "google-java-format",
sha256 = "33068bbbdce1099982ec1171f5e202898eb35f2919cf486141e439fc6e3a4203",
url = "https://github.com/google/google-java-format/releases/download/v1.17.0/google-java-format-1.17.0-all-deps.jar",
)

install_ktfmt = use_extension("//:extensions.bzl", "install_ktfmt")
use_repo(install_ktfmt, "ktfmt")

buf = use_extension("@rules_buf//buf:extensions.bzl", "buf")
use_repo(buf, "rules_buf_toolchains")
File renamed without changes.