From 0749443f7edcad91142eeba2441d7e287b4bd65e Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Fri, 21 May 2021 09:38:42 +0200 Subject: [PATCH] Implement CommonizerIT.`test KT-46856 filename too long - all native targets configured` Covers ^KT-46856 --- .../jetbrains/kotlin/gradle/CommonizerIT.kt | 9 +++++++ .../build.gradle.kts | 26 +++++++++++++++++++ .../gradle.properties | 7 +++++ .../settings.gradle.kts | 10 +++++++ 4 files changed, 52 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/build.gradle.kts create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/gradle.properties create mode 100644 libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index 7cc53b61e71..853e8924025 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -335,6 +335,15 @@ class CommonizerIT : BaseGradleIT() { } } + @Test + fun `test KT-46856 filename too long - all native targets configured`() { + with(Project("commonize-kt-46856-all-targets")) { + build(":commonize") { + assertSuccessful() + } + } + } + private fun preparedProject(name: String): Project { return Project(name).apply { setupWorkingDir() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/build.gradle.kts new file mode 100644 index 00000000000..c0ce3eb2322 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/build.gradle.kts @@ -0,0 +1,26 @@ +import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset +import org.jetbrains.kotlin.konan.target.HostManager.Companion.hostIsLinux +import org.jetbrains.kotlin.konan.target.KonanTarget.LINUX_MIPS32 + +plugins { + kotlin("multiplatform") +} + +kotlin { + presets.forEach { preset -> + if (preset is AbstractKotlinNativeTargetPreset) { + // https://youtrack.jetbrains.com/issue/KT-46957 + if (hostIsLinux && preset.konanTarget == LINUX_MIPS32) { + return@forEach + } + targetFromPreset(preset) + } + } +} + +allprojects { + repositories { + mavenLocal() + mavenCentral() + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/gradle.properties b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/gradle.properties new file mode 100644 index 00000000000..5bdd9337a9d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/gradle.properties @@ -0,0 +1,7 @@ +kotlin.code.style=official + +kotlin.mpp.enableGranularSourceSetsMetadata=true +kotlin.native.enableDependencyPropagation=false +kotlin.mpp.enableCInteropCommonization=true +kotlin.mpp.enableHierarchicalCommonization=true +kotlin.mpp.enableNativeDistributionCommonizationCache=false diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts new file mode 100644 index 00000000000..ecdece6ecfe --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonize-kt-46856-all-targets/settings.gradle.kts @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + } + val kotlin_version: String by settings + plugins { + kotlin("multiplatform").version(kotlin_version) + } +}