Skip to content

Commit 4cd5b1e

Browse files
authored
Merge pull request #116 from joreilly/cmp_1_7
Compose Multiplatform 1.7.0
2 parents 4940930 + 2637d7f commit 4cd5b1e

File tree

6 files changed

+14
-53
lines changed

6 files changed

+14
-53
lines changed

composeApp/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ kotlin {
2727
}
2828

2929

30-
js(){
31-
browser()
32-
binaries.executable()
33-
}
34-
35-
3630
androidTarget()
3731
jvm("desktop")
3832

composeApp/src/jsMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.js.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

composeApp/src/jsMain/kotlin/main.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

composeApp/src/jsMain/resources/index.html

Lines changed: 0 additions & 12 deletions
This file was deleted.

gradle/libs.versions.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
2-
kotlin = "2.0.20"
3-
ksp = "2.0.20-1.0.25"
2+
kotlin = "2.0.21"
3+
ksp = "2.0.21-1.0.25"
44
kotlinx-coroutines = "1.9.0"
55

66

7-
agp = "8.7.0"
7+
agp = "8.7.1"
88
android-compileSdk = "34"
99
android-minSdk = "24"
1010
android-targetSdk = "34"
1111
androidx-activityCompose = "1.9.2"
1212
compose = "1.7.3"
13-
compose-plugin = "1.7.0-rc01"
14-
composeAdaptiveLayout = "1.0.0-rc01"
13+
compose-plugin = "1.7.0"
14+
composeAdaptiveLayout = "1.0.0"
1515
harawata-appdirs = "1.2.2"
1616
koalaplot = "0.5.3"
1717
koin = "3.6.0-Beta4"

kotlin-js-store/yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,19 @@
126126
"@types/estree" "*"
127127

128128
"@types/eslint@*":
129-
version "8.44.8"
130-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.8.tgz#f4fe1dab9b3d3dd98082d4b9f80e59ab40f1261c"
131-
integrity sha512-4K8GavROwhrYl2QXDXm0Rv9epkA8GBFu0EI+XrrnnuCl7u8CWBRusX7fXJfanhZTDWSAL24gDI/UqXyUM0Injw==
129+
version "9.6.1"
130+
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
131+
integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
132132
dependencies:
133133
"@types/estree" "*"
134134
"@types/json-schema" "*"
135135

136-
"@types/estree@*", "@types/estree@^1.0.5":
136+
"@types/estree@*":
137+
version "1.0.6"
138+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
139+
integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
140+
141+
"@types/estree@^1.0.5":
137142
version "1.0.5"
138143
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
139144
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==

0 commit comments

Comments
 (0)