Add K/Wasm support #914

eymar · 2023-11-24T08:55:09Z

This PR:

updates kotlin to 1.9.21
removes watchosX86() target - it's not available since kotlin 1.9.20

eymar · 2023-11-29T08:50:52Z

buildSrc/plugins/src/main/kotlin/androidx/build/AndroidXPlugin.kt

@@ -35,6 +35,19 @@ class AndroidXPlugin : Plugin<Project> {
                "from" to "$supportRoot/buildSrc/apply/applyAndroidXImplPlugin.gradle"
            )
        )
+
+        project.configurations.all {
+            // TODO: remove these HACKS when possible


It's not supposed to be merged into jb-main branch.
Should be removed when all required libs are properly built and published

eymar · 2023-11-29T08:51:35Z

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

@@ -138,10 +138,20 @@ class AndroidXComposeImplPlugin : Plugin<Project> {
            }

            project.tasks.withType(KotlinJsCompile::class.java).configureEach { compile ->
+                val isWasm = compile.kotlinOptions.freeCompilerArgs.contains("-Xwasm")


Currently KotlinJsCompile task type is reused for k/wasm compilations.

For the nearest release we'll keep decoys enabled for k/js, but not for k/wasm. In the future it will be disabled for both.

eymar · 2023-11-29T08:52:23Z

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

-                project.rootProject.resolveProject(":compose:compiler:compiler")
-            }
-        )
+        project.dependencies.add(COMPILER_PLUGIN_CONFIGURATION, "org.jetbrains.compose.compiler:compiler:1.5.4")


To build the compose-core libs with our published compose compiler plugin, rather than from the plugin built from the sources.
This way we have a single source of truth.

let's move this version to gradle.properties

eymar · 2023-11-29T08:55:25Z

...osted/src/main/java/androidx/compose/compiler/plugins/kotlin/ComposeIrGenerationExtension.kt

