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

Minor: refactor source set constraints

Browse Source
This commit is contained in:
Pavel Kirpichenkov
2023-02-09 16:08:09 +02:00
committed by Space Team
parent 1b8c517e1e
commit eb59f399de
1 changed files with 3 additions and 3 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/IdeMultiplatformImportFactory.kt
+3 -3
View File
@@ -88,7 +88,7 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
registerDependencyResolver( registerDependencyResolver(
resolver = IdePlatformCinteropDependencyResolver, resolver = IdePlatformCinteropDependencyResolver,
constraint = { sourceSet -> SourceSetConstraint.isSingleKotlinTarget(sourceSet) && SourceSetConstraint.isNative(sourceSet) }, constraint = SourceSetConstraint.isSingleKotlinTarget and SourceSetConstraint.isNative,
phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Default, level = IdeMultiplatformImport.DependencyResolutionLevel.Default,
) )
@@ -102,14 +102,14 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti
registerDependencyResolver( registerDependencyResolver(
resolver = IdeCInteropMetadataDependencyClasspathResolver, resolver = IdeCInteropMetadataDependencyClasspathResolver,
constraint = { SourceSetConstraint.isNative(it) && !SourceSetConstraint.isSingleKotlinTarget(it) }, constraint = SourceSetConstraint.isNative and !SourceSetConstraint.isSingleKotlinTarget,
phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Default, level = IdeMultiplatformImport.DependencyResolutionLevel.Default,
) )
registerDependencyResolver( registerDependencyResolver(
resolver = IdeProjectToProjectCInteropDependencyResolver, resolver = IdeProjectToProjectCInteropDependencyResolver,
constraint = { SourceSetConstraint.isNative(it) && SourceSetConstraint.isSingleKotlinTarget(it) }, constraint = SourceSetConstraint.isNative and SourceSetConstraint.isSingleKotlinTarget,
phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution,
level = IdeMultiplatformImport.DependencyResolutionLevel.Default, level = IdeMultiplatformImport.DependencyResolutionLevel.Default,
) )