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

Restore a Kotlin facet version to keep serialized settings compatibility

Browse Source 
And add a fallback for ExternalSystemTestRunTask serialization.
This commit is contained in:
Konstantin Tskhovrebov
2023-02-13 15:53:01 +01:00
committed by Space Team
parent e77f5c7764
commit aae0cf9e30
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt
+11 -6
View File
@@ -113,21 +113,26 @@ interface ExternalSystemRunTask {
val taskName: String val taskName: String
val externalSystemProjectId: String val externalSystemProjectId: String
val targetName: String val targetName: String
val kotlinPlatformId: String //one of id org.jetbrains.kotlin.idea.projectModel.KotlinPlatform val kotlinPlatformId: String? //one of id org.jetbrains.kotlin.idea.projectModel.KotlinPlatform
} }
data class ExternalSystemTestRunTask( data class ExternalSystemTestRunTask(
override val taskName: String, override val taskName: String,
override val externalSystemProjectId: String, override val externalSystemProjectId: String,
override val targetName: String, override val targetName: String,
override val kotlinPlatformId: String, override val kotlinPlatformId: String?,
) : ExternalSystemRunTask { ) : ExternalSystemRunTask {
fun toStringRepresentation() = "$taskName|$externalSystemProjectId|$targetName|$kotlinPlatformId" fun toStringRepresentation() = buildString {
append("$taskName|$externalSystemProjectId|$targetName")
kotlinPlatformId?.let { append("|$it") }
}
companion object { companion object {
fun fromStringRepresentation(line: String) = fun fromStringRepresentation(line: String) = line.split("|").let {
line.split("|").let { if (it.size == 4) ExternalSystemTestRunTask(it[0], it[1], it[2], it[3]) else null } if (it.size < 3) null
else ExternalSystemTestRunTask(it[0], it[1], it[2], it.getOrNull(3))
}
} }
override fun toString() = "$taskName@$externalSystemProjectId [$targetName]" override fun toString() = "$taskName@$externalSystemProjectId [$targetName]"
@@ -155,7 +160,7 @@ data class ExternalSystemNativeMainRunTask(
class KotlinFacetSettings { class KotlinFacetSettings {
companion object { companion object {
// Increment this when making serialization-incompatible changes to configuration data // Increment this when making serialization-incompatible changes to configuration data
val CURRENT_VERSION = 6 val CURRENT_VERSION = 5
val DEFAULT_VERSION = 0 val DEFAULT_VERSION = 0
} }