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

[Gradle, Import] Added externalSystemId into facet for mpp projects

Browse Source 
#KT-39803 Fixed
This commit is contained in:
Yaroslav Chernyshev
2020-07-09 19:04:44 +03:00
parent e5b0498eb6
commit bb8f857809
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinSourceSetDataService.kt
+6 -3
View File
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
import org.jetbrains.kotlin.platform.konan.NativePlatforms import org.jetbrains.kotlin.platform.konan.NativePlatforms
import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData import org.jetbrains.plugins.gradle.model.data.BuildScriptClasspathData
import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
import org.jetbrains.plugins.gradle.util.GradleConstants
class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetData, Void>() { class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetData, Void>() {
override fun getTargetDataKey() = GradleSourceSetData.KEY override fun getTargetDataKey() = GradleSourceSetData.KEY
@@ -122,8 +123,11 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
val coroutinesProperty = CoroutineSupport.byCompilerArgument( val coroutinesProperty = CoroutineSupport.byCompilerArgument(
mainModuleNode.coroutines ?: findKotlinCoroutinesProperty(ideModule.project) mainModuleNode.coroutines ?: findKotlinCoroutinesProperty(ideModule.project)
) )
val compilerArguments = kotlinSourceSet.compilerArguments
val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false) // Used ID is the same as used in org/jetbrains/kotlin/idea/configuration/KotlinGradleSourceSetDataService.kt:280
// because this DataService was separated from KotlinGradleSourceSetDataService for MPP projects only
val id = if (compilerArguments?.multiPlatform == true) GradleConstants.SYSTEM_ID.id else null
val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false, id)
kotlinFacet.configureFacet( kotlinFacet.configureFacet(
compilerVersion, compilerVersion,
coroutinesProperty, coroutinesProperty,
@@ -134,7 +138,6 @@ class KotlinSourceSetDataService : AbstractProjectDataService<GradleSourceSetDat
kotlinSourceSet.dependsOn kotlinSourceSet.dependsOn
) )
val compilerArguments = kotlinSourceSet.compilerArguments
val defaultCompilerArguments = kotlinSourceSet.defaultCompilerArguments val defaultCompilerArguments = kotlinSourceSet.defaultCompilerArguments
if (compilerArguments != null) { if (compilerArguments != null) {
applyCompilerArgumentsToFacet( applyCompilerArgumentsToFacet(