diff --git a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt index ee6ca27b1fe..d0e734441ad 100644 --- a/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt +++ b/idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter import org.jetbrains.kotlin.library.* +import org.jetbrains.kotlin.library.impl.BuiltInsPlatform import org.jetbrains.kotlin.library.impl.KotlinLibraryImpl import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.library.metadata.PackageAccessHandler @@ -100,7 +101,7 @@ internal val VirtualFile.isKonanLibraryRoot: Boolean return false } - return manifestProperties.containsKey(KLIB_PROPERTY_UNIQUE_NAME) + return manifestProperties.getProperty(KLIB_PROPERTY_BUILTINS_PLATFORM) == BuiltInsPlatform.NATIVE.name } // run check for library root too diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest index d7ca70f255d..565dc4094bf 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest @@ -1,2 +1,3 @@ unique_name=stdlib compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/CFNetwork/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/CFNetwork/manifest index 04eafdaaab3..8b31cb71d33 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/CFNetwork/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/CFNetwork/manifest @@ -1,2 +1,3 @@ unique_name=CFNetwork compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/Foundation/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/Foundation/manifest index 1b3f1d76d06..2bd05037d94 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/Foundation/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/Foundation/manifest @@ -1,2 +1,3 @@ unique_name=Foundation compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/CFNetwork/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/CFNetwork/manifest index 04eafdaaab3..8b31cb71d33 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/CFNetwork/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/CFNetwork/manifest @@ -1,2 +1,3 @@ unique_name=CFNetwork compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/Foundation/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/Foundation/manifest index 1b3f1d76d06..2bd05037d94 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/Foundation/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/Foundation/manifest @@ -1,2 +1,3 @@ unique_name=Foundation compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/linux/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/linux/manifest index fe547e588da..2bd600bd268 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/linux/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/linux/manifest @@ -1,2 +1,3 @@ unique_name=linux compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/posix/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/posix/manifest index 61ff8eaad84..faac61a1e5a 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/posix/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/posix/manifest @@ -1,2 +1,3 @@ unique_name=posix compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/zlib/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/zlib/manifest index 41d1a93f62f..6a66658eaea 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/zlib/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/zlib/manifest @@ -1,2 +1,3 @@ unique_name=zlib compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/Foundation/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/Foundation/manifest index 1b3f1d76d06..2bd05037d94 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/Foundation/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/Foundation/manifest @@ -1,2 +1,3 @@ unique_name=Foundation compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/UIKit/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/UIKit/manifest index 90cff4e8e59..d57a70b056e 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/UIKit/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/UIKit/manifest @@ -1,2 +1,3 @@ unique_name=UIKit compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/objc/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/objc/manifest index 73151e9f5f4..51c564a7aea 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/objc/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/objc/manifest @@ -1,2 +1,3 @@ unique_name=objc compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/iconv/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/iconv/manifest index bf7792a92bb..429477061a7 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/iconv/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/iconv/manifest @@ -1,2 +1,3 @@ unique_name=iconv compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/opengl32/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/opengl32/manifest index d9c0f64899a..95fb27905c8 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/opengl32/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/opengl32/manifest @@ -1,2 +1,3 @@ unique_name=opengl32 compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/windows/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/windows/manifest index db111d5fe0a..1c11832b53b 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/windows/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/windows/manifest @@ -1,2 +1,3 @@ unique_name=windows compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/Foundation/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/Foundation/manifest index 1b3f1d76d06..2bd05037d94 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/Foundation/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/Foundation/manifest @@ -1,2 +1,3 @@ unique_name=Foundation compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/WatchKit/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/WatchKit/manifest index 9b6e3f1b4e5..29acd38bf78 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/WatchKit/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/WatchKit/manifest @@ -1,2 +1,3 @@ unique_name=WatchKit compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/Foundation/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/Foundation/manifest index 1b3f1d76d06..2bd05037d94 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/Foundation/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/Foundation/manifest @@ -1,2 +1,3 @@ unique_name=Foundation compiler_version=1.0.0 +builtins_platform=NATIVE diff --git a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/WatchKit/manifest b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/WatchKit/manifest index 9b6e3f1b4e5..29acd38bf78 100644 --- a/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/WatchKit/manifest +++ b/idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/WatchKit/manifest @@ -1,2 +1,3 @@ unique_name=WatchKit compiler_version=1.0.0 +builtins_platform=NATIVE