Skip to content

Commit

Permalink
update ExtraDependencyInfo provider name, definition, change extra_ja…
Browse files Browse the repository at this point in the history
…va_deps to be depset
  • Loading branch information
ramyanaga committed Jul 19, 2024
1 parent ea3ecc1 commit 8fc2d84
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions jar_jar_aspect.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ ShadedJars = provider(fields = [
"transitive_shaded",
])

ExtraDependencyProviders = provider(fields = [
"extra_java_deps"
])
ExtraDependencyInfo = provider(
fields = {
"extra_java_deps": "Depset[JavaInfo] with extra java dependencies to include in the list of jars to be shaded"
}
)

def merge_shaded_jars_info(shaded_jars):
return ShadedJars(
Expand Down Expand Up @@ -67,10 +69,9 @@ def _jar_jar_aspect_impl(target, ctx):
current_jars.extend([e.class_jar for e in target[JavaInfo].java_outputs])
java_info_runtime_deps = []

if ExtraDependencyProviders in target:
for config in target[ExtraDependencyProviders].extra_java_deps:
java_info_runtime_deps.append(config.extra_java_deps)
current_jars.extend([e.class_jar for e in config.extra_java_deps.java_outputs])
if ExtraDependencyInfo in target:
for java_dep in target[ExtraDependencyInfo].extra_java_deps.to_list()
current_jars.extend([e.class_jar for e in java_dep.java_outputs])
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 Down

0 comments on commit 8fc2d84

Please sign in to comment.