From 80f22dda284bfbe1fab7b5d85ecf345c98e7f17e Mon Sep 17 00:00:00 2001
From: Sebastian Sellmair <sebastian.sellmair@jetbrains.com>
Date: Mon, 28 Nov 2022 17:24:25 +0100
Subject: [PATCH] [Gradle] Cleanup IdeMultiplatformImportFactory.kt

^KT-55112 Verification Pending
---
 .../kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt    | 4 ++++
 .../gradle/plugin/ide/IdeMultiplatformImportFactory.kt    | 8 ++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt
index d8ad7e111c7..a82c649f1c3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt
@@ -151,6 +151,10 @@ interface IdeMultiplatformImport {
             val isJvmAndAndroid = SourceSetConstraint { sourceSet ->
                 sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(jvm, androidJvm)
             }
+
+            val isAndroid = SourceSetConstraint { sourceSet ->
+                sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(androidJvm)
+            }
         }
     }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
index 3a61b5a9332..25bf82e2c14 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
@@ -8,10 +8,8 @@ package org.jetbrains.kotlin.gradle.plugin.ide
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
 import org.jetbrains.kotlin.gradle.kpm.idea.kotlinDebugKey
-import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType.androidJvm
 import org.jetbrains.kotlin.gradle.plugin.ide.IdeMultiplatformImport.SourceSetConstraint
 import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.*
-import org.jetbrains.kotlin.gradle.plugin.sources.internal
 
 fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultiplatformImport {
     return IdeMultiplatformImportImpl(extension).apply {
@@ -85,7 +83,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla
 
         registerDependencyResolver(
             resolver = IdeNativeStdlibDependencyResolver,
-            constraint = IdeMultiplatformImport.SourceSetConstraint.isNative,
+            constraint = SourceSetConstraint.isNative,
             phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
             level = IdeMultiplatformImport.DependencyResolutionLevel.Default,
         )
@@ -93,9 +91,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla
         /* Overwrite android dependencies by empty resolver */
         registerDependencyResolver(
             resolver = IdeDependencyResolver.Empty,
-            constraint = SourceSetConstraint { sourceSet ->
-                sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(androidJvm)
-            },
+            constraint = SourceSetConstraint.isAndroid,
             phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
             level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite
         )