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

Configuration: Add migration of JPS project to new non-jvm source roots

Browse Source 
Original commit: d2bfb8caec
This commit is contained in:
Alexey Sedunov
2018-04-11 12:57:22 +03:00
parent 21772d2a14
commit 8a7a289cec
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt
+7 -2
View File
@@ -25,6 +25,7 @@ import org.jdom.Element
import org.jdom.Text import org.jdom.Text
import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.arguments.*
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import java.lang.reflect.Modifier import java.lang.reflect.Modifier
import kotlin.reflect.KClass import kotlin.reflect.KClass
import kotlin.reflect.full.superclasses import kotlin.reflect.full.superclasses
@@ -93,11 +94,15 @@ private fun readV1Config(element: Element): KotlinFacetSettings {
} }
} }
fun Element.getFacetPlatformByConfigurationElement(): TargetPlatformKind<*> {
val platformName = getAttributeValue("platform")
return TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == platformName } ?: TargetPlatformKind.DEFAULT_PLATFORM
}
private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings { private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings {
return KotlinFacetSettings().apply { return KotlinFacetSettings().apply {
element.getAttributeValue("useProjectSettings")?.let { useProjectSettings = it.toBoolean() } element.getAttributeValue("useProjectSettings")?.let { useProjectSettings = it.toBoolean() }
val platformName = element.getAttributeValue("platform") val platformKind = element.getFacetPlatformByConfigurationElement()
val platformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == platformName } ?: TargetPlatformKind.DEFAULT_PLATFORM
element.getChild("implements")?.let { element.getChild("implements")?.let {
val items = it.getChildren("implement") val items = it.getChildren("implement")
implementedModuleNames = if (items.isNotEmpty()) { implementedModuleNames = if (items.isNotEmpty()) {