Skip to content

Commit fbff8c6

Browse files
authored
Simplify phase_compile return struct (#974)
1 parent 32c9ad0 commit fbff8c6

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

scala/private/phases/phase_compile.bzl

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,9 @@ def _phase_compile(
162162

163163
# TODO: simplify the return values and use provider
164164
return struct(
165-
class_jar = out.class_jar,
166165
coverage = out.coverage.external,
167-
full_jars = out.full_jars,
168166
files = depset(out.full_jars),
169-
ijar = out.ijar,
170-
ijars = out.ijars,
171167
rjars = depset(out.full_jars, transitive = [rjars]),
172-
java_jar = out.java_jar,
173-
source_jars = _pack_source_jars(ctx) + out.source_jars,
174168
merged_provider = out.merged_provider,
175169
external_providers = dicts.add(out.coverage.providers_dict, {
176170
"JavaInfo": out.merged_provider,
@@ -198,13 +192,8 @@ def _compile_or_empty(
198192

199193
# no need to build ijar when empty
200194
return struct(
201-
class_jar = ctx.outputs.jar,
202195
coverage = _empty_coverage_struct,
203196
full_jars = [ctx.outputs.jar],
204-
ijar = ctx.outputs.jar,
205-
ijars = [ctx.outputs.jar],
206-
java_jar = False,
207-
source_jars = [],
208197
merged_provider = scala_compilation_provider,
209198
)
210199
else:
@@ -283,12 +272,8 @@ def _compile_or_empty(
283272
)
284273

285274
full_jars = [ctx.outputs.jar]
286-
ijars = [ijar]
287-
source_jars = []
288275
if java_jar:
289276
full_jars += [java_jar.jar]
290-
ijars += [java_jar.ijar]
291-
source_jars += java_jar.source_jars
292277

293278
coverage = _jacoco_offline_instrument(ctx, ctx.outputs.jar)
294279

@@ -298,13 +283,8 @@ def _compile_or_empty(
298283
merged_provider = scala_compilation_provider
299284

300285
return struct(
301-
class_jar = ctx.outputs.jar,
302286
coverage = coverage,
303287
full_jars = full_jars,
304-
ijar = ijar,
305-
ijars = ijars,
306-
java_jar = java_jar,
307-
source_jars = source_jars,
308288
merged_provider = merged_provider,
309289
)
310290

0 commit comments

Comments
 (0)