Skip to content
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

Jump to bottom

Remove warning if dep has no JavaInfo since it's required now #788

Merged
merged 1 commit into from
Jul 18, 2019
Merged

Remove warning if dep has no JavaInfo since it's required now #788

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
60 changes: 27 additions & 33 deletions scala/private/common.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,18 @@ def _collect_jars_when_dependency_analyzer_is_off(
for dep_target in dep_targets:
# we require a JavaInfo for dependencies
# must use java_import or scala_import if you have raw files
if JavaInfo in dep_target:
java_provider = dep_target[JavaInfo]
deps_providers.append(java_provider)
compile_jars.append(java_provider.compile_jars)
runtime_jars.append(java_provider.transitive_runtime_jars)

if not unused_dependency_checker_is_off:
add_labels_of_jars_to(
jars2labels,
dep_target,
[],
java_provider.compile_jars.to_list(),
)
else:
print("ignored dependency, has no JavaInfo: " + str(dep_target))
java_provider = dep_target[JavaInfo]
deps_providers.append(java_provider)
compile_jars.append(java_provider.compile_jars)
runtime_jars.append(java_provider.transitive_runtime_jars)

if not unused_dependency_checker_is_off:
add_labels_of_jars_to(
jars2labels,
dep_target,
[],
java_provider.compile_jars.to_list(),
)

if (not plus_one_deps_is_off) and (PlusOneDeps in dep_target):
plus_one_deps_compile_jars.append(
Expand All @@ -106,24 +103,21 @@ def _collect_jars_when_dependency_analyzer_is_on(dep_targets):
for dep_target in dep_targets:
# we require a JavaInfo for dependencies
# must use java_import or scala_import if you have raw files
if JavaInfo in dep_target:
java_provider = dep_target[JavaInfo]
deps_providers.append(java_provider)
current_dep_compile_jars = java_provider.compile_jars
current_dep_transitive_compile_jars = java_provider.transitive_compile_time_jars
runtime_jars.append(java_provider.transitive_runtime_jars)

compile_jars.append(current_dep_compile_jars)
transitive_compile_jars.append(current_dep_transitive_compile_jars)

add_labels_of_jars_to(
jars2labels,
dep_target,
current_dep_transitive_compile_jars.to_list(),
current_dep_compile_jars.to_list(),
)
else:
print("ignored dependency, has no JavaInfo: " + str(dep_target))
java_provider = dep_target[JavaInfo]
deps_providers.append(java_provider)
current_dep_compile_jars = java_provider.compile_jars
current_dep_transitive_compile_jars = java_provider.transitive_compile_time_jars
runtime_jars.append(java_provider.transitive_runtime_jars)

compile_jars.append(current_dep_compile_jars)
transitive_compile_jars.append(current_dep_transitive_compile_jars)

add_labels_of_jars_to(
jars2labels,
dep_target,
current_dep_transitive_compile_jars.to_list(),
current_dep_compile_jars.to_list(),
)

return struct(
compile_jars = depset(transitive = compile_jars),
Expand Down