From 6d1e039b776c1761fc114bdc6c0e7c0561407911 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Fri, 23 Jun 2023 14:22:02 +0200 Subject: [PATCH] [Gradle] Do not apply default hierarchy template for: test KT-47641... See: KT-59596: The test did not apply any hierarchy before as well, therefore this change is returning the setup back to its original behaviour. However, we therefore discovered an issue (tracked as KT-59596): Compiling metadata compilations for cinterops is not desirable ^KT-58676 Verification Pending --- .../test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 efe4681eadf..92b73d3430a 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 @@ -381,7 +381,11 @@ open class CommonizerIT : KGPBaseTest() { gradleVersion, buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG) ) { - build("commonizeCInterop") { + build( + "commonizeCInterop", + /* See: https://youtrack.jetbrains.com/issue/KT-59596/CInterop-commonization-depends-on-compile-tasks */ + "-Pkotlin.mpp.applyDefaultHierarchyTemplate=false" + ) { assertTasksExecuted(":p1:commonizeCInterop") assertTasksExecuted(":p2:commonizeCInterop")