From f9d9d7f7370108954436e09a873ecda8dadfc19f Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 2 Apr 2019 16:27:31 +0700 Subject: [PATCH] Keep K/N stdlib upper than platform libraries in IDEA UI --- .../jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt index 6b18b349813..da45b977355 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/nativeLibrariesUtil.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.gradle.KotlinMPPGradleModel import org.jetbrains.kotlin.idea.configuration.DependencySubstitute.NoSubstitute import org.jetbrains.kotlin.idea.configuration.DependencySubstitute.YesSubstitute import org.jetbrains.kotlin.idea.inspections.gradle.findKotlinPluginVersion +import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME import org.jetbrains.kotlin.konan.library.lite.LiteKonanLibraryInfoProvider import org.jetbrains.plugins.gradle.ExternalDependencyId import org.jetbrains.plugins.gradle.model.DefaultExternalLibraryDependency @@ -156,6 +157,7 @@ internal class KotlinNativeLibrariesDependencySubstitutor( val newLibraryName = "$KOTLIN_NATIVE_LIBRARY_PREFIX_PLUS_SPACE$nonNullKotlinVersion - ${libraryInfo.name}$platformNamePart" val substitute = DefaultExternalLibraryDependency().apply { + classpathOrder = if (libraryInfo.name == KONAN_STDLIB_NAME) -1 else 0 // keep stdlib upper name = newLibraryName packaging = DEFAULT_PACKAGING file = libraryFile