Skip to content

feat: add rules_java to support Bazel 9 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tempacc21 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add rules_java to support Bazel 9 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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 MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module(
)

bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_java", version = "9.3.0")

openapi_gen = use_extension("@openapi_tools_generator_bazel//:extension.bzl", "openapi_gen")
use_repo(openapi_gen, "openapi_tools_generator_bazel_cli")

187 changes: 87 additions & 100 deletions MODULE.bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions internal/openapi_generator.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Copyright 2019 OpenAPI-Generator-Bazel Contributors
load("@rules_java//java:defs.bzl", "JavaInfo")
load("@rules_java//java/common/rules:java_runtime.bzl", "JavaRuntimeInfo")

def _comma_separated_pairs(pairs):
return ",".join([
Expand All @@ -7,7 +9,7 @@ def _comma_separated_pairs(pairs):
])

def _new_generator_command(ctx, declared_dir, rjars):
java_path = ctx.attr._jdk[java_common.JavaRuntimeInfo].java_executable_exec_path
java_path = ctx.attr._jdk[JavaRuntimeInfo].java_executable_exec_path
gen_cmd = str(java_path)

jar_delimiter = ":"
Expand Down Expand Up @@ -181,7 +183,7 @@ _openapi_generator = rule(
"is_windows": attr.bool(mandatory = True),
"_jdk": attr.label(
default = Label("@bazel_tools//tools/jdk:current_host_java_runtime"),
providers = [java_common.JavaRuntimeInfo],
providers = [JavaRuntimeInfo],
),
"openapi_generator_cli": attr.label(
cfg = "exec",
Expand Down
Loading