diff --git a/compose-jetsnack/android/build.gradle.kts b/compose-jetsnack/android/build.gradle.kts index 2f97e5e..caac184 100644 --- a/compose-jetsnack/android/build.gradle.kts +++ b/compose-jetsnack/android/build.gradle.kts @@ -37,6 +37,6 @@ android { } compose { - val composeVersion = project.property("compose.version") as String + val composeVersion = project.property("compose.compiler.version") as String kotlinCompilerPlugin.set(composeVersion) } diff --git a/compose-jetsnack/build.gradle.kts b/compose-jetsnack/build.gradle.kts index 80752c2..eee676b 100644 --- a/compose-jetsnack/build.gradle.kts +++ b/compose-jetsnack/build.gradle.kts @@ -13,14 +13,6 @@ allprojects { configurations.all { val conf = this conf.resolutionStrategy.eachDependency { - val isWasm = conf.name.contains("wasm", true) - val isJs = conf.name.contains("js", true) - val isComposeGroup = requested.module.group.startsWith("org.jetbrains.compose") - val isComposeCompiler = requested.module.group.startsWith("org.jetbrains.compose.compiler") - if (isComposeGroup && !isComposeCompiler && !isWasm && !isJs) { - val composeVersion = project.property("compose.version") as String - useVersion(composeVersion) - } if (requested.module.name.startsWith("kotlin-stdlib")) { val kotlinVersion = project.property("kotlin.version") as String useVersion(kotlinVersion) diff --git a/compose-jetsnack/common/build.gradle.kts b/compose-jetsnack/common/build.gradle.kts index ec26e5f..c482820 100644 --- a/compose-jetsnack/common/build.gradle.kts +++ b/compose-jetsnack/common/build.gradle.kts @@ -91,7 +91,7 @@ android { } compose { - val composeVersion = project.property("compose.version") as String + val composeVersion = project.property("compose.compiler.version") as String kotlinCompilerPlugin.set(composeVersion) val kotlinVersion = project.property("kotlin.version") as String kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=$kotlinVersion") diff --git a/compose-jetsnack/desktop/build.gradle.kts b/compose-jetsnack/desktop/build.gradle.kts index 899e7ff..8487cbb 100644 --- a/compose-jetsnack/desktop/build.gradle.kts +++ b/compose-jetsnack/desktop/build.gradle.kts @@ -41,6 +41,6 @@ compose.desktop { } compose { - val composeVersion = project.property("compose.version") as String + val composeVersion = project.property("compose.compiler.version") as String kotlinCompilerPlugin.set(composeVersion) } diff --git a/compose-jetsnack/gradle.properties b/compose-jetsnack/gradle.properties index 03aac0c..a7e99e6 100644 --- a/compose-jetsnack/gradle.properties +++ b/compose-jetsnack/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3g kotlin.code.style=official android.useAndroidX=true agp.version=7.3.0 -compose.version=1.5.2.1-Beta +compose.compiler.version=1.5.2.1-Beta3 compose.wasm.version=1.5.1-dev-wasm01 kotlin.version=1.9.20-Beta2 diff --git a/compose-jetsnack/web/build.gradle.kts b/compose-jetsnack/web/build.gradle.kts index a2bf4f7..7081a8f 100644 --- a/compose-jetsnack/web/build.gradle.kts +++ b/compose-jetsnack/web/build.gradle.kts @@ -14,6 +14,7 @@ kotlin { moduleName = "jetsnackwasmapp" browser { commonWebpackConfig { + outputFileName = "jetsnackwasmapp.js" devServer = (devServer ?: KotlinWebpackConfig.DevServer()).copy( // open = mapOf( // "app" to mapOf( @@ -57,8 +58,22 @@ compose.experimental { } compose { - val composeVersion = project.property("compose.version") as String + val composeVersion = project.property("compose.compiler.version") as String kotlinCompilerPlugin.set(composeVersion) val kotlinVersion = project.property("kotlin.version") as String kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=$kotlinVersion") } + + +// Reason: https://jetbrains.slack.com/archives/C047QCXNLTX/p1694093406932359 +val devCompileSyncTask = project.tasks.getByName("wasmJsDevelopmentExecutableCompileSync") +val prodCompileSyncTask = project.tasks.getByName("wasmJsProductionExecutableCompileSync") +listOf(devCompileSyncTask, prodCompileSyncTask).forEach { + it.doLast { + val f = + project.buildDir.resolve("../../build/js/packages/jetsnackwasmapp/kotlin/jetsnackwasmapp.uninstantiated.mjs") + .normalize() + val t = f.readText().replace("'skia': imports['skia'] ?? await import('skia'),", "'skia': imports['skia'],") + f.writeText(t) + } +} \ No newline at end of file diff --git a/compose-jetsnack/web/src/wasmJsMain/resources/index.html b/compose-jetsnack/web/src/wasmJsMain/resources/index.html index d8dfa57..998f1b9 100644 --- a/compose-jetsnack/web/src/wasmJsMain/resources/index.html +++ b/compose-jetsnack/web/src/wasmJsMain/resources/index.html @@ -15,7 +15,7 @@