From 45ebbede2f5a6f394d6d0ec04a8d3b695f3d939a Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Wed, 30 Nov 2022 16:52:13 +0100 Subject: [PATCH] [Gradle] Move native distribution dependency resolvers up KT-55189 --- .../ide/IdeMultiplatformImportFactory.kt | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 3455c6a10e9..75c9f099507 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 @@ -45,6 +45,20 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti level = IdeMultiplatformImport.DependencyResolutionLevel.Default ) + registerDependencyResolver( + resolver = IdeNativeStdlibDependencyResolver, + constraint = SourceSetConstraint.isNative, + phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, + level = IdeMultiplatformImport.DependencyResolutionLevel.Default, + ) + + registerDependencyResolver( + resolver = IdeNativePlatformDependencyResolver, + constraint = SourceSetConstraint.isNative, + phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, + level = IdeMultiplatformImport.DependencyResolutionLevel.Default + ) + registerDependencyResolver( resolver = IdeTransformedMetadataDependencyResolver, constraint = !SourceSetConstraint.isLeaf, @@ -77,20 +91,6 @@ internal fun IdeMultiplatformImport(extension: KotlinProjectExtension): IdeMulti level = IdeMultiplatformImport.DependencyResolutionLevel.Default ) - registerDependencyResolver( - resolver = IdeNativePlatformDependencyResolver, - constraint = SourceSetConstraint.isNative, - phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, - level = IdeMultiplatformImport.DependencyResolutionLevel.Default - ) - - registerDependencyResolver( - resolver = IdeNativeStdlibDependencyResolver, - constraint = SourceSetConstraint.isNative, - phase = IdeMultiplatformImport.DependencyResolutionPhase.BinaryDependencyResolution, - level = IdeMultiplatformImport.DependencyResolutionLevel.Default, - ) - /* Overwrite android dependencies by empty resolver */ registerDependencyResolver( resolver = IdeDependencyResolver.Empty,