Skip to content

Commit 29022cb

Browse files
committed
chore: dep updates and misc build changes
1 parent 4670aa9 commit 29022cb

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

backend/jvm/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ dependencies {
147147
implementation(projects.shared)
148148
implementation(projects.backend.data)
149149
implementation(projects.backend.profiling)
150+
implementation(projects.backend.security)
151+
150152
// Server dependencies
151153
implementation(libs.ktor.server.core)
152154
implementation(libs.ktor.server.netty)

backend/security/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ kotlin.sourceSets {
99
commonMain { dependencies { implementation(projects.shared) } }
1010

1111
jvmMain {
12-
dependencies { implementation(libs.directory.keystore) }
13-
1412
kotlin.srcDir("src/main/kotlin")
1513
resources.srcDir("src/main/resources")
1614
}

compose/desktop/src/wasmJsMain/resources/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>Kotlin Compose Web App</title>
77
<script src="skiko.js"></script>
8+
<script async defer src="wasm-app.js"></script>
89
</head>
910
<body>
1011
<div>
1112
<canvas id="ComposeTarget" width="800" height="600"></canvas>
1213
</div>
13-
<script src="wasm-app.js"></script>
1414
</body>
1515
</html>

gradle/build-logic/src/main/kotlin/common/MultiPlatformExtns.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ fun KotlinMultiplatformExtension.commonTarget() {
3434
dependencies {
3535
api(libs.kotlinx.coroutines.core)
3636
api(libs.kotlinx.datetime)
37+
api(libs.kotlinx.io.core)
3738
api(libs.kotlinx.serialization.json)
39+
api(libs.kotlinx.serialization.json.io)
3840
api(libs.kotlinx.collections.immutable)
3941
api(libs.kotlin.redacted.annotations)
40-
api(libs.kotlinx.io.core)
4142
api(libs.kotlin.retry)
4243
api(libs.kotlin.logging)
4344
api(libs.kotlinx.html)
@@ -121,7 +122,7 @@ fun KotlinMultiplatformExtension.jvmTarget() {
121122
api(libs.kotlinx.coroutines.slf4j)
122123
api(libs.jspecify)
123124
api(libs.password4j)
124-
api(libs.sslcontext.kickstart)
125+
api(libs.bundles.keystore)
125126
// https://kotlinlang.org/docs/ksp-multiplatform.html
126127
api(libs.google.auto.annotations)
127128
ksp(libs.ksp.auto.service)

gradle/build-logic/src/main/kotlin/plugins/kotlin.jvm.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,14 @@ dependencies {
205205
implementation(platform(libs.kotlin.wrappers.bom))
206206
implementation(kotlin("stdlib"))
207207
implementation(libs.kotlinx.coroutines.core)
208+
implementation(libs.kotlinx.io.core)
208209
implementation(libs.kotlinx.serialization.json)
210+
implementation(libs.kotlinx.serialization.json.io)
209211
implementation(libs.kotlinx.datetime)
210212
implementation(libs.kotlin.redacted.annotations)
211213
implementation(libs.jspecify)
212214
implementation(libs.password4j)
213-
implementation(libs.sslcontext.kickstart)
215+
implementation(libs.bundles.keystore)
214216
implementation(libs.bundles.ajalt)
215217
// Auto-service
216218
ksp(libs.ksp.auto.service)

gradle/libs.versions.toml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ kotlinx-io = "0.4.0"
2525
kotlinx-atomicfu = "0.24.0"
2626
kotlinx-coroutines = "1.8.1"
2727
kotlinx-datetime = "0.6.0"
28-
kotlinx-serialization = "1.7.0"
28+
kotlinx-serialization = "1.7.1"
2929
kotlinx-rpc = "0.1.0"
3030
kotlinx-collections-immutable = "0.3.7"
3131
kotlinx-lincheck = "2.32"
@@ -35,7 +35,7 @@ kotlinx-metadata = "0.9.0"
3535
kotlinx-reflect-lite = "1.1.0"
3636
kotlinx-bcv = "0.15.0-Beta.2"
3737
kotlin-dokka = "1.9.20"
38-
kotlin-wrappers = "1.0.0-pre.761"
38+
kotlin-wrappers = "1.0.0-pre.763"
3939
kotlin-redacted = "1.9.0"
4040
kotlinx-multik = "0.2.3"
4141
kotlinx-dataframe = "0.13.1"
@@ -49,7 +49,7 @@ ktor-cohort = "2.5.1"
4949
otel = "1.39.0"
5050
otel-instr = "2.5.0"
5151
otel-alpha = "2.3.0-alpha"
52-
elastic-otel = "0.3.2"
52+
elastic-otel = "0.4.0"
5353
okio = "3.9.0"
5454
sslcontext-kickstart = "8.3.6"
5555
ksp-auto-service = "1.2.0"
@@ -66,12 +66,12 @@ jgit = "6.5.0.202303070854-r"
6666
jte = "3.1.12"
6767
jimfs = "1.3.0"
6868
sshj = "0.38.0"
69-
pty4j = "0.12.29"
69+
pty4j = "0.12.34"
7070
junit = "5.11.0-M2"
7171
koin = "3.5.6"
7272
kotest = "5.9.0"
7373
mockk = "1.13.11"
74-
mokkery = "2.1.0"
74+
mokkery = "2.1.1"
7575
slf4j = "2.1.0-alpha1"
7676
logback = "1.5.6"
7777
logback-tyler = "0.7"
@@ -89,7 +89,7 @@ rsocket = "0.16.0"
8989
jctools = "4.0.1"
9090
benasher44-uuid = "0.8.4"
9191
kotlinx-uuid = "0.0.25"
92-
kotlin-codepoints = "0.8.0"
92+
kotlin-codepoints = "0.9.0"
9393
kotlin-logging = "7.0.0"
9494
kotlin-bignum = "0.3.9"
9595
kotlin-diff = "0.6.0"
@@ -108,7 +108,7 @@ java-keyring = "1.0.3"
108108
java-keychain = "1.1.0"
109109
webjars-xterm = "5.1.0"
110110
arrow-suspendapp = "0.4.1-alpha.5"
111-
exposed = "0.51.1"
111+
exposed = "0.52.0"
112112
postgresql = "42.7.3"
113113
hikariCP = "5.1.0"
114114
h2 = "2.2.220"
@@ -188,7 +188,7 @@ includegit-plugin = "0.1.6"
188188
kmp-hierarchy = "1.1"
189189
jetbrains-compose = "1.6.11"
190190
jetbrains-compose-nav = "2.8.0-alpha02"
191-
kobweb = "0.18.1"
191+
kobweb = "0.18.2"
192192
detekt = "1.23.6"
193193
detekt-compose-rules = "0.4.2"
194194

@@ -263,6 +263,7 @@ kotlinx-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx
263263
kotlinx-serialization-bom = { module = "org.jetbrains.kotlinx:kotlinx-serialization-bom" , version.ref = "kotlinx-serialization" }
264264
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core" , version.ref = "kotlinx-serialization"}
265265
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json" , version.ref = "kotlinx-serialization"}
266+
kotlinx-serialization-json-io = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json-io" , version.ref = "kotlinx-serialization"}
266267
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime" , version.ref = "kotlinx-datetime"}
267268
kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu" , version.ref = "kotlinx-atomicfu"}
268269
kotlinx-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core" , version.ref = "kotlinx-io"}
@@ -525,8 +526,8 @@ kfswatch = { module = "io.github.irgaly.kfswatch:kfs
525526

526527
[bundles]
527528
ajalt = ["ajalt-mordant", "ajalt-mordant-coroutines", "ajalt-colormath", "ajalt-clikt"]
528-
ktor-server = []
529-
ktor-client = []
529+
keystore = ["sslcontext-kickstart", "directory-keystore"]
530+
530531

531532
[plugins]
532533
kotlin-powerassert = { id = "org.jetbrains.kotlin.plugin.power-assert" , version.ref = "kotlin"}

shared/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ dependencies {
3434
// commonMainApi(libs.urlencoder)
3535
// commonMainApi(libs.arrow.suspendapp)
3636
// commonMainApi(libs.parsus)
37-
// commonMainApi(libs.okio)
38-
// commonTestApi(libs.okio.fakefilesystem)
3937
// jvmMainApi(libs.kotlin.reflect)
4038
// jvmMainApi(libs.logback.classic)
4139
}

0 commit comments

Comments
 (0)