AMMEND CODEREVIEW FIXES

Author: igoriakovlev

build.gradle

@@ -55,6 +55,8 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
         CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
         mavenLocal()
+        // This is bootstrap wasm repo, remove it as regular atomic-fu will be published
+        maven { url "https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental" }
     }
 
     dependencies {
@@ -140,6 +142,8 @@ allprojects {
         google()
         mavenCentral()
         CommunityProjectsBuild.addDevRepositoryIfEnabled(delegate, project)
+        // This is bootstrap wasm repo, remove it as regular atomic-fu will be published
+        maven { url "https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental" }
     }
 }
 
@@ -161,6 +165,7 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
         apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
 
         // TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20
+        // https://github.com/Kotlin/kotlinx.coroutines/issues/3846
         def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
         if (isNewWasmTargetEnabled) {
             apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")

gradle.properties

@@ -10,7 +10,8 @@ kotlin_version=1.9.0
 # Dependencies
 junit_version=4.12
 junit5_version=5.7.0
-atomicfu_version=0.22.0
+# This is bootstrap atomicFU version with wasm support, remove it as regular atomic-fu will be published
+atomicfu_version=0.21.0-wasm0
 knit_version=0.4.0
 html_version=0.7.2
 lincheck_version=2.18.1

gradle/compile-wasm-multiplatform.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 kotlin {
@@ -15,13 +15,13 @@ kotlin {
         wasmJsMain {
             kotlin {
                 srcDir 'jsWasm/src'
-                srcDir 'wasm/src'
+                srcDir 'wasmJs/src'
             }
         }
         wasmJsTest {
             kotlin {
                 srcDir 'jsWasm/test'
-                srcDir 'wasm/test'
+                srcDir 'wasmJs/test'
             }
         }
         wasmJsTest.dependencies {

gradle/compile-wasm-multiplatform19.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 kotlin {
@@ -15,13 +15,13 @@ kotlin {
         wasmMain {
             kotlin {
                 srcDir 'jsWasm/src'
-                srcDir 'wasm/src'
+                srcDir 'wasmJs/src'
             }
         }
         wasmTest {
             kotlin {
                 srcDir 'jsWasm/test'
-                srcDir 'wasm/test'
+                srcDir 'wasmJs/test'
             }
         }
         wasmTest.dependencies {

kotlinx-coroutines-core/build.gradle

@@ -21,6 +21,7 @@ if (rootProject.ext.native_targets_enabled) {
 apply from: rootProject.file("gradle/compile-js-multiplatform.gradle")
 
 // TODO: Wasm target names have been changed since 1.9.20, remove this after migration to 1.9.20
+// https://github.com/Kotlin/kotlinx.coroutines/issues/3846
 def isNewWasmTargetEnabled = isKotlinVersionAtLeast(ext.kotlin_version, 1, 9, 20)
 if (isNewWasmTargetEnabled) {
     apply from: rootProject.file("gradle/compile-wasm-multiplatform.gradle")
@@ -35,7 +36,9 @@ apply from: rootProject.file('gradle/publish.gradle')
 
      TARGETS                            SOURCE SETS
      -------         ----------------------------------------------
-
+     wasmJs -------------------------------------------------+
+                                                             |
+                                                             |
      js -----------------------------------------------------+
                                                              |
                                                              V
@@ -276,23 +279,6 @@ jvmTest {
 // Setup manifest for kotlinx-coroutines-core-jvm.jar
 jvmJar { setupManifest(it) }
 
-void addIngoreTestsForWasm(org.gradle.api.tasks.testing.TestFilter filter) {
-    filter.excludeTest("ChannelsTest", "testIterableAsReceiveChannel")
-    filter.excludeTest("ChannelsTest", "testEmptyList")
-    filter.excludeTest("ChannelsTest", "testToList")
-    filter.excludeTest("ChannelBuildersFlowTest", "testConsumeAsFlowProduceBuffered")
-}
-
-if (isNewWasmTargetEnabled) {
-    wasmJsNodeTest {
-        addIngoreTestsForWasm(filter)
-    }
-} else {
-    wasmNodeTest {
-        addIngoreTestsForWasm(filter)
-    }
-}
-
 /*
  * Setup manifest for kotlinx-coroutines-core.jar
  * This is convenient for users that pass -javaagent arg manually and also is a workaround #2619 and KTIJ-5659.