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

jps: support dev kit module types (and all other ModuleBasedBuildTargetType)

Browse Source 
#KT-24500 fixed

Original commit: ec5110e1f4
This commit is contained in:
Sergey Rostov
2018-05-23 14:39:00 +03:00
parent bc37e46187
commit 79bf8f7c98
11 changed files with 89 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/platforms/TargetPlatform.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.jps.platforms
import com.intellij.openapi.util.Key
import org.jetbrains.jps.builders.ModuleBasedBuildTargetType
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType
import org.jetbrains.jps.incremental.CompileContext
import org.jetbrains.jps.incremental.ModuleBuildTarget
@@ -55,7 +56,7 @@ class KotlinBuildTargets internal constructor(val compileContext: CompileContext
}
operator fun get(target: ModuleBuildTarget): KotlinModuleBuilderTarget? {
if (target.module.moduleType != JpsJavaModuleType.INSTANCE) return null
if (target.targetType !is ModuleBasedBuildTargetType) return null
return byJpsModuleBuildTarget.computeIfAbsent(target) {
when (target.module.targetPlatform ?: detectTargetPlatform(target)) {