Add the disabled k/wasm target to the rest of necessary modules (JetB…

…rains#544) * Add the disabled k/wasm target to the rest of necessary modules * Revert not relevant import changes
MatkovIvan · May 5, 2023 · 53a53c0 · 53a53c0
1 parent bf0db27
commit 53a53c0
Show file tree

Hide file tree

Showing 33 changed files with 159 additions and 33 deletions.
diff --git a/animation/animation-core/build.gradle b/animation/animation-core/build.gradle
@@ -69,6 +69,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
     }
 
     kotlin {
@@ -106,8 +107,24 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 }
             }
             jsNativeMain.dependsOn(commonMain)
-            jsMain.dependsOn(jsNativeMain)
             nativeMain.dependsOn(jsNativeMain)
+            jsWasmMain.dependsOn(jsNativeMain)
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                    }
+                }
+            }
 
             // TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
             //  need to add Robolectric (which must be kept out of androidAndroidTest), use a top

diff --git a/...e/animation/core/ActualAtomicReference.kt → ...e/animation/core/ActualAtomicReference.kt b/...e/animation/core/ActualAtomicReference.kt → ...e/animation/core/ActualAtomicReference.kt
diff --git a/animation/animation-graphics/build.gradle b/animation/animation-graphics/build.gradle
@@ -67,6 +67,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
     }
 
     kotlin {
@@ -96,6 +97,24 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 implementation(libs.kotlinStdlib)
             }
 
+            jsWasmMain.dependsOn(commonMain)
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                    }
+                }
+            }
+
             // TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
             //  need to add Robolectric (which must be kept out of androidAndroidTest), use a top
             //  level dependencies block instead:

diff --git a/animation/animation/build.gradle b/animation/animation/build.gradle
@@ -68,6 +68,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
     }
 
     kotlin {
@@ -96,8 +97,24 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 implementation(libs.kotlinStdlib)
             }
             jsNativeMain.dependsOn(commonMain)
-            jsMain.dependsOn(jsNativeMain)
             nativeMain.dependsOn(jsNativeMain)
+            jsWasmMain.dependsOn(jsNativeMain)
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                    }
+                }
+            }
 
             // TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
             //  need to add Robolectric (which must be kept out of androidAndroidTest), use a top

diff --git a/...n/JsActualDefaultDecayAnimationSpec.js.kt → ...n/JsActualDefaultDecayAnimationSpec.js.kt b/...n/JsActualDefaultDecayAnimationSpec.js.kt → ...n/JsActualDefaultDecayAnimationSpec.js.kt
diff --git a/...ation/SplineBasedDecayAnimationSpec.js.kt → ...ation/SplineBasedDecayAnimationSpec.js.kt b/...ation/SplineBasedDecayAnimationSpec.js.kt → ...ation/SplineBasedDecayAnimationSpec.js.kt
diff --git a/foundation/foundation-layout/build.gradle b/foundation/foundation-layout/build.gradle
@@ -74,6 +74,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
     }
 
     kotlin {
@@ -101,9 +102,26 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
             }
 
             jsNativeMain.dependsOn(commonMain)
-            jsMain.dependsOn(jsNativeMain)
             nativeMain.dependsOn(jsNativeMain)
 
+            jsWasmMain.dependsOn(jsNativeMain)
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                    }
+                }
+            }
+
             // TODO(b/214407011): These dependencies leak into instrumented tests as well. If you
             //  need to add Robolectric (which must be kept out of androidAndroidTest), use a top
             //  level dependencies block instead:

diff --git a/foundation/foundation/build.gradle b/foundation/foundation/build.gradle
@@ -89,6 +89,7 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
 
         configureDarwinFlags()
     }
@@ -127,8 +128,27 @@ if (AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 }
             }
             jsNativeMain.dependsOn(skikoMain)
-            jsMain.dependsOn(jsNativeMain)
             nativeMain.dependsOn(jsNativeMain)
