From 11dc96f789af05bc25f59945dbcb38254f5f73c0 Mon Sep 17 00:00:00 2001 From: Dmitry Khalanskiy <52952525+dkhalanskyjb@users.noreply.github.com> Date: Thu, 21 Dec 2023 15:54:36 +0300 Subject: [PATCH] Work around #3968, start running integration tests for Native (#3996) As there were no native targets in smokeTest, the problem with the missing atomicfu dependency (KT-64111) was not addressed in time. The bug was revealed after release of kotlinx.coroutines with atomicfu-gradle-plugin 0.23.1. Coroutines enabled Native IR transformation, and for this mode, atomicfu-gradle-plugin only provided compile dependency to atomicfu, though implementation dependency was still necessary. This commit adds the smoke test for Native and temporarily adds an explicit dependency on atomicfu for Native artifacts. Fixes #3968 Co-authored-by: Maria Sokolova --- .../main/kotlin/kotlin-multiplatform-conventions.gradle.kts | 4 ++++ integration-testing/smokeTest/build.gradle | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts index 0ac047122f..01308d7418 100644 --- a/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts @@ -88,6 +88,10 @@ kotlin { api("org.jetbrains.kotlin:kotlin-test-junit:${version("kotlin")}") api("junit:junit:${version("junit")}") } + nativeMain.dependencies { + // workaround for #3968 until this is fixed on atomicfu's side + api("org.jetbrains.kotlinx:atomicfu:0.23.1") + } val jsAndWasmSharedMain by registering { dependsOn(commonMain.get()) } diff --git a/integration-testing/smokeTest/build.gradle b/integration-testing/smokeTest/build.gradle index ad6a485ed2..16c86638a5 100644 --- a/integration-testing/smokeTest/build.gradle +++ b/integration-testing/smokeTest/build.gradle @@ -17,6 +17,12 @@ kotlin { wasmJs() { nodejs() } + + macosArm64() + macosX64() + linuxArm64() + linuxX64() + mingwX64() sourceSets { commonMain {