azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Avoid having -d and -module set at the same time"

Browse Source 
This reverts commit ac241e267648e9344d718c3a44446c6e13d8d2e4.
This commit is contained in:
Alexey Tsvetkov
2017-01-31 19:05:56 +03:00
parent 2d88419c38
commit de24e68adc
6 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+3 -7
View File
@@ -63,7 +63,6 @@ import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.locks.ReentrantReadWriteLock
import java.util.logging.Level
import java.util.logging.Logger
import kotlin.collections.HashSet
import kotlin.comparisons.compareByDescending
import kotlin.concurrent.read
import kotlin.concurrent.schedule
@@ -424,13 +423,10 @@ class CompileServiceImpl(
}
parsedModule
}
val javaSourceRoots = parsedModule.modules.flatMapTo(HashSet()) { it.getJavaSourceRoots().map { File(it.path) } }
val allKotlinFiles = parsedModule.modules.flatMap { it.getSourceFiles().map(::File) }
k2jvmArgs.friendPaths = parsedModule.modules.flatMap(Module::getFriendPaths).toTypedArray()
assert(parsedModule.modules.size == 1) { "More than one module description in ${k2jvmArgs.module}" }
val module = parsedModule.modules.first()
val javaSourceRoots = module.getJavaSourceRoots().mapTo(HashSet()) { File(it.path) }
val allKotlinFiles = module.getSourceFiles().map(::File)
k2jvmArgs.friendPaths = module.getFriendPaths().toTypedArray()
k2jvmArgs.destination = module.getOutputDirectory()
val changedFiles = if (incrementalCompilationOptions.areFileChangesKnown) {
ChangedFiles.Known(incrementalCompilationOptions.modifiedFiles!!, incrementalCompilationOptions.deletedFiles!!)
}