commit 7207a8d55614f794dc5d3642f50c9feae53b60ab
author Vladimir Sukharev <vladimir.sukharev@jetbrains.com> Tue Aug 15 08:45:34 2023 +0200
committer Vladimir Sukharev <vladimir.sukharev@jetbrains.com> Tue Aug 15 08:45:34 2023 +0200
tree b97d6d485bad9a1081cc8217a5ca5cf569a47c30
parent 5b825282a43a2bcb6bd59360127f4c97316eee23

[K/N] Don't include :native:native-tests when kotlin.native.enabled=false

^KT-58240

plugins/atomicfu/atomicfu-compiler/build.gradle.kts

diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
index 627468b..8bec53b 100644
--- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
@@ -59,8 +59,8 @@
 }
 
 dependencies {
-    if (!kotlinBuildProperties.isInIdeaSync) {
-        testImplementation(project(mapOf("path" to ":native:native.tests")))
+    if (kotlinBuildProperties.isKotlinNativeEnabled && !kotlinBuildProperties.isInIdeaSync) {
+            testImplementation(project(mapOf("path" to ":native:native.tests")))
     }
     compileOnly(intellijCore())
     compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
@@ -92,7 +92,7 @@
     testApi(project(":kotlin-test:kotlin-test-jvm"))
 
     // Dependencies for Kotlin/Native test infra:
-    if (!kotlinBuildProperties.isInIdeaSync) {
+    if (kotlinBuildProperties.isKotlinNativeEnabled && !kotlinBuildProperties.isInIdeaSync) {
         testImplementation(projectTests(":native:native.tests"))
     }
     testImplementation(project(":native:kotlin-native-utils"))

settings.gradle

diff --git a/settings.gradle b/settings.gradle
index 8f596fe..b9d1ed3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -601,12 +601,15 @@
             ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
             ":kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it",
             ":kotlin-test:kotlin-test-wasm-js",
-            ":kotlin-test:kotlin-test-wasm-wasi",
-            ":native:native.tests"
+            ":kotlin-test:kotlin-test-wasm-wasi"
 
     if (!stdlibMpp) include ":kotlin-stdlib-js", ":kotlin-stdlib-js-ir"
     if (!stdlibMpp) include ":kotlin-stdlib-mpp"
 
+    if (buildProperties.isKotlinNativeEnabled) {
+        include ":native:native.tests"
+    }
+
     project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
     project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib" + (stdlibMpp ? "" : "/jvm") as File
     if (!stdlibMpp) project(':kotlin-stdlib-js').projectDir = "$rootDir/libraries/stdlib/js-v1" as File
@@ -633,7 +636,9 @@
     project(':kotlin-test:kotlin-test-js-ir:kotlin-test-js-ir-it').projectDir = "$rootDir/libraries/kotlin.test/js-ir/it" as File
     project(':kotlin-test:kotlin-test-wasm-js').projectDir = "$rootDir/libraries/kotlin.test/wasm/js" as File
     project(':kotlin-test:kotlin-test-wasm-wasi').projectDir = "$rootDir/libraries/kotlin.test/wasm/wasi" as File
-    project(':native:native.tests').projectDir = "$rootDir/native/native.tests" as File
+    if (buildProperties.isKotlinNativeEnabled) {
+        project(':native:native.tests').projectDir = "$rootDir/native/native.tests" as File
+    }
 }
 include ":compiler:android-tests"