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

[IDE KN] Treat klib as Kotlin/Native library iff manifest contains builtins_platform==NATIVE

Browse Source
This commit is contained in:
Zalim Bashorov
2020-03-17 02:03:33 +03:00
parent d247dd21de
commit eaac5bdac4
19 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-native/src/org/jetbrains/kotlin/ide/konan/KotlinNativePluginUtil.kt
+3 -2
View File
@@ -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. * 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.KotlinLanguage
import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter
import org.jetbrains.kotlin.library.* import org.jetbrains.kotlin.library.*
import org.jetbrains.kotlin.library.impl.BuiltInsPlatform
import org.jetbrains.kotlin.library.impl.KotlinLibraryImpl import org.jetbrains.kotlin.library.impl.KotlinLibraryImpl
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
import org.jetbrains.kotlin.library.metadata.PackageAccessHandler import org.jetbrains.kotlin.library.metadata.PackageAccessHandler
@@ -100,7 +101,7 @@ internal val VirtualFile.isKonanLibraryRoot: Boolean
return false 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 // run check for library root too
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=stdlib unique_name=stdlib
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/CFNetwork/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=CFNetwork unique_name=CFNetwork
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_arm64/Foundation/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=Foundation unique_name=Foundation
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/CFNetwork/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=CFNetwork unique_name=CFNetwork
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/ios_x64/Foundation/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=Foundation unique_name=Foundation
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/linux/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=linux unique_name=linux
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/posix/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=posix unique_name=posix
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/linux_x64/zlib/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=zlib unique_name=zlib
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/Foundation/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=Foundation unique_name=Foundation
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/UIKit/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=UIKit unique_name=UIKit
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/objc/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=objc unique_name=objc
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/iconv/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=iconv unique_name=iconv
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/opengl32/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=opengl32 unique_name=opengl32
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/mingw_x64/windows/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=windows unique_name=windows
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/Foundation/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=Foundation unique_name=Foundation
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_arm32/WatchKit/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=WatchKit unique_name=WatchKit
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/Foundation/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=Foundation unique_name=Foundation
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE
idea/testData/gradle/nativeLibraries/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/watchos_x86/WatchKit/manifest
Vendored
+1
View File
@@ -1,2 +1,3 @@
unique_name=WatchKit unique_name=WatchKit
compiler_version=1.0.0 compiler_version=1.0.0
builtins_platform=NATIVE