Merge branch 'jb-main' into cedrickc/web-compose-window-disposal

# Conflicts:
#	compose/ui/ui/src/webTest/kotlin/androidx/compose/ui/OnCanvasTests.kt
#	compose/ui/ui/src/webTest/kotlin/androidx/compose/ui/window/ComposeWindowLifecycleTest.kt

Author: cedrickcooke

.run/mpp/demo/js-Demo.run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="jsRun" />
+          <option value="jsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />

.run/mpp/demo/wasm-Demo.run.xml

@@ -10,7 +10,7 @@
       </option>
       <option name="taskNames">
         <list>
-          <option value="wasmJsBrowserRun" />
+          <option value="wasmJsBrowserDevelopmentRun" />
         </list>
       </option>
       <option name="vmOptions" />

annotation/annotation-compatibility-stub/build.gradle

@@ -35,9 +35,7 @@ androidXComposeMultiplatform {
     js()
     wasm()
     darwin()
-
-    linuxX64()
-    linuxArm64()
+    linux()
 }
 
 kotlin {

annotation/annotation/build.gradle

@@ -19,9 +19,7 @@ androidXComposeMultiplatform {
     js()
     wasm()
     darwin()
-
-    linuxX64()
-    linuxArm64()
+    linux()
 }
 
 kotlin {
@@ -57,12 +55,6 @@ kotlin {
                 }
             }
         }
-
-        // Workaround for https://youtrack.jetbrains.com/issue/KT-51763
-        // Make sure commonization runs before any compilation task.
-        tasks.withType(KotlinNativeCompile).configureEach {
-            it.dependsOn(tasks.named("commonize"))
-        }
     }
 }
 

buildSrc/private/src/main/kotlin/androidx/build/AndroidXComposeMultiplatformExtensionImpl.kt

@@ -206,8 +206,7 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
         iosArm64("uikitArm64")
         iosSimulatorArm64("uikitSimArm64")
 
-        val commonMain = sourceSets.getByName("commonMain")
-        val nativeMain = sourceSets.create("nativeMain")
+        val nativeMain = getOrCreateNativeMain()
         val darwinMain = sourceSets.create("darwinMain")
         val macosMain = sourceSets.create("macosMain")
         val macosX64Main = sourceSets.getByName("macosX64Main")
@@ -216,7 +215,6 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
         val uikitX64Main = sourceSets.getByName("uikitX64Main")
         val uikitArm64Main = sourceSets.getByName("uikitArm64Main")
         val uikitSimArm64Main = sourceSets.getByName("uikitSimArm64Main")
-        nativeMain.dependsOn(commonMain)
         darwinMain.dependsOn(nativeMain)
         macosMain.dependsOn(darwinMain)
         macosX64Main.dependsOn(macosMain)
@@ -226,8 +224,7 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
         uikitArm64Main.dependsOn(uikitMain)
         uikitSimArm64Main.dependsOn(uikitMain)
 
-        val commonTest = sourceSets.getByName("commonTest")
-        val nativeTest = sourceSets.create("nativeTest")
+        val nativeTest = getOrCreateNativeTest()
         val darwinTest = sourceSets.create("darwinTest")
         val macosTest = sourceSets.create("macosTest")
         val macosX64Test = sourceSets.getByName("macosX64Test")
@@ -236,7 +233,6 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
         val uikitX64Test = sourceSets.getByName("uikitX64Test")
         val uikitArm64Test = sourceSets.getByName("uikitArm64Test")
         val uikitSimArm64Test = sourceSets.getByName("uikitSimArm64Test")
-        nativeTest.dependsOn(commonTest)
         darwinTest.dependsOn(nativeTest)
         macosTest.dependsOn(darwinTest)
         macosX64Test.dependsOn(macosTest)
@@ -247,12 +243,25 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
         uikitSimArm64Test.dependsOn(uikitTest)
     }
 
