Fix forcing java to compile if kotlin classes are compiled

This commit is contained in:
Alexey Tsvetkov
2016-10-28 09:06:37 +03:00
parent fa6ed71fbd
commit 49bf1e5917
@@ -328,6 +328,8 @@ internal class IncrementalJvmCompilerRunner(
val compilerOutput = compileChanged(listOf(targetId), sourcesToCompile.toSet(), args, { caches.incrementalCache }, lookupTracker, messageCollector)
exitCode = compilerOutput.exitCode
val generatedClassFiles = compilerOutput.generatedFiles
anyClassesCompiled = anyClassesCompiled || generatedClassFiles.isNotEmpty() || removedKotlinSources.isNotEmpty()
if (exitCode == ExitCode.OK) {
dirtySourcesSinceLastTimeFile.delete()
@@ -337,8 +339,6 @@ internal class IncrementalJvmCompilerRunner(
break
}
val generatedClassFiles = compilerOutput.generatedFiles
if (compilationMode is CompilationMode.Incremental) {
val dirtySourcesSet = dirtySources.toHashSet()
val additionalDirtyFiles = additionalDirtyFiles(caches, generatedClassFiles).filter { it !in dirtySourcesSet }
@@ -391,8 +391,6 @@ internal class IncrementalJvmCompilerRunner(
buildDirtyLookupSymbols.addAll(dirtyLookupSymbols)
buildDirtyFqNames.addAll(dirtyClassFqNames)
anyClassesCompiled = anyClassesCompiled || generatedClassFiles.isNotEmpty() || removedKotlinSources.isNotEmpty()
}
if (exitCode == ExitCode.OK && compilationMode is CompilationMode.Incremental) {