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

Fix inter-project IC for android->non-android dependency

Browse Source 
#KT-24832 fixed
This commit is contained in:
Alexey Tsvetkov
2018-06-22 04:12:25 +03:00
parent 9071a70a44
commit 2065f8e6fe
19 changed files with 195 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/multiproject/ModulesApiHistory.kt
+9
View File
@@ -110,6 +110,15 @@ open class ModulesApiHistoryJvm(protected val modulesInfo: IncrementalModuleInfo
}
class ModulesApiHistoryAndroid(modulesInfo: IncrementalModuleInfo) : ModulesApiHistoryJvm(modulesInfo) {
private val delegate = ModulesApiHistoryJvm(modulesInfo)
override fun historyFilesForChangedFiles(changedFiles: Set<File>): Either<Set<File>> {
val historyFromDelegate = delegate.historyFilesForChangedFiles(changedFiles)
if (historyFromDelegate is Either.Success<Set<File>>) return historyFromDelegate
return super.historyFilesForChangedFiles(changedFiles)
}
override fun getBuildHistoryFilesForJar(jar: File): Either<Set<File>> {
// Module detection is expensive, so we don't don it for jars outside of project dir
if (!projectRootPath.isParentOf(jar)) return Either.Error("Non-project jar is modified $jar")
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/multiproject/ModulesApiHistoryAndroidTest.kt
+7 -3
View File
@@ -24,8 +24,10 @@ class ModulesApiHistoryAndroidTest {
val tmpFolder = TemporaryFolder()
private lateinit var appRoot: File
private lateinit var appKotlinDestination: File
private lateinit var appHistory: File
private lateinit var libRoot: File
private lateinit var libKotlinDestination: File
private lateinit var libHistory: File
private lateinit var androidHistory: ModulesApiHistoryAndroid
@@ -36,23 +38,25 @@ class ModulesApiHistoryAndroidTest {
appRoot = projectRoot.resolve("app")
appHistory = appRoot.resolve("build/tmp/kotlin/app_history.bin")
appKotlinDestination = appRoot.resolve("build/tmp/kotlin-classes").apply { mkdirs() }
val appEntry = IncrementalModuleEntry(":app", "app", appRoot.resolve("build"), appHistory)
appRoot.resolve("build/intermediates/classes/meta-inf/").apply {
mkdirs();
mkdirs()
resolve("app.kotlin_module").createNewFile()
}
libRoot = projectRoot.resolve("lib")
libHistory = libRoot.resolve("lib/build/tmp/kotlin/lib_history.bin")
libKotlinDestination = libRoot.resolve("build/tmp/kotlin-classes").apply { mkdirs() }
val libEntry = IncrementalModuleEntry(":lib", "lib", libRoot.resolve("build"), libHistory)
libRoot.resolve("build/intermediates/classes/meta-inf/").apply {
mkdirs();
mkdirs()
resolve("lib.kotlin_module").createNewFile()
}
val info = IncrementalModuleInfo(
projectRoot = projectRoot,
dirToModule = mapOf(appRoot to appEntry, libRoot to libEntry),
dirToModule = mapOf(appKotlinDestination to appEntry, libKotlinDestination to libEntry),
nameToModules = mapOf("app" to setOf(appEntry), "lib" to setOf(libEntry)),
jarToClassListFile = mapOf()
)