@@ -125,6 +126,7 @@ class ComposeIrGenerationExtension(

        val mangler = when {
            pluginContext.platform.isJs() -> JsManglerIr
+            pluginContext.platform.isWasm() -> JsManglerIr


In the future, the changes in compose/compiler can be ignored. When merging from upstream we can take their sources.
We have a separate branch with our patches for building and publishing the compose compiler plugin.

eymar · 2023-11-29T10:00:15Z

testutils/testutils-kmp/src/commonMain/kotlin/androidx/kruth/Subject.kt

@@ -193,6 +193,6 @@ private fun Any?.integralValue(): Long = when (this) {

 private fun Any?.toStringForAssert(): String = when {
    this == null -> toString()
-    isIntegralBoxedPrimitive() -> "${this::class.qualifiedName}<$this>"
+    isIntegralBoxedPrimitive() -> "${this::class.simpleName}<$this>"


qualifiedName is a reflection API not available for web targets.

eymar · 2023-11-29T11:22:02Z

compose/mpp/demo-uikit/build.gradle.kts

@@ -112,20 +112,3 @@ apple {
        }
    }
 }
-
-// TODO: Workaround, see https://youtrack.jetbrains.com/issue/KT-55751
-val myAttribute = Attribute.of("myOwnAttribute", String::class.java)


Dima has checked that this workaround is not needed anymore with kotlin 1.9.2x

eymar · 2023-11-29T13:56:38Z

...est-junit4/src/skikoMain/kotlin/androidx/compose/ui/test/junit4/ComposeRootRegistry.skiko.kt

    /**
     * Returns if the registry is setup to receive registrations from [SkiaRootForTest]s
     */
    val isSetUp: Boolean
-        get() = SkiaRootForTest.onRootCreatedCallback == ::onRootCreated
+        get() = SkiaRootForTest.onRootCreatedCallback == _onRootCreated


cc @MatkovIvan JFYI: unfortunately, not all targets reuse the same reference here.
Apparently, k/wasm creates a new instance every time and the check is always false.

Let's just store isSetUp as a boolean flag then

igordmn · 2023-11-30T11:12:04Z

.gitignore

@@ -39,3 +39,5 @@ __pycache__

 # Don't ignore src files under build package
 !**/src/**/build
+/jbdeps/android-sdk/linux/*


Why do we need this? We already have jbdeps/.gitignore

Hm. Right, for some reason it didn't ignore the files for me.

removed the change

igordmn · 2023-11-30T11:25:50Z

buildSrc/build.gradle

@@ -32,7 +32,7 @@ allprojects {
        kotlinOptions {
            jvmTarget = "17"
            freeCompilerArgs += [
-                    "-Werror",
+                    // "-Werror", // commented in JB-fork


Can we not comment this, and fix the warnings?

igordmn · 2023-11-30T11:32:18Z

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

-                project.rootProject.resolveProject(":compose:compiler:compiler")
-            }
-        )
+        project.dependencies.add(COMPILER_PLUGIN_CONFIGURATION, "org.jetbrains.compose.compiler:compiler:1.5.4")


let's move this version to gradle.properties

igordmn · 2023-11-30T12:41:21Z

compose/runtime/runtime/src/nativeMain/kotlin/androidx/compose/runtime/ActualNative.native.kt

    actual fun get(): Int = delegate.value
    actual fun set(value: Int) {
        delegate.value = value
    }
    actual fun add(amount: Int): Int = delegate.addAndGet(amount)
 }

+@OptIn(ExperimentalNativeApi::class)


We should keep in mind that we can't release Compose for iOS if at that time it is still be experimental. It doesn't add binary compatibility guarantees, which we need for stable Compose targets.

igordmn · 2023-11-30T12:42:23Z

compose/runtime/runtime/src/wasmJsTest/kotlin/kotlinx/test/Actuals.wasm.kt

+
+@OptIn(DelicateCoroutinesApi::class)
+actual suspend fun testWithTimeout(timeoutMs: Long, block: suspend CoroutineScope.() -> Unit) {
+    GlobalScope.launch {


Suggested change

GlobalScope.launch {

coroutineScope {

block()

}

Will this work? An async call is fragile.

This function is not implemented properly at all (I added this dumb implementation a few month ago and forgot about it). It ignores timeoutMs. I'll update it separately.
It's used in our tests only.

COMPOSE-662

igordmn · 2023-11-30T12:46:06Z

...est-junit4/src/wasmJsMain/kotlin/androidx/compose/ui/test/junit4/Synchronization.wasmMain.kt

+ */
+
+// TODO: in a browser we have only 1 thread and it's actually a UI thread.
+// But returning `true` here breaks `setContent` - `waitForIdle` is not called, but seems to be necessary.


Let's create an issue to investigate this. It shouldn't work this way.

Added to the comment - COMPOSE-661

eymar · 2023-12-04T16:48:17Z

buildSrc/build.gradle

-            languageVersion = "1.5"
-            apiVersion = "1.5"
+            languageVersion = "1.8"
+            apiVersion = "1.8"


kotlin 1.9.21 shows a warning for 1.5

* Workaround `isOnUiThread` (ui-test) for k/wasm browser target * Implement PlatformLocale and StringDelegate for k/wasm * Get rid of expect/actuals for jsWasmMain and use js(...) for a common implementation * use the list of preferred languages - `window.navigator.languages` * delete unused fun `currentLanguageTag`

reason: I guess new compiler plugin generated added stable field to CompositionScopedCoroutineScopeCanceller. Also new kotlin added getEntries method to Recomposer$State

This PR: - updates kotlin to 1.9.21 - removes watchosX86() target - it's not available since kotlin 1.9.20 --------- Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>

This a comanion PR to JetBrains/compose-multiplatform-core#914 Resources lib doesn't contain k/wasm target yet. It will be added in a separate PR --------- Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>

This PR: - updates kotlin to 1.9.21 - removes watchosX86() target - it's not available since kotlin 1.9.20 --------- Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>

eymar changed the title ~~Wasm main sync 1.5.10~~ Add K/Wasm support Nov 24, 2023

eymar mentioned this pull request Nov 24, 2023

Make OEL publication compatible with kotlin 1.9.0 and newer #841

Merged

eymar force-pushed the wasm-main-sync-1.5.10 branch from b0c4068 to 8234ac7 Compare November 24, 2023 09:54

eymar commented Nov 29, 2023

View reviewed changes

eymar requested a review from igordmn November 29, 2023 16:36

igordmn reviewed Nov 30, 2023

View reviewed changes

eymar commented Dec 4, 2023

View reviewed changes

eymar mentioned this pull request Dec 6, 2023

Update for k/wasm JetBrains/compose-multiplatform#4009

Merged

eymar added 16 commits December 6, 2023 16:10

Sync 1. Kotlin 1.9.0

3b3b9d6

Include skiko.wasm in tests (ui, foundation, etc) for k/wasm target

507f309

Add missing compose test API for k/wasm target (#553)

85356cd

Workaround https://youtrack.jetbrains.com/issue/KT-58293

73e05d7

add compose:mpp:demo run configuration for k/wasm target

8e9a752

Update kotlin to 1.9.0 and update other libs

d8bf998

enable k/wasm (not working yet)

420a870

enable k/wasm 2 (not working yet)

75bcd52

Refactoring of k/wasm sources

94c316d

k/wasm demo runs

a897647

publication fixes

f30432b

Fix publication

b440ee6

Fixes

b7645d8

Update kotlin to 1.9.20-RC

eddc292

Update oel.androidx.version to 1.5.4

dd66563

eymar and others added 21 commits December 6, 2023 16:11

Remove deleted AllowDifferentMembersInActual annotation usages

4487fa0

Rebase fixes

2cf32f3

update to kotlin 1.9.21

a670c46

cleanup

dac0c51

cleanup

64a9bcc

cleanup

d79a7d4

keep generateDecoys for k/js, but not for k/wasm

7b0f5c1

cleanup

6a541fa

make tests run for k/wasm target

e8e0f99

Use 0.0.0-SNAPSHOT skiko to get rid of demo extra configuration

3a2f339

fixes for commonMain metadata compilation

dfe1314

Use an official kotlinSerialization version with k/wasm support

3e6a8e1

Disable decoys for k/js

1f555c3

Update runtime.api file

67d7677

reason: I guess new compiler plugin generated added stable field to CompositionScopedCoroutineScopeCanceller. Also new kotlin added getEntries method to Recomposer$State

Ignore SnapshotStateMapTests.validateValuesRemove for js

be17f1a

PR review fixes

0bcdd8b

Update more .api files: new getEntries method for enums

cc9d5c3

Fix runtime tests

27464e2

Make PlatformDateFormat.jsWasm.kt common for k/s and k/wasm in material3

0a25950

remove wasm/experimental maven repositories

8281ca6

Fixes after rebase

3e61170

eymar force-pushed the wasm-main-sync-1.5.10 branch from d64d5fb to 3e61170 Compare December 6, 2023 15:18

eymar marked this pull request as ready for review December 6, 2023 15:18

eymar added 2 commits December 6, 2023 17:19

add YT issue

03d1051

add YT issue

0a2cc16

eymar merged commit 3d70ec3 into jb-main Dec 6, 2023
1 check passed

eymar deleted the wasm-main-sync-1.5.10 branch December 6, 2023 16:22

igordmn pushed a commit that referenced this pull request Jan 30, 2024

Add K/Wasm support (#914)

f548b6e

This PR: - updates kotlin to 1.9.21 - removes watchosX86() target - it's not available since kotlin 1.9.20 --------- Co-authored-by: Oleksandr Karpovich <oleksandr.karpovich@jetbrains.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add K/Wasm support #914

Add K/Wasm support #914

eymar commented Nov 24, 2023 •

edited

Loading

eymar Nov 29, 2023

eymar Nov 29, 2023 •

edited

Loading

eymar Nov 29, 2023

igordmn Nov 30, 2023

eymar Dec 1, 2023

eymar Nov 29, 2023

eymar Nov 29, 2023

eymar Nov 29, 2023

eymar Nov 29, 2023 •

edited

Loading

MatkovIvan Nov 29, 2023

eymar Nov 29, 2023

igordmn Nov 30, 2023

eymar Nov 30, 2023

eymar Dec 1, 2023

igordmn Nov 30, 2023

eymar Dec 1, 2023

igordmn Nov 30, 2023

igordmn Nov 30, 2023

igordmn Nov 30, 2023

eymar Dec 1, 2023 •

edited

Loading

eymar Dec 6, 2023

igordmn Nov 30, 2023

eymar Dec 6, 2023 •

edited

Loading

eymar Dec 4, 2023

Add K/Wasm support #914

Add K/Wasm support #914

Conversation

eymar commented Nov 24, 2023 • edited Loading

Choose a reason for hiding this comment

eymar Nov 29, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eymar Nov 29, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eymar Dec 1, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eymar Dec 6, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eymar commented Nov 24, 2023 •

edited

Loading

eymar Nov 29, 2023 •

edited

Loading

eymar Nov 29, 2023 •

edited

Loading

eymar Dec 1, 2023 •

edited

Loading

eymar Dec 6, 2023 •

edited

Loading