Skip to content

Commit 0c4ed44

Browse files
committed
chore: bump versions
1 parent 6fd87e7 commit 0c4ed44

File tree

6 files changed

+31
-18
lines changed

6 files changed

+31
-18
lines changed

composeApp/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ kotlin {
1717
binaries.executable()
1818
}
1919

20-
androidTarget {
21-
compilations.all {
22-
kotlinOptions {
23-
jvmTarget = "1.8"
24-
}
25-
}
26-
}
20+
androidTarget {}
2721

2822
listOf(
2923
iosX64(),
@@ -46,6 +40,7 @@ kotlin {
4640
implementation(compose.runtime)
4741
implementation(compose.foundation)
4842
implementation(compose.material)
43+
implementation(compose.materialIconsExtended)
4944
implementation(compose.ui)
5045
implementation(compose.material3)
5146
implementation(compose.components.resources)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import androidx.compose.ui.ExperimentalComposeUiApi
22
import androidx.compose.ui.window.CanvasBasedWindow
3+
import androidx.compose.ui.window.ComposeViewport
34

45
@OptIn(ExperimentalComposeUiApi::class)
56
fun main() {
6-
CanvasBasedWindow(canvasElementId = "ComposeTarget") { App() }
7+
ComposeViewport(content = { App() })
78
}

composeApp/src/wasmJsMain/resources/index.html

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
56
<title>Compose App</title>
6-
<script type="application/javascript" src="skiko.js"></script>
77
<script type="application/javascript" src="composeApp.js"></script>
8+
<style>
9+
html, body {
10+
width: 100%;
11+
height: 100%;
12+
margin: 0;
13+
padding: 0;
14+
background-color: white;
15+
overflow: hidden;
16+
}
17+
</style>
818
</head>
919
<body>
1020
<canvas id="ComposeTarget"></canvas>

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
kotlin.code.style=official
22

33
#Gradle
4-
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
5-
4+
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx4096M"
65

76
#Android
87
android.nonTransitiveRClass=true

gradle/libs.versions.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ agp = "8.13.0"
33
android-compileSdk = "36"
44
android-minSdk = "24"
55
android-targetSdk = "36"
6-
androidx-activityCompose = "1.10.1"
7-
compose = "1.7.3"
8-
compose-ui = "1.7.6"
9-
kotlin = "2.1.21"
6+
androidx-activityCompose = "1.11.0"
7+
compose = "1.9.1"
8+
compose-ui = "1.9.4"
9+
kotlin = "2.2.21"
1010

1111
[libraries]
12-
kodein-emoji = { module = "org.kodein.emoji:emoji-kt", version = "1.3.0" }
13-
kodein-emoji-compose = { module = "org.kodein.emoji:emoji-compose-m3", version = "1.3.0" }
12+
kodein-emoji = { module = "org.kodein.emoji:emoji-kt", version = "2.2.0" }
13+
kodein-emoji-compose = { module = "org.kodein.emoji:emoji-compose-m3", version = "2.2.0" }
1414
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
1515
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose-ui" }
1616
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui" }
17-
compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.8.0-alpha01" }
17+
compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version = "2.9.1" }
1818

1919
[plugins]
2020
androidApplication = { id = "com.android.application", version.ref = "agp" }

kotlin-js-store/wasm/yarn.lock

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"@js-joda/core@3.2.0":
6+
version "3.2.0"
7+
resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273"
8+
integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg==

0 commit comments

Comments
 (0)