Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@ kotlin {
}
binaries.executable()
}
wasmJs {
outputModuleName = "sample"
browser {
commonWebpackConfig {
outputFileName = "sample.js"
}
}
binaries.executable()
}

jvm()

Expand Down Expand Up @@ -56,6 +65,7 @@ kotlin {
iosMain.get().dependsOn(composeMain)
jsMain.get().dependsOn(composeMain)
jvmMain.get().dependsOn(composeMain)
wasmJsMain.get().dependsOn(composeMain)

val notJsMain by creating {
dependsOn(commonMain.get())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.CanvasBasedWindow
import androidx.compose.ui.window.ComposeViewport
import com.juul.sensortag.App
import com.juul.sensortag.configureLogging
import org.jetbrains.skiko.wasm.onWasmReady

@OptIn(ExperimentalComposeUiApi::class)
fun main() {
configureLogging()
actual fun startComposeApp() {
onWasmReady {
CanvasBasedWindow("SensorTag") {
ComposeViewport("ComposeTarget") {
App()
}
}
Expand Down
10 changes: 10 additions & 0 deletions app/src/wasmJsMain/kotlin/StartComposeApp.wasm.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.window.ComposeViewport
import com.juul.sensortag.App

@OptIn(ExperimentalComposeUiApi::class)
actual fun startComposeApp() {
ComposeViewport {
App()
}
}
11 changes: 11 additions & 0 deletions app/src/wasmJsMain/resources/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=no"/>
<title>SensorTag</title>
<script type="application/javascript" src="sample.js"></script>
</head>
<body style="width:100vw;height:100vh;margin:0;padding:0;overflow:hidden;">
</body>
</html>
11 changes: 11 additions & 0 deletions app/src/webMain/kotlin/Main.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import androidx.compose.ui.ExperimentalComposeUiApi
import com.juul.sensortag.App
import com.juul.sensortag.configureLogging

@OptIn(ExperimentalComposeUiApi::class)
fun main() {
configureLogging()
startComposeApp()
}

expect fun startComposeApp()
1 change: 1 addition & 0 deletions bluetooth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ kotlin {
jvm()
macosX64()
macosArm64()
wasmJs().browser()

sourceSets {
commonMain.dependencies {
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ agp = "8.13.0"
android-compile = "35"
android-min = "21"
android-target = "33"
compose = "1.8.2"
compose = "1.10.0"
jvm = "17"
kable = "0.39.2"
kable = "0.42.0"
kotlin = "2.2.21"
kotlinx-coroutines = "1.10.2"
krayon = "0.21.0"
krayon = "0.23.0"
voyager = "1.1.0-beta03"

[libraries]
Expand Down
2 changes: 2 additions & 0 deletions moko-permissions-bluetooth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ kotlin {
jvm()
macosX64()
macosArm64()
wasmJs().browser()

applyDefaultHierarchyTemplate()

Expand All @@ -28,6 +29,7 @@ kotlin {
macosMain.get().dependsOn(nopMain)
jsMain.get().dependsOn(nopMain)
jvmMain.get().dependsOn(nopMain)
wasmJsMain.get().dependsOn(nopMain)

commonMain.dependencies {
api(projects.mokoPermissions)
Expand Down
2 changes: 2 additions & 0 deletions moko-permissions-compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ kotlin {
jvm()
macosX64()
macosArm64()
wasmJs().browser()

applyDefaultHierarchyTemplate()

Expand All @@ -30,6 +31,7 @@ kotlin {
macosMain.get().dependsOn(nopMain)
jsMain.get().dependsOn(nopMain)
jvmMain.get().dependsOn(nopMain)
wasmJsMain.get().dependsOn(nopMain)

commonMain.dependencies {
api(projects.mokoPermissions)
Expand Down
2 changes: 2 additions & 0 deletions moko-permissions/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ kotlin {
jvm()
macosX64()
macosArm64()
wasmJs().browser()

applyDefaultHierarchyTemplate()

Expand All @@ -24,6 +25,7 @@ kotlin {
macosMain.get().dependsOn(nopMain)
jsMain.get().dependsOn(nopMain)
jvmMain.get().dependsOn(nopMain)
wasmJsMain.get().dependsOn(nopMain)

commonMain.dependencies {
implementation(libs.coroutines)
Expand Down
Loading