Skip to content

Don't propagate JavaInfo for compiler plugin deshaded libs #644

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

Merged
merged 4 commits into from
Jan 28, 2022
Merged

Don't propagate JavaInfo for compiler plugin deshaded libs #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
086f2b0
Don't propagate JavaInfo for compiler plugin deshaded libs
nkoroste Dec 10, 2021
0e44f12
remove info
nkoroste Jan 14, 2022
b23855f
actually remove the info
nkoroste Jan 14, 2022
bc854d9
check for the JavaInfo before returning it
restingbull Jan 28, 2022
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
1 change: 0 additions & 1 deletion kotlin/internal/jvm/impl.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,6 @@ def kt_compiler_plugin_impl(ctx):

return [
DefaultInfo(files = classpath),
info,
_KtCompilerPluginInfo(
classpath = classpath,
options = options,
Expand Down
6 changes: 3 additions & 3 deletions kotlin/internal/jvm/jvm.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,14 @@ _common_attr = utils.add_dicts(
mandatory = False,
),
"kotlinc_opts": attr.label(
doc = """Kotlinc options to be used when compiling this target. These opts if provided
doc = """Kotlinc options to be used when compiling this target. These opts if provided
will be used instead of the ones provided to the toolchain.""",
default = None,
providers = [_KotlincOptions],
mandatory = False,
),
"javac_opts": attr.label(
doc = """Javac options to be used when compiling this target. These opts if provided will
doc = """Javac options to be used when compiling this target. These opts if provided will
be used instead of the ones provided to the toolchain.""",
default = None,
providers = [_JavacOptions],
Expand Down Expand Up @@ -560,5 +560,5 @@ Supports the following template values:
),
},
implementation = _kt_compiler_plugin_impl,
provides = [JavaInfo, _KtCompilerPluginInfo],
provides = [_KtCompilerPluginInfo],
)
2 changes: 1 addition & 1 deletion kotlin/internal/jvm/plugins.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _targets_to_annotation_processors_java_plugin_info(targets):
if hasattr(java_common, "JavaPluginInfo"):
_JavaPluginInfo = getattr(java_common, "JavaPluginInfo")
return [t[_JavaPluginInfo] for t in targets if _JavaPluginInfo in t]
return [t[JavaInfo] for t in targets if KtJvmPluginInfo in t]
return [t[JavaInfo] for t in targets if JavaInfo in t]

def _targets_to_transitive_runtime_jars(targets):
if hasattr(java_common, "JavaPluginInfo"):
Expand Down