From db743aa6e816d321c8a44712e9f959b7e0c8c24d Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 16 Jul 2019 23:34:28 +0300 Subject: [PATCH] Calculation of supported platforms in AndroidSourceSetDataService fixed for IDEA versions 183 and below. A deep copy of MPP model for Android source sets is created --- .../android/configure/KotlinAndroidMPPGradleProjectResolver.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt index 63e7009f71f..f57b5150df8 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/configure/KotlinAndroidMPPGradleProjectResolver.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.gradle.KotlinMPPGradleModelBuilder import org.jetbrains.kotlin.gradle.KotlinPlatform import org.jetbrains.kotlin.idea.configuration.KotlinAndroidSourceSetData import org.jetbrains.kotlin.idea.configuration.KotlinMPPGradleProjectResolver +import org.jetbrains.kotlin.idea.configuration.getMppModel import org.jetbrains.kotlin.idea.configuration.kotlinSourceSet import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension @@ -78,7 +79,7 @@ class KotlinAndroidMPPGradleProjectResolver : AbstractProjectResolverExtension() KotlinMPPGradleProjectResolver.initializeModuleData(gradleModule, mainModuleData, projectDataNode, resolverCtx) - val mppModel = resolverCtx.getExtraProject(gradleModule, KotlinMPPGradleModel::class.java) ?: return + val mppModel = resolverCtx.getMppModel(gradleModule) ?: return val androidSourceSets = mppModel .targets