From 623b554297a2bde887e87b68b3f9c82028c09b01 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 30 Jan 2020 14:16:53 +0700 Subject: [PATCH] IDE: Fix friendly displaying of K/N KLIBs with components Issue #KT-36213 --- .../configuration/klib/KlibInfoProvider.kt | 40 +++++-- .../klib/KlibInfoProviderTest.kt | 99 ++++++++++-------- .../klib/external-libs/anotherBroken/manifest | 1 - .../correct/{ => component}/manifest | 0 .../klib/external-libs/{invalid => invalid1} | 0 .../external-libs/invalid2/component/manifest | 1 + .../invalid3/component/not-a-manifest | 1 + .../yetAnotherBroken/not-a-manifest | 1 - .../common/kotlinx-cli/component1}/manifest | 0 .../common/kotlinx-cli/component2/manifest | 1 + .../klib/common/stdlib/component1}/manifest | 0 .../klib/common/stdlib/component2/manifest | 1 + .../macos_x64/bar/component1}/manifest | 0 .../macos_x64/bar/component2/manifest | 1 + .../macos_x64/baz/component1}/manifest | 0 .../macos_x64/baz/component2/not-a-manifest | 1 + .../macos_x64/foo/component1/not-a-manifest} | 0 .../macos_x64/foo/component2/manifest | 1 + .../klib/platform/macos_x64/invalid1} | 0 .../macos_x64/invalid2/component1/manifest | 1 + .../macos_x64/invalid2/component2/manifest | 1 + .../invalid3/component1/not-a-manifest | 1 + .../invalid3/component2/not-a-manifest | 1 + .../placeholder.kt | 0 .../sources/kotlin-something-unexpected-b.zip | Bin .../placeholder.kt | 0 .../placeholder.kt | 0 .../sources/kotlin-stdlib-native-sources.zip | Bin .../kotlin-test-anotations-common-sources.zip | Bin .../kotlin-test-common-sources/placeholder.kt | 0 .../sources/kotlinx-cli-common-sources.zip | Bin .../sources/kotlinx-cli-native-sources.zip | Bin .../common/kotlinx-cli/component/manifest | 1 + .../klib/common/stdlib/component/manifest | 1 + .../platform/macos_x64/bar/component/manifest | 1 + .../platform/macos_x64/baz/component/manifest | 1 + .../platform/macos_x64/foo/component/manifest | 1 + .../klib/platform/macos_x64/invalid1 | 0 .../macos_x64/invalid2/component/manifest | 1 + .../invalid3/component/not-a-manifest | 1 + .../placeholder.kt | 1 + .../sources/kotlin-something-unexpected-b.zip | Bin 0 -> 448 bytes .../placeholder.kt | 1 + .../placeholder.kt | 1 + .../sources/kotlin-stdlib-native-sources.zip | Bin 0 -> 444 bytes .../kotlin-test-anotations-common-sources.zip | Bin 0 -> 480 bytes .../kotlin-test-common-sources/placeholder.kt | 1 + .../sources/kotlinx-cli-common-sources.zip | Bin 0 -> 436 bytes .../sources/kotlinx-cli-native-sources.zip | Bin 0 -> 436 bytes .../klib/platform/macos_x64/broken/manifest | 1 - .../klib/common/kotlinx-cli/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/foo/manifest | 1 + .../klib/platform/macos_x64/invalid1 | 0 .../klib/platform/macos_x64/invalid2/manifest | 1 + .../macos_x64/invalid3/not-a-manifest | 1 + .../placeholder.kt | 1 + .../sources/kotlin-something-unexpected-b.zip | Bin 0 -> 448 bytes .../placeholder.kt | 1 + .../placeholder.kt | 1 + .../sources/kotlin-stdlib-native-sources.zip | Bin 0 -> 444 bytes .../kotlin-test-anotations-common-sources.zip | Bin 0 -> 480 bytes .../kotlin-test-common-sources/placeholder.kt | 1 + .../sources/kotlinx-cli-common-sources.zip | Bin 0 -> 436 bytes .../sources/kotlinx-cli-native-sources.zip | Bin 0 -> 436 bytes 67 files changed, 122 insertions(+), 53 deletions(-) delete mode 100644 idea/testData/configuration/klib/external-libs/anotherBroken/manifest rename idea/testData/configuration/klib/external-libs/correct/{ => component}/manifest (100%) rename idea/testData/configuration/klib/external-libs/{invalid => invalid1} (100%) create mode 100644 idea/testData/configuration/klib/external-libs/invalid2/component/manifest create mode 100644 idea/testData/configuration/klib/external-libs/invalid3/component/not-a-manifest delete mode 100644 idea/testData/configuration/klib/external-libs/yetAnotherBroken/not-a-manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component1}/manifest (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component2/manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/common/stdlib => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component1}/manifest (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component2/manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component1}/manifest (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component2/manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component1}/manifest (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component2/not-a-manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component1/not-a-manifest} (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component2/manifest rename idea/testData/configuration/klib/{kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid => klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1} (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component1/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component2/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component1/not-a-manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component2/not-a-manifest rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip (100%) rename idea/testData/configuration/klib/{ => klibsFromNativeDistributionWithMultipleComponentsRecognized}/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip (100%) create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component/manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component/not-a-manifest create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip create mode 100644 idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip delete mode 100644 idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/not-a-manifest create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip create mode 100644 idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProvider.kt index c4b2909ea6c..3c1d6171fb6 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProvider.kt @@ -60,7 +60,9 @@ class KlibInfoProvider( val libraryPath = libraryFile.toPath() val origin = detectOrigin(libraryPath) ?: return null - val manifest = loadProperties(libraryPath.resolve(KLIB_MANIFEST_FILE_NAME)) + + val manifestFile = findManifestFile(libraryPath) ?: return null + val manifest = loadProperties(manifestFile) val name = manifest.getProperty(KLIB_PROPERTY_UNIQUE_NAME) ?: return null val target = (detectTarget(libraryPath) ?: return null).result @@ -84,15 +86,39 @@ class KlibInfoProvider( else -> null } + private fun findManifestFile(libraryPath: Path): Path? { + libraryPath.resolve(KLIB_MANIFEST_FILE_NAME).let { propertiesPath -> + // KLIB layout without components + if (isRegularFile(propertiesPath)) return propertiesPath + } + + if (!isDirectory(libraryPath)) return null + + // look up through all components and find all manifest files + val candidates = newDirectoryStream(libraryPath).use { stream -> + stream.mapNotNull { componentPath -> + val candidate = componentPath.resolve(KLIB_MANIFEST_FILE_NAME) + if (isRegularFile(candidate)) candidate else null + } + } + + return when (candidates.size) { + 0 -> null + 1 -> candidates.single() + else -> { + // there are multiple components, let's take just the first one alphabetically + candidates.minBy { it.getName(it.nameCount - 2).toString() }!! + } + } + } + private fun loadProperties(propertiesPath: Path): Properties = cachedProperties.computeIfAbsent(propertiesPath) { val properties = Properties() - if (isRegularFile(propertiesPath)) { - try { - newInputStream(propertiesPath).use { properties.load(it) } - } catch (_: IOException) { - // do nothing - } + try { + newInputStream(propertiesPath).use { properties.load(it) } + } catch (_: IOException) { + // do nothing } properties diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProviderTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProviderTest.kt index 1f951328eff..69254f0e302 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProviderTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/configuration/klib/KlibInfoProviderTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.configuration.klib +import com.intellij.testFramework.PlatformTestUtil.getTestName import junit.framework.TestCase import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory @@ -12,7 +13,16 @@ import java.io.File class KlibInfoProviderTest : TestCase() { - fun testKlibsFromNativeDistributionRecognized() { + fun testOldStyleKlibsFromNativeDistributionRecognized() = doTest() + + fun testKlibsFromNativeDistributionWithSingleComponentRecognized() = doTest() + + fun testKlibsFromNativeDistributionWithMultipleComponentsRecognized() = doTest() + + private fun doTest() { + val kotlinNativeHome = testDataDir.resolve(getTestName(name, true)).resolve("kotlin-native-PLATFORM-VERSION") + val sourcesDir = kotlinNativeHome.resolve("sources") + val klibProvider = KlibInfoProvider(kotlinNativeHome = kotlinNativeHome) val potentialKlibPaths = mutableListOf() @@ -22,7 +32,12 @@ class KlibInfoProviderTest : TestCase() { val actualKlibs = potentialKlibPaths .mapNotNull { klibProvider.getKlibInfo(it) as? NativeDistributionKlibInfo } - .associateBy { it.path.relativeTo(testDataDir) } + .associateBy { it.path.relativeTo(kotlinNativeHome) } + + val expectedKlibsFromDistribution = generateExpectedKlibsFromDistribution( + kotlinNativeHome = kotlinNativeHome, + sourcesDir = sourcesDir + ) assertEquals(expectedKlibsFromDistribution.keys, actualKlibs.keys) for (klibPath in actualKlibs.keys) { @@ -40,52 +55,50 @@ class KlibInfoProviderTest : TestCase() { } } + private fun generateExpectedKlibsFromDistribution(kotlinNativeHome: File, sourcesDir: File) = listOf( + NativeDistributionKlibInfo( + path = kotlinNativeHome.resolve("klib", "common", "stdlib"), + sourcePaths = listOf( + sourcesDir.resolve("kotlin-stdlib-native-sources.zip"), + sourcesDir.resolve("kotlin-test-anotations-common-sources.zip") + ), + name = "stdlib", + target = null + ), + NativeDistributionKlibInfo( + path = kotlinNativeHome.resolve("klib", "common", "kotlinx-cli"), + sourcePaths = listOf( + sourcesDir.resolve("kotlinx-cli-common-sources.zip"), + sourcesDir.resolve("kotlinx-cli-native-sources.zip") + ), + name = "kotlinx-cli", + target = null + ), + NativeDistributionKlibInfo( + path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "foo"), + sourcePaths = emptyList(), + name = "foo", + target = KonanTarget.MACOS_X64 + ), + NativeDistributionKlibInfo( + path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "bar"), + sourcePaths = emptyList(), + name = "bar", + target = KonanTarget.MACOS_X64 + ), + NativeDistributionKlibInfo( + path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "baz"), + sourcePaths = emptyList(), + name = "baz", + target = KonanTarget.MACOS_X64 + ) + ).associateBy { it.path.relativeTo(kotlinNativeHome) } + companion object { private val testDataDir = File(getHomeDirectory() + "/idea/testData/configuration/klib") .also { assertTrue("Test data directory does not exist: $it", it.isDirectory) } private val externalLibsDir = testDataDir.resolve("external-libs") - private val kotlinNativeHome = testDataDir.resolve("kotlin-native-PLATFORM-VERSION") - private val sourcesDir = kotlinNativeHome.resolve("sources") - - private val expectedKlibsFromDistribution = listOf( - NativeDistributionKlibInfo( - path = kotlinNativeHome.resolve("klib", "common", "stdlib"), - sourcePaths = listOf( - sourcesDir.resolve("kotlin-stdlib-native-sources.zip"), - sourcesDir.resolve("kotlin-test-anotations-common-sources.zip") - ), - name = "stdlib", - target = null - ), - NativeDistributionKlibInfo( - path = kotlinNativeHome.resolve("klib", "common", "kotlinx-cli"), - sourcePaths = listOf( - sourcesDir.resolve("kotlinx-cli-common-sources.zip"), - sourcesDir.resolve("kotlinx-cli-native-sources.zip") - ), - name = "kotlinx-cli", - target = null - ), - NativeDistributionKlibInfo( - path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "foo"), - sourcePaths = emptyList(), - name = "foo", - target = KonanTarget.MACOS_X64 - ), - NativeDistributionKlibInfo( - path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "bar"), - sourcePaths = emptyList(), - name = "bar", - target = KonanTarget.MACOS_X64 - ), - NativeDistributionKlibInfo( - path = kotlinNativeHome.resolve("klib", "platform", "macos_x64", "baz"), - sourcePaths = emptyList(), - name = "baz", - target = KonanTarget.MACOS_X64 - ) - ).associateBy { it.path.relativeTo(testDataDir) } private fun File.children(): List = (listFiles()?.toList() ?: emptyList()) .also { assertTrue("$this does not have children files or directories", it.isNotEmpty()) } diff --git a/idea/testData/configuration/klib/external-libs/anotherBroken/manifest b/idea/testData/configuration/klib/external-libs/anotherBroken/manifest deleted file mode 100644 index dbb0d8cc2f9..00000000000 --- a/idea/testData/configuration/klib/external-libs/anotherBroken/manifest +++ /dev/null @@ -1 +0,0 @@ -SPOILED_unique_name=anotherBroken diff --git a/idea/testData/configuration/klib/external-libs/correct/manifest b/idea/testData/configuration/klib/external-libs/correct/component/manifest similarity index 100% rename from idea/testData/configuration/klib/external-libs/correct/manifest rename to idea/testData/configuration/klib/external-libs/correct/component/manifest diff --git a/idea/testData/configuration/klib/external-libs/invalid b/idea/testData/configuration/klib/external-libs/invalid1 similarity index 100% rename from idea/testData/configuration/klib/external-libs/invalid rename to idea/testData/configuration/klib/external-libs/invalid1 diff --git a/idea/testData/configuration/klib/external-libs/invalid2/component/manifest b/idea/testData/configuration/klib/external-libs/invalid2/component/manifest new file mode 100644 index 00000000000..35aada95d58 --- /dev/null +++ b/idea/testData/configuration/klib/external-libs/invalid2/component/manifest @@ -0,0 +1 @@ +SPOILED_unique_name=invalid2 diff --git a/idea/testData/configuration/klib/external-libs/invalid3/component/not-a-manifest b/idea/testData/configuration/klib/external-libs/invalid3/component/not-a-manifest new file mode 100644 index 00000000000..3e261515e77 --- /dev/null +++ b/idea/testData/configuration/klib/external-libs/invalid3/component/not-a-manifest @@ -0,0 +1 @@ +unique_name=invalid3 diff --git a/idea/testData/configuration/klib/external-libs/yetAnotherBroken/not-a-manifest b/idea/testData/configuration/klib/external-libs/yetAnotherBroken/not-a-manifest deleted file mode 100644 index cc588c02ea2..00000000000 --- a/idea/testData/configuration/klib/external-libs/yetAnotherBroken/not-a-manifest +++ /dev/null @@ -1 +0,0 @@ -unique_name=yetAnotherBroken diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component1/manifest similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component1/manifest diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component2/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component2/manifest new file mode 100644 index 00000000000..ce949fd9395 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component2/manifest @@ -0,0 +1 @@ +unique_name=kotlinx-cli diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component1/manifest similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component1/manifest diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component2/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component2/manifest new file mode 100644 index 00000000000..4bf7dbc380b --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component2/manifest @@ -0,0 +1 @@ +unique_name=stdlib diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component1/manifest similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component1/manifest diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component2/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component2/manifest new file mode 100644 index 00000000000..4e747075a10 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component2/manifest @@ -0,0 +1 @@ +unique_name=bar diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component1/manifest similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component1/manifest diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component2/not-a-manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component2/not-a-manifest new file mode 100644 index 00000000000..78bbd977bf2 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component2/not-a-manifest @@ -0,0 +1 @@ +unique_name=baz diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component1/not-a-manifest similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component1/not-a-manifest diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component2/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component2/manifest new file mode 100644 index 00000000000..549b10e207a --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component2/manifest @@ -0,0 +1 @@ +unique_name=foo diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component1/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component1/manifest new file mode 100644 index 00000000000..35aada95d58 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component1/manifest @@ -0,0 +1 @@ +SPOILED_unique_name=invalid2 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component2/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component2/manifest new file mode 100644 index 00000000000..35aada95d58 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component2/manifest @@ -0,0 +1 @@ +SPOILED_unique_name=invalid2 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component1/not-a-manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component1/not-a-manifest new file mode 100644 index 00000000000..3e261515e77 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component1/not-a-manifest @@ -0,0 +1 @@ +unique_name=invalid3 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component2/not-a-manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component2/not-a-manifest new file mode 100644 index 00000000000..3e261515e77 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component2/not-a-manifest @@ -0,0 +1 @@ +unique_name=invalid3 diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b/placeholder.kt diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-common-sources/placeholder.kt diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-stdlib-native-sources.zip diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip similarity index 100% rename from idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip rename to idea/testData/configuration/klib/klibsFromNativeDistributionWithMultipleComponentsRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component/manifest new file mode 100644 index 00000000000..ce949fd9395 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/component/manifest @@ -0,0 +1 @@ +unique_name=kotlinx-cli diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component/manifest new file mode 100644 index 00000000000..4bf7dbc380b --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/component/manifest @@ -0,0 +1 @@ +unique_name=stdlib diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component/manifest new file mode 100644 index 00000000000..4e747075a10 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/component/manifest @@ -0,0 +1 @@ +unique_name=bar diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component/manifest new file mode 100644 index 00000000000..78bbd977bf2 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/component/manifest @@ -0,0 +1 @@ +unique_name=baz diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component/manifest new file mode 100644 index 00000000000..549b10e207a --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/component/manifest @@ -0,0 +1 @@ +unique_name=foo diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component/manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component/manifest new file mode 100644 index 00000000000..35aada95d58 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/component/manifest @@ -0,0 +1 @@ +SPOILED_unique_name=invalid2 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component/not-a-manifest b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component/not-a-manifest new file mode 100644 index 00000000000..3e261515e77 --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/component/not-a-manifest @@ -0,0 +1 @@ +unique_name=invalid3 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt new file mode 100644 index 00000000000..9c71eb811fe --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt @@ -0,0 +1 @@ +// this file is empty diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip new file mode 100644 index 0000000000000000000000000000000000000000..f430c8fda297f1c6e602512745d148bbbc4f84aa GIT binary patch literal 448 zcmWIWW@h1H00E0>RsmoJl#pYPVaU!e$;r&qEzZwPEy>8tOV=&UORXqKO)g1I(M{41 z4dG;9zFngm_W+1XE4UdLS-vqcFtCUKO$b0Smrq!sM+_(m!a4-aEyzhsPR+>ANl7iz z%PxW2atG5EeSHO>yNVUkGILTDfOKkZK}jW7fHxzP95XIoNkIK4!0^@)#3bZLR)`-l o{D*1>st+M{0K-JJ9`$%SKi!C?U%r!;qa{l9QRITU?TolbNKOmspZnma1EvUs{x$TC5)$ z!pXpF)pIPy8Hh_OxEUB(zA-W|u!sN+2tYBGPgtQx3@8f1+JuZP$Vp62&B)J5NiEXL zE`eKOjcJL#zCuYxX0bwAW=^UCkWS4lD5>NM@MdI^W5(qt38?P`7~VR9m;`*t3h^O^ n?@+Bk^&i9vU`Q}5X$&W11-fr>S;)!;axD`OUIEgVKpX}Dq&{jD literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..a1fcf901c004f59bda8feb7979f827f916e5eaba GIT binary patch literal 480 zcmWIWW@h1H00HJ{RsmoJlu%=kVaU!e$;r&qElDjd(M`ANl7iz%PxW2R)%StzP>_9MrN@>T4qkF0+3G4Ehwqv3h-uRl4Hi@O9`ld1sL8s xf|$hmnHAz^4F96qh3aF7UBIwmSkjn4v|Z@_$7M4s8_-AwCLnwUq@RE|3;^f}a!>#O literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt new file mode 100644 index 00000000000..9c71eb811fe --- /dev/null +++ b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt @@ -0,0 +1 @@ +// this file is empty diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..3189a6a5448b26400d7fcdf6a1a75c981697f61c GIT binary patch literal 436 zcmWIWW@h1H0D<6XRsmoJl#phSVaU!e$;r&C&`r+C)J@LM&CSo#EzU13N=_}-4-MgD zVCJpWjpGO6(h6<{MwV}k3=AwHKTSG`W%SE007hyUXlO+ literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip b/idea/testData/configuration/klib/klibsFromNativeDistributionWithSingleComponentRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..f2f9a765f138ba647031f407ea2f69a8343f2104 GIT binary patch literal 436 zcmWIWW@h1H0D2*@jZ*^R(h6<{MwV}k3=AwHKTSG`W%SE001EfUfKWv literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest b/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest deleted file mode 100644 index 41f76f2dbcc..00000000000 --- a/idea/testData/configuration/klib/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/broken/manifest +++ /dev/null @@ -1 +0,0 @@ -SPOILED_unique_name=broken diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest new file mode 100644 index 00000000000..ce949fd9395 --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/kotlinx-cli/manifest @@ -0,0 +1 @@ +unique_name=kotlinx-cli diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest new file mode 100644 index 00000000000..4bf7dbc380b --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/common/stdlib/manifest @@ -0,0 +1 @@ +unique_name=stdlib diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest new file mode 100644 index 00000000000..4e747075a10 --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/bar/manifest @@ -0,0 +1 @@ +unique_name=bar diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest new file mode 100644 index 00000000000..78bbd977bf2 --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/baz/manifest @@ -0,0 +1 @@ +unique_name=baz diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest new file mode 100644 index 00000000000..549b10e207a --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/foo/manifest @@ -0,0 +1 @@ +unique_name=foo diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/manifest new file mode 100644 index 00000000000..35aada95d58 --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid2/manifest @@ -0,0 +1 @@ +SPOILED_unique_name=invalid2 diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/not-a-manifest b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/not-a-manifest new file mode 100644 index 00000000000..3e261515e77 --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/klib/platform/macos_x64/invalid3/not-a-manifest @@ -0,0 +1 @@ +unique_name=invalid3 diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt new file mode 100644 index 00000000000..9c71eb811fe --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-a/placeholder.kt @@ -0,0 +1 @@ +// this file is empty diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-something-unexpected-b.zip new file mode 100644 index 0000000000000000000000000000000000000000..f430c8fda297f1c6e602512745d148bbbc4f84aa GIT binary patch literal 448 zcmWIWW@h1H00E0>RsmoJl#pYPVaU!e$;r&qEzZwPEy>8tOV=&UORXqKO)g1I(M{41 z4dG;9zFngm_W+1XE4UdLS-vqcFtCUKO$b0Smrq!sM+_(m!a4-aEyzhsPR+>ANl7iz z%PxW2atG5EeSHO>yNVUkGILTDfOKkZK}jW7fHxzP95XIoNkIK4!0^@)#3bZLR)`-l o{D*1>st+M{0K-JJ9`$%SKi!C?U%r!;qa{l9QRITU?TolbNKOmspZnma1EvUs{x$TC5)$ z!pXpF)pIPy8Hh_OxEUB(zA-W|u!sN+2tYBGPgtQx3@8f1+JuZP$Vp62&B)J5NiEXL zE`eKOjcJL#zCuYxX0bwAW=^UCkWS4lD5>NM@MdI^W5(qt38?P`7~VR9m;`*t3h^O^ n?@+Bk^&i9vU`Q}5X$&W11-fr>S;)!;axD`OUIEgVKpX}Dq&{jD literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-anotations-common-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..a1fcf901c004f59bda8feb7979f827f916e5eaba GIT binary patch literal 480 zcmWIWW@h1H00HJ{RsmoJlu%=kVaU!e$;r&qElDjd(M`ANl7iz%PxW2R)%StzP>_9MrN@>T4qkF0+3G4Ehwqv3h-uRl4Hi@O9`ld1sL8s xf|$hmnHAz^4F96qh3aF7UBIwmSkjn4v|Z@_$7M4s8_-AwCLnwUq@RE|3;^f}a!>#O literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt new file mode 100644 index 00000000000..9c71eb811fe --- /dev/null +++ b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlin-test-common-sources/placeholder.kt @@ -0,0 +1 @@ +// this file is empty diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-common-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..3189a6a5448b26400d7fcdf6a1a75c981697f61c GIT binary patch literal 436 zcmWIWW@h1H0D<6XRsmoJl#phSVaU!e$;r&C&`r+C)J@LM&CSo#EzU13N=_}-4-MgD zVCJpWjpGO6(h6<{MwV}k3=AwHKTSG`W%SE007hyUXlO+ literal 0 HcmV?d00001 diff --git a/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip b/idea/testData/configuration/klib/oldStyleKlibsFromNativeDistributionRecognized/kotlin-native-PLATFORM-VERSION/sources/kotlinx-cli-native-sources.zip new file mode 100644 index 0000000000000000000000000000000000000000..f2f9a765f138ba647031f407ea2f69a8343f2104 GIT binary patch literal 436 zcmWIWW@h1H0D2*@jZ*^R(h6<{MwV}k3=AwHKTSG`W%SE001EfUfKWv literal 0 HcmV?d00001