From 0c647d6feca2c5ed18173b0d11de4361cb4d0dd3 Mon Sep 17 00:00:00 2001 From: Evgenii Mazhukin Date: Wed, 3 Jan 2024 12:08:04 +0000 Subject: [PATCH] [Tests] Double-check the Native incremental builds in Gradle IT Couldn't reproduce the issue in tests or with the reproducer. Most likely the problem was on my side. ^KT-63970 Can't Reproduce Merge-request: KT-MR-13673 Merged-by: Evgenii Mazhukin --- .../mpp/smoke/ExpectActualIncrementalCompilationIT.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt index c405614297e..6db4ccfbd8f 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/smoke/ExpectActualIncrementalCompilationIT.kt @@ -31,16 +31,11 @@ open class ExpectActualIncrementalCompilationIT : KGPBaseTest() { nativeProject("expect-actual-fun-or-class-ic", gradleVersion) { build("assemble") - listOf( - kotlinSourcesDir("jvmMain").resolve("ActualFunFoo.kt"), - kotlinSourcesDir("jsMain").resolve("ActualFunFoo.kt") - ).forEach { + listOf("jvmMain", "jsMain", "nativeMain").forEach { sourceSet -> // just touch the file. expected logic is this: // actual declaration needs to be recompiled -> we add expect declaration to the list of compiled files - it.addPrivateVal() + kotlinSourcesDir(sourceSet).resolve("ActualFunFoo.kt").addPrivateVal() } - //TODO: KT-63970 - native compilation fails, if val is private - kotlinSourcesDir("nativeMain").resolve("ActualFunFoo.kt").addPublicVal() build("assemble", buildOptions = defaultBuildOptions.copy(logLevel = LogLevel.DEBUG)) { assertTasksExecuted(":compileKotlinJvm", ":compileKotlinJs", ":compileKotlinNative")