CfW: Introduce webCommonW3C source set to fix metadata compilation while avoiding code duplication

compose/animation/animation-core/build.gradle

@@ -169,9 +169,3 @@ androidx {
 android {
     namespace "androidx.compose.animation.core"
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/animation/animation/build.gradle

@@ -145,9 +145,3 @@ androidx {
 android {
     namespace "androidx.compose.animation"
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/foundation/foundation/build.gradle

@@ -136,10 +136,12 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             jsWasmMain.dependsOn(jsNativeMain)
 
             jsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
             }
 
             wasmJsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
             }
 
@@ -244,9 +246,3 @@ androidx {
     description = "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers"
     legacyDisableKotlinStrictApiMode = true
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/material/material-ripple/build.gradle

@@ -126,9 +126,3 @@ androidx {
 android {
     namespace "androidx.compose.material.ripple"
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/material/material/build.gradle

@@ -201,9 +201,3 @@ android {
             project.rootDir.absolutePath + "/golden/compose/material/material"
     namespace "androidx.compose.material"
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/material3/material3/build.gradle

@@ -135,8 +135,12 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
 
             nativeMain.dependsOn(jsNativeMain)
             jsWasmMain.dependsOn(jsNativeMain)
-            jsMain.dependsOn(jsWasmMain)
+            jsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
+                dependsOn(jsWasmMain)
+            }
             wasmJsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(libs.kotlinStdlib)
@@ -220,9 +224,3 @@ android {
             project.rootDir.absolutePath + "/golden/compose/material3/material3"
     namespace "androidx.compose.material3"
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/material3/material3/src/jsWasmMain/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt → compose/material3/material3/src/webCommonW3C/kotlin/androidx/compose/material3/PlatformDateFormat.jsWasm.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compose/ui/ui-graphics/build.gradle

@@ -197,9 +197,3 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         systemProperties["GOLDEN_PATH"] = project.rootDir.absolutePath + "/golden"
     }
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/ui/ui-text/build.gradle

@@ -138,10 +138,12 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             jsWasmMain.dependsOn(jsNativeMain)
 
             jsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
             }
 
             wasmJsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(libs.create("skikoWasm"))
@@ -251,12 +253,6 @@ android {
     namespace "androidx.compose.ui.text"
 }
 
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}
-
 afterEvaluate {
     tasks.withType(Test) { t ->
         t.jvmArgs += ["--add-opens=java.desktop/sun.font=ALL-UNNAMED"]

compose/ui/ui-text/src/jsWasmMain/kotlin/androidx/compose/ui/text/intl/JsPlatformLocale.js.kt → compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/intl/JsPlatformLocale.web.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compose/ui/ui-text/src/jsWasmMain/kotlin/androidx/compose/ui/text/platform/JsFont.js.kt → compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebFont.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compose/ui/ui-text/src/jsWasmMain/kotlin/androidx/compose/ui/text/platform/JsStringDelegate.js.kt → compose/ui/ui-text/src/webCommonW3C/kotlin/androidx/compose/ui/text/platform/WebStringDelegate.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package androidx.compose.ui.text.platform
 
 import androidx.compose.ui.text.PlatformStringDelegate
-import androidx.compose.ui.text.intl.JsLocale
 import androidx.compose.ui.text.intl.PlatformLocale
 
 /**

compose/ui/ui/build.gradle

@@ -219,13 +219,15 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             macosMain.dependsOn(notMobileMain)
 
             jsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
                 dependencies {
                     api(libs.skikoCommon)
                 }
             }
 
             wasmJsMain {
+                kotlin.srcDir("src/webCommonW3C/kotlin")
                 dependsOn(jsWasmMain)
                 dependencies {
                     implementation(libs.kotlinStdlib)
@@ -388,9 +390,3 @@ if (!AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         verifyKotlinModule(variant)
     }
 }
-
-project.tasks.configureEach {
-    if (name == "compileJsWasmMainKotlinMetadata") {
-        enabled = false
-    }
-}

compose/ui/ui/src/jsMain/kotlin/androidx/compose/ui/window/SystemThemeObserver.js.kt

@@ -19,6 +19,7 @@ package androidx.compose.ui.window
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.SystemTheme
+import kotlinx.browser.window
 import org.w3c.dom.MediaQueryList
 import org.w3c.dom.Window
 import org.w3c.dom.events.EventListener
@@ -71,5 +72,5 @@ internal class SystemThemeObserverImpl(window : Window) : SystemThemeObserver {
     }
 }
 
-internal actual fun getSystemThemeObserver(window: Window): SystemThemeObserver =
+internal actual fun getSystemThemeObserver(): SystemThemeObserver =
     SystemThemeObserverImpl(window)

compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/window/SystemThemeObserver.kt

@@ -18,7 +18,6 @@ package androidx.compose.ui.window
 
 import androidx.compose.runtime.State
 import androidx.compose.ui.SystemTheme
-import org.w3c.dom.Window
 
 
 internal interface SystemThemeObserver {
@@ -27,4 +26,4 @@ internal interface SystemThemeObserver {
     fun dispose()
 }
 
-internal expect fun getSystemThemeObserver(window: Window): SystemThemeObserver
+internal expect fun getSystemThemeObserver(): SystemThemeObserver

compose/ui/ui/src/wasmJsMain/kotlin/androidx/compose/ui/window/SystemThemeObserver.wasm.kt

@@ -19,6 +19,7 @@ package androidx.compose.ui.window
 import androidx.compose.runtime.State
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.SystemTheme
+import kotlinx.browser.window
 import org.w3c.dom.MediaQueryList
 import org.w3c.dom.MediaQueryListEvent
 import org.w3c.dom.Window
@@ -67,7 +68,7 @@ internal class SystemThemeObserverImpl(window : Window) : SystemThemeObserver {
     }
 }
 
-internal actual fun getSystemThemeObserver(window: Window): SystemThemeObserver =
+internal actual fun getSystemThemeObserver(): SystemThemeObserver =
     SystemThemeObserverImpl(window)
 
 // supported by all browsers since 2015

compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/input/key/utf16CodePoint.js.kt → compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/input/key/utf16CodePoint.js.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compose/ui/ui/src/jsWasmMain/kotlin/androidx/compose/ui/window/ComposeWindow.js.kt → compose/ui/ui/src/webCommonW3C/kotlin/androidx/compose/ui/window/ComposeWindow.js.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ private class ComposeWindow(
         platformContext = platformContext,
         input = jsTextInputService.input
     )
-    private val systemThemeObserver = getSystemThemeObserver(window)
+    private val systemThemeObserver = getSystemThemeObserver()
 
     val canvas = document.getElementById(canvasId) as HTMLCanvasElement