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

Fix compilation of plugin projects in JPS

Browse Source 
#KT-25218 fixed
This commit is contained in:
Alexey Tsvetkov
2018-07-03 19:37:33 +03:00
parent 285912f556
commit f438b7501c
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+3 -1
View File
@@ -680,8 +680,10 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
fun testDevKitProject() { fun testDevKitProject() {
initProject(JVM_MOCK_RUNTIME) initProject(JVM_MOCK_RUNTIME)
assertEquals(myProject.modules.single().moduleType, JpsPluginModuleType.INSTANCE) val module = myProject.modules.single()
assertEquals(module.moduleType, JpsPluginModuleType.INSTANCE)
buildAllModules().assertSuccessful() buildAllModules().assertSuccessful()
assertFilesExistInOutput(module, "TestKt.class")
} }
fun testAccessToInternalInProductionFromTests() { fun testAccessToInternalInProductionFromTests() {
jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.jps.platforms package org.jetbrains.kotlin.jps.platforms
import com.intellij.openapi.util.Key import com.intellij.openapi.util.Key
import org.jetbrains.jps.builders.ModuleBasedBuildTargetType
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.CompileContext
import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.ModuleBuildTarget
@@ -55,7 +56,7 @@ class KotlinBuildTargets internal constructor(val compileContext: CompileContext
} }
operator fun get(target: ModuleBuildTarget): KotlinModuleBuildTarget<*>? { operator fun get(target: ModuleBuildTarget): KotlinModuleBuildTarget<*>? {
if (target.module.moduleType != JpsJavaModuleType.INSTANCE) return null if (target.targetType !is ModuleBasedBuildTargetType) return null
return byJpsModuleBuildTarget.computeIfAbsent(target) { return byJpsModuleBuildTarget.computeIfAbsent(target) {
when (target.module.targetPlatform ?: detectTargetPlatform(target)) { when (target.module.targetPlatform ?: detectTargetPlatform(target)) {