From f8073eaded0712de98795552789b4e898d097379 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 3 Apr 2020 12:20:52 +0700 Subject: [PATCH] KLIB: Drop duplicated property keys declarations --- .../kotlin/native/interop/gen/jvm/main.kt | 1 + .../kotlin/konan/library/KonanLibrary.kt | 17 ----------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt index c1d7c9e65b8..5b6ebbac390 100644 --- a/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt +++ b/Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.konan.target.CompilerOutputKind import org.jetbrains.kotlin.konan.target.Distribution import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.library.KotlinLibrary +import org.jetbrains.kotlin.library.packageFqName import org.jetbrains.kotlin.library.resolver.impl.KotlinLibraryResolverImpl import org.jetbrains.kotlin.library.resolver.impl.libraryResolver import org.jetbrains.kotlin.library.toUnresolvedLibraries diff --git a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt index 55f97e1f3a6..6bc2934abd2 100644 --- a/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt +++ b/shared/src/library/kotlin/org/jetbrains/kotlin/konan/library/KonanLibrary.kt @@ -1,13 +1,9 @@ package org.jetbrains.kotlin.konan.library -import org.jetbrains.kotlin.konan.file.File -import org.jetbrains.kotlin.konan.properties.Properties import org.jetbrains.kotlin.konan.properties.propertyList import org.jetbrains.kotlin.library.* const val KLIB_PROPERTY_LINKED_OPTS = "linkerOpts" -const val KLIB_PROPERTY_INTEROP = "interop" -const val KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS = "exportForwardDeclarations" const val KLIB_PROPERTY_INCLUDED_HEADERS = "includedHeaders" interface TargetedLibrary { @@ -23,18 +19,5 @@ interface KonanLibrary : BitcodeLibrary, KotlinLibrary { val linkerOpts: List } -val KonanLibrary.isInterop - get() = manifestProperties.getProperty(KLIB_PROPERTY_INTEROP) == "true" - -val KonanLibrary.packageFqName: String? - get() = manifestProperties.getProperty(KLIB_PROPERTY_PACKAGE) - -val KonanLibrary.exportForwardDeclarations - get() = manifestProperties.propertyList(KLIB_PROPERTY_EXPORT_FORWARD_DECLARATIONS, escapeInQuotes = true) - .asSequence() - .map { it.trim() } - .filter { it.isNotEmpty() } - .toList() - val KonanLibrary.includedHeaders get() = manifestProperties.propertyList(KLIB_PROPERTY_INCLUDED_HEADERS, escapeInQuotes = true)