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

[Gradle] Cleanup IdeMultiplatformImportFactory.kt

Browse Source 
^KT-55112 Verification Pending
This commit is contained in:
Sebastian Sellmair
2022-11-28 17:24:25 +01:00
committed by Space Team
parent d6f9e62565
commit 80f22dda28
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImport.kt
+4
View File
@@ -151,6 +151,10 @@ interface IdeMultiplatformImport {
val isJvmAndAndroid = SourceSetConstraint { sourceSet -> val isJvmAndAndroid = SourceSetConstraint { sourceSet ->
sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(jvm, androidJvm) sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(jvm, androidJvm)
} }
val isAndroid = SourceSetConstraint { sourceSet ->
sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(androidJvm)
}
} }
} }
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/ide/IdeMultiplatformImportFactory.kt
+2 -6
View File
@@ -8,10 +8,8 @@ package org.jetbrains.kotlin.gradle.plugin.ide
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer import org.jetbrains.kotlin.gradle.idea.serialize.IdeaKotlinExtrasSerializer
import org.jetbrains.kotlin.gradle.kpm.idea.kotlinDebugKey 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.IdeMultiplatformImport.SourceSetConstraint
import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.* import org.jetbrains.kotlin.gradle.plugin.ide.dependencyResolvers.*
import org.jetbrains.kotlin.gradle.plugin.sources.internal
fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultiplatformImport { fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultiplatformImport {
return IdeMultiplatformImportImpl(extension).apply { return IdeMultiplatformImportImpl(extension).apply {
@@ -85,7 +83,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla
registerDependencyResolver( registerDependencyResolver(
resolver = IdeNativeStdlibDependencyResolver, resolver = IdeNativeStdlibDependencyResolver,
constraint = IdeMultiplatformImport.SourceSetConstraint.isNative, constraint = SourceSetConstraint.isNative,
phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Default, level = IdeMultiplatformImport.DependencyResolutionLevel.Default,
) )
@@ -93,9 +91,7 @@ fun IdeMultiplatformImport(extension: KotlinMultiplatformExtension): IdeMultipla
/* Overwrite android dependencies by empty resolver */ /* Overwrite android dependencies by empty resolver */
registerDependencyResolver( registerDependencyResolver(
resolver = IdeDependencyResolver.Empty, resolver = IdeDependencyResolver.Empty,
constraint = SourceSetConstraint { sourceSet -> constraint = SourceSetConstraint.isAndroid,
sourceSet.internal.compilations.map { it.platformType }.toSet() == setOf(androidJvm)
},
phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite level = IdeMultiplatformImport.DependencyResolutionLevel.Overwrite
) )