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

jps: support multiplatform incremental compilation for jvm and js

Browse Source 
- support common modules metadata compilation under flag (it is not required since all common source roots are included transitively for now)
- introduce expect actual tracker in jps: move implementation from gradle to build-common
- support js incremental compilation: move implementation from gradle to build-common
This commit is contained in:
Sergey Rostov
2018-04-03 13:00:06 +03:00
parent 4a6554a36d
commit 0eee2729cd
89 changed files with 5829 additions and 870 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+12 -2
View File
@@ -148,6 +148,7 @@ import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest
import org.jetbrains.kotlin.jps.build.*
import org.jetbrains.kotlin.jps.build.android.AbstractAndroidJpsTestCase
import org.jetbrains.kotlin.jps.build.dependeciestxt.actualizeMppJpsIncTestCaseDirs
import org.jetbrains.kotlin.jps.incremental.AbstractJsProtoComparisonTest
import org.jetbrains.kotlin.jps.incremental.AbstractJvmProtoComparisonTest
import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest
@@ -929,6 +930,15 @@ fun main(args: Array<String>) {
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
}
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
testClass<AbstractMultiplatformJpsTest> {
model(
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
testClassName = "MultiplatformMultiModule", recursive = true
)
}
testClass<AbstractJvmLookupTrackerTest> {
model("incremental/lookupTracker/jvm", extension = null, recursive = false)
}
@@ -990,10 +1000,10 @@ fun main(args: Array<String>) {
}
testClass<AbstractIncrementalMultiplatformJvmCompilerRunnerTest> {
model("incremental/multiplatform", extension = null, excludeParentDirs = true)
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
}
testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
model("incremental/multiplatform", extension = null, excludeParentDirs = true)
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
}
}
generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.172
+11 -2
View File
@@ -919,6 +919,15 @@ fun main(args: Array<String>) {
model("incremental/classHierarchyAffected", extension = null, excludeParentDirs = true)
}
actualizeMppJpsIncTestCaseDirs(testDataRoot, "incremental/multiplatform/multiModule")
testClass<AbstractMultiplatformJpsTest> {
model(
"incremental/multiplatform/multiModule", extension = null, excludeParentDirs = true,
testClassName = "MultiplatformMultiModule", recursive = true
)
}
testClass<AbstractJvmLookupTrackerTest> {
model("incremental/lookupTracker/jvm", extension = null, recursive = false)
}
@@ -980,10 +989,10 @@ fun main(args: Array<String>) {
}
testClass<AbstractIncrementalMultiplatformJvmCompilerRunnerTest> {
model("incremental/multiplatform", extension = null, excludeParentDirs = true)
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
}
testClass<AbstractIncrementalMultiplatformJsCompilerRunnerTest> {
model("incremental/multiplatform", extension = null, excludeParentDirs = true)
model("incremental/multiplatform/singleModule", extension = null, excludeParentDirs = true)
}
}