Skip to content

Commit 493da07

Browse files
authored
Merge branch 'main' into watchos
2 parents 2596077 + 77c2356 commit 493da07

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

backend/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jib {
4343
dependencies {
4444
implementation(projects.shared)
4545

46-
val ktor = "2.1.0"
46+
val ktor = "2.1.1"
4747
implementation("io.ktor:ktor-server-cio:$ktor")
4848
implementation("io.ktor:ktor-server-cors:$ktor")
4949
implementation("io.ktor:ktor-server-auth-jwt:$ktor")

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.*
33
plugins {
44
kotlin("multiplatform") version "1.7.10" apply false
55
kotlin("plugin.serialization") version "1.7.10" apply false
6-
id("org.jetbrains.compose") version "1.2.0-alpha01-dev774" apply false
6+
id("org.jetbrains.compose") version "1.2.0-alpha01-dev786" apply false
77
id("app.cash.sqldelight") version "2.0.0-alpha03" apply false
88

99
id("com.android.application") version "7.2.2" apply false

clients/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ kotlin {
5555

5656
sourceSets {
5757
val sqlDelight = "2.0.0-alpha03"
58-
val ktor = "2.1.0"
58+
val ktor = "2.1.1"
5959
commonMain {
6060
dependencies {
6161
api(projects.shared)

desktop/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
dependencies {
88
implementation(projects.composeClients)
99

10-
val ktor = "2.1.0"
10+
val ktor = "2.1.1"
1111
implementation("io.ktor:ktor-client-cio:$ktor")
1212
implementation("app.cash.sqldelight:sqlite-driver:2.0.0-alpha03")
1313
implementation(compose.desktop.currentOs)

shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ kotlin {
2727

2828
api("app.softwork:kotlinx-uuid-core:0.0.17")
2929

30-
val ktor = "2.1.0"
30+
val ktor = "2.1.1"
3131
api("io.ktor:ktor-client-core:$ktor")
3232
api("io.ktor:ktor-resources:$ktor")
3333
api("io.ktor:ktor-client-resources:$ktor")

web/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ dependencies {
2424
implementation(projects.clients)
2525

2626
implementation(compose.web.core)
27-
implementation("app.softwork:bootstrap-compose:0.1.7")
27+
implementation("app.softwork:bootstrap-compose:0.1.8")
2828
implementation("app.softwork:routing-compose:0.2.8")
2929
implementation(npm("sql.js", "1.7.0"))
3030

@@ -37,8 +37,8 @@ dependencies {
3737

3838
licensee {
3939
allow("Apache-2.0")
40-
allowDependency("org.jetbrains.compose.web", "web-core-js", "1.2.0-alpha01-dev774")
41-
allowDependency("org.jetbrains.compose.web", "web-core", "1.2.0-alpha01-dev774")
42-
allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime-js", "1.2.0-alpha01-dev774")
43-
allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime", "1.2.0-alpha01-dev774")
40+
allowDependency("org.jetbrains.compose.web", "web-core-js", "1.2.0-alpha01-dev778")
41+
allowDependency("org.jetbrains.compose.web", "web-core", "1.2.0-alpha01-dev778")
42+
allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime-js", "1.2.0-alpha01-dev778")
43+
allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime", "1.2.0-alpha01-dev778")
4444
}

0 commit comments

Comments
 (0)