Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Add ConfigJavaInfo to jar jar aspect #51

Merged
merged 2 commits into from
Jul 18, 2024
Merged

Add ConfigJavaInfo to jar jar aspect #51

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e1aa31
add ConfigJavaInfo to jar jar aspect
ramyanaga Jul 18, 2024
bfcb796
Merge branch 'main' into ramya/bazel_jar_jar_aspect_change_0717
eed3si9n Jul 18, 2024
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
11 changes: 10 additions & 1 deletion jar_jar_aspect.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ ShadedJars = provider(fields = [
"transitive_shaded",
])

ConfigJavaInfo = provider(fields = [
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I find this name a bit confusing. I would rather name it something related to runtime_deps. But also, I'm confused why we need this... seems like we shouldn't...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that this rule makes the assumption that the target only generates one output JAR, and if it ever has a runtime dependency the target would have an attributed called runtime_deps:

    if hasattr(ctx.rule.attr, "runtime_deps"):
        for d in ctx.rule.attr.runtime_deps:
            if ShadedJars in d:
                shaded_jars = d[ShadedJars]
                transitive_shaded.append(depset([shaded_jars]))
                transitive_shaded.append(shaded_jars.transitive_shaded)
                java_info_runtime_deps.append(shaded_jars.java_info)

The target we have generates two output one normal JAR and the second JAR for JSON, and as far as we can tell it won't get included into the resulting JavaInfo from this aspect.

"config_java_info"
])

def merge_shaded_jars_info(shaded_jars):
return ShadedJars(
output_files = depset(transitive = [s.output_files for s in shaded_jars]),
Expand Down Expand Up @@ -57,10 +61,15 @@ def _jar_jar_aspect_impl(target, ctx):
return []

current_jars = [j for j in target[JavaInfo].runtime_output_jars]

# For some outputs, like those from the built in java proto aspect, the runtime output jars is empty, but the jars
# exist instead in the java_outputs section.
current_jars.extend([e.class_jar for e in target[JavaInfo].java_outputs])
java_info_runtime_deps = []

if ConfigJavaInfo in target:
java_info_runtime_deps.append(target[ConfigJavaInfo].config_java_info)
#current_jars.extend([e.class_jar for e in target[ConfigJavaInfo].config_java_info.java_outputs])
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we some remove this commented code.

toolchain_cfg = ctx.toolchains["//toolchains:toolchain_type"]
rules = toolchain_cfg.rules.files.to_list()[0]
duplicate_to_warn = toolchain_cfg.duplicate_class_to_warn
Expand All @@ -73,7 +82,6 @@ def _jar_jar_aspect_impl(target, ctx):
current_jars = [_build_nosrc_jar(ctx)]

transitive_shaded=[]
java_info_runtime_deps = []
if hasattr(ctx.rule.attr, "runtime_deps"):
for d in ctx.rule.attr.runtime_deps:
if ShadedJars in d:
Expand All @@ -91,6 +99,7 @@ def _jar_jar_aspect_impl(target, ctx):
transitive_shaded.append(shaded_jars.transitive_shaded)
java_info_exports.append(shaded_jars.java_info)


java_info_deps = []
for d in ctx.rule.attr.deps:
if ShadedJars in d:
Expand Down