-    override fun linuxX64(): Unit = multiplatformExtension.run {
+    override fun linux(): Unit = multiplatformExtension.run {
         linuxX64()
-    }
-
-    override fun linuxArm64(): Unit = multiplatformExtension.run {
         linuxArm64()
+
+        val nativeMain = getOrCreateNativeMain()
+        val linuxMain = sourceSets.create("linuxMain")
+        val linuxX64Main = sourceSets.getByName("linuxX64Main")
+        val linuxArm64Main = sourceSets.getByName("linuxArm64Main")
+        linuxMain.dependsOn(nativeMain)
+        linuxX64Main.dependsOn(linuxMain)
+        linuxArm64Main.dependsOn(linuxMain)
+
+        val nativeTest = getOrCreateNativeTest()
+        val linuxTest = sourceSets.create("linuxTest")
+        val linuxX64Test = sourceSets.getByName("linuxX64Test")
+        val linuxArm64Test = sourceSets.getByName("linuxArm64Test")
+        linuxTest.dependsOn(nativeTest)
+        linuxX64Test.dependsOn(linuxTest)
+        linuxArm64Test.dependsOn(linuxTest)
     }
 
     private fun getOrCreateJvmMain(): KotlinSourceSet =
@@ -261,6 +270,12 @@ open class AndroidXComposeMultiplatformExtensionImpl @Inject constructor(
     private fun getOrCreateJvmTest(): KotlinSourceSet =
         getOrCreateSourceSet("jvmTest", "commonTest")
 
+    private fun getOrCreateNativeMain(): KotlinSourceSet =
+        getOrCreateSourceSet("nativeMain", "commonMain")
+
+    private fun getOrCreateNativeTest(): KotlinSourceSet =
+        getOrCreateSourceSet("nativeTest", "commonTest")
+
     private fun getOrCreateSourceSet(
         name: String,
         dependsOnSourceSetName: String

buildSrc/private/src/main/kotlin/androidx/build/jetbrains/JetBrainsAndroidXImplPlugin.kt

@@ -184,7 +184,42 @@ private fun enableBinaryCompatibilityValidator(project: Project) {
             project.apply(plugin = "org.jetbrains.kotlinx.binary-compatibility-validator")
             project.extensions.getByType(ApiValidationExtension::class.java).apply {
                 klib.enabled = true
+                nonPublicMarkers += NON_PUBLIC_MARKERS
             }
         }
     }
 }
+
+// Not ideal to have a list instead of a pattern to match but this is all the API supports right now
+// https://github.com/Kotlin/binary-compatibility-validator/issues/280
+private val NON_PUBLIC_MARKERS =
+    setOf(
+        "androidx.annotation.Experimental",
+        "androidx.compose.animation.ExperimentalAnimationApi",
+        "androidx.compose.animation.ExperimentalSharedTransitionApi",
+        "androidx.compose.animation.core.ExperimentalAnimatableApi",
+        "androidx.compose.animation.core.ExperimentalAnimationSpecApi",
+        "androidx.compose.animation.core.ExperimentalTransitionApi",
+        "androidx.compose.animation.core.InternalAnimationApi",
+        "androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi",
+        "androidx.compose.foundation.gestures.ExperimentalTapGestureDetectorBehaviorApi",
+        "androidx.compose.foundation.ExperimentalFoundationApi",
+        "androidx.compose.foundation.InternalFoundationApi",
+        "androidx.compose.foundation.layout.ExperimentalLayoutApi",
+        "androidx.compose.material.ExperimentalMaterialApi",
+        "androidx.compose.runtime.ExperimentalComposeApi",
+        "androidx.compose.runtime.ExperimentalComposeRuntimeApi",
+        "androidx.compose.runtime.InternalComposeApi",
+        "androidx.compose.runtime.InternalComposeTracingApi",
+        "androidx.compose.ui.ExperimentalComposeUiApi",
+        "androidx.compose.ui.InternalComposeUiApi",
+        "androidx.compose.ui.input.pointer.util.ExperimentalVelocityTrackerApi",
+        "androidx.compose.ui.node.InternalCoreApi",
+        "androidx.compose.ui.test.ExperimentalTestApi",
+        "androidx.compose.ui.test.InternalTestApi",
+        "androidx.compose.ui.text.ExperimentalTextApi",
+        "androidx.compose.ui.text.InternalTextApi",
+        "androidx.compose.ui.unit.ExperimentalUnitApi",
+        "androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi",
+        "androidx.window.core.ExperimentalWindowApi",
+    )

buildSrc/public/src/main/kotlin/androidx/build/AndroidXComposeMultiplatformExtension.kt

@@ -56,15 +56,9 @@ abstract class AndroidXComposeMultiplatformExtension {
 
     /**
      * Provides the default target configuration and source set dependencies
-     * for all linuxX64 native targets.
+     * for all linux native targets.
      */
-    abstract fun linuxX64(): Unit
-
-    /**
-     * Provides the default target configuration and source set dependencies
-     * for all linuxArm64 native targets.
-     */
-    abstract fun linuxArm64(): Unit
+    abstract fun linux(): Unit
 
     /**
      * Configures native compilation tasks with flags to link required frameworks

collection/collection-benchmark/build.gradle

@@ -96,12 +96,6 @@ androidXMultiplatform {
                 }
             }
         }
-
-        // Workaround for https://youtrack.jetbrains.com/issue/KT-51763
-        // Make sure commonization runs before any compilation task.
-        tasks.withType(KotlinNativeCompile).configureEach {
-            it.dependsOn(tasks.named("commonize"))
-        }
     }
 }
 

collection/collection-compatibility-stub/build.gradle

@@ -35,9 +35,7 @@ androidXComposeMultiplatform {
     js()
     wasm()
     darwin()
-
-    linuxX64()
-    linuxArm64()
+    linux()
 }
 
 kotlin {

collection/collection/build.gradle

@@ -35,9 +35,7 @@ androidXComposeMultiplatform {
     js()
     wasm()
     darwin()
-
-    linuxX64()
-    linuxArm64()
+    linux()
 }
 
 kotlin {