+            jsWasmMain.dependsOn(jsNativeMain)
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                    api(libs.skikoCommon)
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                        implementation(libs.create("skikoWasm"))
+                        implementation(libs.create("skikoWasmWasm"))
+                    }
+                }
+            }
 
             commonTest {
                 dependencies {

diff --git a/...mpose/foundation/ActualAtomicReference.kt → ...mpose/foundation/ActualAtomicReference.kt b/...mpose/foundation/ActualAtomicReference.kt → ...mpose/foundation/ActualAtomicReference.kt
diff --git a/.../androidx/compose/foundation/JsActuals.kt → .../androidx/compose/foundation/JsActuals.kt b/.../androidx/compose/foundation/JsActuals.kt → .../androidx/compose/foundation/JsActuals.kt
diff --git a/...droidx/compose/foundation/JsOverScroll.kt → ...droidx/compose/foundation/JsOverScroll.kt b/...droidx/compose/foundation/JsOverScroll.kt → ...droidx/compose/foundation/JsOverScroll.kt
diff --git a/...droidx/compose/foundation/Scrollbar.js.kt → ...droidx/compose/foundation/Scrollbar.js.kt b/...droidx/compose/foundation/Scrollbar.js.kt → ...droidx/compose/foundation/Scrollbar.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...se/foundation/gestures/JsScrollable.js.kt → ...se/foundation/gestures/JsScrollable.js.kt b/...se/foundation/gestures/JsScrollable.js.kt → ...se/foundation/gestures/JsScrollable.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 The Android Open Source Project
+ * Copyright 2023 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.
@@ -18,13 +18,11 @@
 
 package androidx.compose.foundation.gestures
 
-import androidx.compose.foundation.fastFold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.input.pointer.PointerEvent
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntSize
-import androidx.compose.ui.unit.dp
 import org.jetbrains.skiko.SkikoPointerEvent
 import org.jetbrains.skiko.SkikoPointerEventKind
 

diff --git a/...compose/foundation/lazy/layout/Lazy.js.kt → ...compose/foundation/lazy/layout/Lazy.js.kt b/...compose/foundation/lazy/layout/Lazy.js.kt → ...compose/foundation/lazy/layout/Lazy.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 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.
@@ -16,10 +16,6 @@
 
 package androidx.compose.foundation.lazy.layout
 
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
-import androidx.compose.ui.layout.SubcomposeLayoutState
-
 actual fun getDefaultLazyLayoutKey(index: Int): Any = DefaultLazyKey(index)
 
 private data class DefaultLazyKey(private val index: Int)
diff --git a/...compose/foundation/text/ContextMenu.js.kt → ...compose/foundation/text/ContextMenu.js.kt b/...compose/foundation/text/ContextMenu.js.kt → ...compose/foundation/text/ContextMenu.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...ose/foundation/text/KeyEventHelpers.js.kt → ...ose/foundation/text/KeyEventHelpers.js.kt b/...ose/foundation/text/KeyEventHelpers.js.kt → ...ose/foundation/text/KeyEventHelpers.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...pose/foundation/text/KeyMapping.jsMain.kt → ...pose/foundation/text/KeyMapping.jsMain.kt b/...pose/foundation/text/KeyMapping.jsMain.kt → ...pose/foundation/text/KeyMapping.jsMain.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 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.
@@ -16,4 +16,7 @@
 
 package androidx.compose.foundation.text
 
+import androidx.compose.foundation.text.KeyMapping
+import androidx.compose.foundation.text.defaultKeyMapping
+
 internal actual val platformDefaultKeyMapping: KeyMapping = defaultKeyMapping
diff --git a/.../foundation/text/NativeCursorHandle.js.kt → .../foundation/text/NativeCursorHandle.js.kt b/.../foundation/text/NativeCursorHandle.js.kt → .../foundation/text/NativeCursorHandle.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...ose/foundation/text/TextFieldCursor.js.kt → ...ose/foundation/text/TextFieldCursor.js.kt b/...ose/foundation/text/TextFieldCursor.js.kt → ...ose/foundation/text/TextFieldCursor.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...e/foundation/text/TextFieldKeyInput.js.kt → ...e/foundation/text/TextFieldKeyInput.js.kt b/...e/foundation/text/TextFieldKeyInput.js.kt → ...e/foundation/text/TextFieldKeyInput.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...ose/foundation/text/TextPointerIcon.js.kt → ...ose/foundation/text/TextPointerIcon.js.kt b/...ose/foundation/text/TextPointerIcon.js.kt → ...ose/foundation/text/TextPointerIcon.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...x/compose/foundation/text/TouchMode.js.kt → ...x/compose/foundation/text/TouchMode.js.kt b/...x/compose/foundation/text/TouchMode.js.kt → ...x/compose/foundation/text/TouchMode.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...compose/foundation/text/UndoManager.js.kt → ...compose/foundation/text/UndoManager.js.kt b/...compose/foundation/text/UndoManager.js.kt → ...compose/foundation/text/UndoManager.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...election/DefaultTextSelectionColors.js.kt → ...election/DefaultTextSelectionColors.js.kt b/...election/DefaultTextSelectionColors.js.kt → ...election/DefaultTextSelectionColors.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2023 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.

diff --git a/...ion/text/selection/SelectionHandles.js.kt → ...ion/text/selection/SelectionHandles.js.kt b/...ion/text/selection/SelectionHandles.js.kt → ...ion/text/selection/SelectionHandles.js.kt
diff --git a/...ion/text/selection/SelectionManager.js.kt → ...ion/text/selection/SelectionManager.js.kt b/...ion/text/selection/SelectionManager.js.kt → ...ion/text/selection/SelectionManager.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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,11 +17,7 @@
 package androidx.compose.foundation.text.selection
 
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.key.Key
 import androidx.compose.ui.input.key.KeyEvent
-import androidx.compose.ui.input.key.isCtrlPressed
-import androidx.compose.ui.input.key.isMetaPressed
-import androidx.compose.ui.input.key.key
 
 // this doesn't sounds very sustainable
 // it would end up being a function for any conceptual keyevent (selectall, cut, copy, paste)

diff --git a/...selection/TextFieldSelectionManager.js.kt → ...selection/TextFieldSelectionManager.js.kt b/...selection/TextFieldSelectionManager.js.kt → ...selection/TextFieldSelectionManager.js.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 The Android Open Source Project
+ * Copyright 2023 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.
@@ -16,7 +16,6 @@
 
 package androidx.compose.foundation.text.selection
 
-import androidx.compose.ui.input.pointer.PointerEvent
 import androidx.compose.ui.Modifier
 
 internal actual fun Modifier.textFieldMagnifier(manager: TextFieldSelectionManager): Modifier =

diff --git a/material/material-ripple/build.gradle b/material/material-ripple/build.gradle
@@ -59,6 +59,7 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
         desktop()
         darwin()
         js()
+        wasm()
     }
 
     kotlin {
@@ -95,6 +96,26 @@ if(AndroidXComposePlugin.isMultiplatformEnabled(project)) {
                 implementation(libs.junit)
                 implementation(libs.truth)
             }
+
+            jsWasmMain {
+                dependsOn(commonMain)
+            }
+
+            jsMain {
+                dependsOn(jsWasmMain)
+                dependencies {
+                    implementation(kotlin("stdlib-js"))
+                }
+            }
+
+            if (project.kotlinWasmEnabled.toBoolean()) {
+                wasmMain {
+                    dependsOn(jsWasmMain)
+                    dependencies {
+                        implementation(kotlin("stdlib-wasm"))
+                    }
+                }
+            }
         }
     }
 }

diff --git a/...oidx/compose/material/ripple/Ripple.js.kt → ...oidx/compose/material/ripple/Ripple.js.kt b/...oidx/compose/material/ripple/Ripple.js.kt → ...oidx/compose/material/ripple/Ripple.js.kt