From 25934d45c928083520cbcdf8bed4b8fdcacbf989 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Fri, 1 Mar 2024 16:07:46 -0800 Subject: [PATCH] Remove support for wasm --- .../kotlin/KotlinInjectConventionPlugin.kt | 5 ++++ .../apps/nowinandroid/KotlinMultiplatform.kt | 26 ++++++++++--------- core/database/build.gradle.kts | 13 +++++----- 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/build-logic/convention/src/main/kotlin/KotlinInjectConventionPlugin.kt b/build-logic/convention/src/main/kotlin/KotlinInjectConventionPlugin.kt index 61e491ff1..692c8cb02 100644 --- a/build-logic/convention/src/main/kotlin/KotlinInjectConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/KotlinInjectConventionPlugin.kt @@ -34,6 +34,11 @@ class KotlinInjectConventionPlugin: Plugin { add("kspIosX64", libs.findLibrary("kotlin.inject.compiler.ksp").get()) add("kspIosArm64", libs.findLibrary("kotlin.inject.compiler.ksp").get()) add("kspIosSimulatorArm64", libs.findLibrary("kotlin.inject.compiler.ksp").get()) +// add("kspWasmJs", libs.findLibrary("kotlin.inject.compiler.ksp").get()) + add("kspAndroid", libs.findLibrary("kotlin.inject.compiler.ksp").get()) + add("kspJvm", libs.findLibrary("kotlin.inject.compiler.ksp").get()) + add("kspMacosX64", libs.findLibrary("kotlin.inject.compiler.ksp").get()) + add("kspMacosArm64", libs.findLibrary("kotlin.inject.compiler.ksp").get()) } } } diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt index cb511ed06..9e77a6f91 100644 --- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt +++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinMultiplatform.kt @@ -39,19 +39,21 @@ internal fun Project.configureKotlinMultiplatform() { jvm() androidTarget() +// SqlDelight does not support wasm yet +// https://github.com/cashapp/sqldelight/pull/4965/files - wasmJs { - browser { - commonWebpackConfig { - devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { - static = (static ?: mutableListOf()).apply { - // Serve sources to debug inside browser - add(project.projectDir.path) - } - } - } - } - } +// wasmJs { +// browser { +// commonWebpackConfig { +// devServer = (devServer ?: KotlinWebpackConfig.DevServer()).apply { +// static = (static ?: mutableListOf()).apply { +// // Serve sources to debug inside browser +// add(project.projectDir.path) +// } +// } +// } +// } +// } // tier 1 // :core:datastore:linuxMain: Could not resolve com.russhwolf:multiplatform-settings-no-arg:1.1.1. diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts index ac81f18d7..faf1fc3c3 100644 --- a/core/database/build.gradle.kts +++ b/core/database/build.gradle.kts @@ -50,12 +50,13 @@ kotlin { jvmMain.dependencies { implementation(libs.sqldelight.sqlite.driver) } - jsMain.dependencies { - implementation(libs.sqldelight.webworker.driver) - implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.0.1")) - implementation(npm("sql.js", "1.8.0")) - implementation(devNpm("copy-webpack-plugin", "9.1.0")) - } + // https://github.com/cashapp/sqldelight/pull/4965/files +// wasmJsMain.dependencies { +// implementation(libs.sqldelight.webworker.driver) +// implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.0.1")) +// implementation(npm("sql.js", "1.8.0")) +// implementation(devNpm("copy-webpack-plugin", "9.1.0")) +// } commonTest.dependencies { implementation(libs.kotlin.test) implementation(libs.kotlinx.coroutines.test)