From a7da605816f2625bf4a02f33fa496ceab04e97a0 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Sun, 26 Jan 2020 11:35:27 +0700 Subject: [PATCH] K/N: Drop unused part of "lite" KLIB API --- .../library/lite/LiteKonanDistribution.kt | 15 ---------- .../lite/LiteKonanDistributionProvider.kt | 24 --------------- .../library/lite/LiteKonanLibraryFacade.kt | 7 ++--- .../lite/LiteKonanDistributionTests.kt | 30 ------------------- .../external-libs/anotherBroken/manifest | 1 - .../testData/external-libs/correct/manifest | 1 - .../yetAnotherBroken/not-a-manifest | 1 - .../klib/common/stdlib/manifest | 1 - .../klib/platform/macos_x64/bar/manifest | 1 - .../klib/platform/macos_x64/baz/manifest | 1 - .../klib/platform/macos_x64/broken/manifest | 3 +- .../klib/platform/macos_x64/foo/manifest | 1 - 12 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistribution.kt delete mode 100644 konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionProvider.kt delete mode 100644 konan/library-reader/test/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionTests.kt diff --git a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistribution.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistribution.kt deleted file mode 100644 index ebc94261ce2..00000000000 --- a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistribution.kt +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright 2010-2019 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. - */ - -package org.jetbrains.kotlin.konan.library.lite - -import org.jetbrains.kotlin.konan.CompilerVersion -import java.io.File - -class LiteKonanDistribution( - val distributionHome: File, - val konanVersion: CompilerVersion, - val konanVersionString: String -) diff --git a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionProvider.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionProvider.kt deleted file mode 100644 index 7aa389b8660..00000000000 --- a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionProvider.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2019 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. - */ - -package org.jetbrains.kotlin.konan.library.lite - -import org.jetbrains.kotlin.konan.CompilerVersion -import org.jetbrains.kotlin.konan.library.KONAN_STDLIB_NAME -import org.jetbrains.kotlin.konan.library.konanCommonLibraryPath -import java.io.File - -object LiteKonanDistributionProvider { - fun getDistribution(konanHomeDir: File): LiteKonanDistribution? { - val stdlib = LiteKonanLibraryFacade.getDistributionLibraryProvider(konanHomeDir) - .getLibrary(konanHomeDir.resolve(konanCommonLibraryPath(KONAN_STDLIB_NAME))) as? LiteKonanLibraryImpl ?: return null - - return LiteKonanDistribution( - konanHomeDir, - CompilerVersion.fromString(stdlib.compilerVersion), - stdlib.compilerVersion - ) - } -} diff --git a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanLibraryFacade.kt b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanLibraryFacade.kt index 37692431165..3c3e3094296 100644 --- a/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanLibraryFacade.kt +++ b/konan/library-reader/src/org/jetbrains/kotlin/konan/library/lite/LiteKonanLibraryFacade.kt @@ -40,12 +40,10 @@ private object DefaultLiteKonanLibraryProvider : LiteKonanLibraryProvider { val manifest = loadManifest(libraryPath) ?: return null val name = manifest.getProperty(KLIB_PROPERTY_UNIQUE_NAME) ?: return null - val compilerVersion = manifest.getProperty(KLIB_PROPERTY_COMPILER_VERSION) ?: return null return LiteKonanLibraryImpl( path = libraryPath, - name = name, - compilerVersion = compilerVersion + name = name ) } @@ -129,8 +127,7 @@ private class FromDistributionLiteKonanLibraryProvider(customKonanHomeDir: File? internal class LiteKonanLibraryImpl( override val path: File, - override val name: String, - internal val compilerVersion: String + override val name: String ) : LiteKonanLibrary { override var platform: String? = null override var sourcePaths: Collection = emptyList() diff --git a/konan/library-reader/test/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionTests.kt b/konan/library-reader/test/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionTests.kt deleted file mode 100644 index f912988cffb..00000000000 --- a/konan/library-reader/test/org/jetbrains/kotlin/konan/library/lite/LiteKonanDistributionTests.kt +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2010-2019 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. - */ - -package org.jetbrains.kotlin.konan.library.lite - -import org.jetbrains.kotlin.konan.CompilerVersion -import org.junit.Test -import org.junit.Assert.* - -class LiteKonanDistributionTests { - - @Test - fun testDistribution() { - val distribution = LiteKonanDistributionProvider.getDistribution(konanHomeDir) - ?: error("Could not load Kotlin/Native distribution info from $konanHomeDir") - - assertEquals("Kotlin/Native distribution home", konanHomeDir, distribution.distributionHome) - assertEquals("Kotlin/Native version string", expectedVersionString, distribution.konanVersionString) - assertEquals("Kotlin/Native version", expectedVersion, distribution.konanVersion) - } - - private companion object { - const val expectedVersionString = "1.2.3-release-5678" - - val expectedVersion: CompilerVersion - get() = CompilerVersion.fromString(expectedVersionString) - } -} diff --git a/konan/library-reader/testData/external-libs/anotherBroken/manifest b/konan/library-reader/testData/external-libs/anotherBroken/manifest index e03519b45fc..dbb0d8cc2f9 100644 --- a/konan/library-reader/testData/external-libs/anotherBroken/manifest +++ b/konan/library-reader/testData/external-libs/anotherBroken/manifest @@ -1,2 +1 @@ SPOILED_unique_name=anotherBroken -compiler_version=1.2.3 diff --git a/konan/library-reader/testData/external-libs/correct/manifest b/konan/library-reader/testData/external-libs/correct/manifest index 989131422c1..b647fb29615 100644 --- a/konan/library-reader/testData/external-libs/correct/manifest +++ b/konan/library-reader/testData/external-libs/correct/manifest @@ -1,2 +1 @@ unique_name=correct -compiler_version=1.2.3-eap-45 diff --git a/konan/library-reader/testData/external-libs/yetAnotherBroken/not-a-manifest b/konan/library-reader/testData/external-libs/yetAnotherBroken/not-a-manifest index 05294b09bf5..cc588c02ea2 100644 --- a/konan/library-reader/testData/external-libs/yetAnotherBroken/not-a-manifest +++ b/konan/library-reader/testData/external-libs/yetAnotherBroken/not-a-manifest @@ -1,2 +1 @@ unique_name=yetAnotherBroken -compiler_version=1.2-eap-8879 diff --git a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest index e7b15ab54c9..4bf7dbc380b 100644 --- a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest +++ b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest @@ -1,2 +1 @@ unique_name=stdlib -compiler_version=1.2.3-release-5678 diff --git a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest index e6b8521fcb4..4e747075a10 100644 --- a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest +++ b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest @@ -1,2 +1 @@ unique_name=bar -compiler_version=1.2-eap-8879 diff --git a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest index 73fe57ce5d2..78bbd977bf2 100644 --- a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest +++ b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest @@ -1,2 +1 @@ unique_name=baz -compiler_version=1.3.1-dev-9301 diff --git a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest index 525addbe617..41f76f2dbcc 100644 --- a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest +++ b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest @@ -1,2 +1 @@ -unique_name=broken -SPOILED_compiler_version=1.2.3 +SPOILED_unique_name=broken diff --git a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest index c99f36dbd55..549b10e207a 100644 --- a/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest +++ b/konan/library-reader/testData/kotlin-native-data-dir/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest @@ -1,2 +1 @@ unique_name=foo -compiler_version=1.3-release-1234