[jps] Fix Kotlin JPS commits compilation after cherry-pick from intellij/master

This commit is contained in:
Nikita Bobko
2021-11-19 18:21:48 +01:00
parent 29384c7a65
commit 01c82da8d2
8 changed files with 24 additions and 24 deletions
@@ -232,7 +232,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
ExpectActualTracker.DoNothing,
chunk,
messageCollector
)
) ?: return
val removedClasses = HashSet<String>()
for (target in kotlinChunk.targets) {
@@ -406,7 +406,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
exceptActualTracer,
chunk,
messageCollector
)
) ?: return ABORT
context.testingContext?.buildLogger?.compilingFiles(
kotlinDirtyFilesHolder.allDirtyFiles,
@@ -568,7 +568,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
exceptActualTracer: ExpectActualTracker,
chunk: ModuleChunk,
messageCollector: MessageCollectorAdapter
): JpsCompilerEnvironment {
): JpsCompilerEnvironment? {
val compilerServices = with(Services.Builder()) {
kotlinModuleBuilderTarget.makeServices(this, incrementalCaches, lookupTracker, exceptActualTracer)
build()