Merge branch 'main' into watchos

hfhbd · Sep 13, 2022 · 493da07 · 493da07
2 parents 2596077 + 77c2356
commit 493da07
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -43,7 +43,7 @@ jib {
 dependencies {
     implementation(projects.shared)
 
-    val ktor = "2.1.0"
+    val ktor = "2.1.1"
     implementation("io.ktor:ktor-server-cio:$ktor")
     implementation("io.ktor:ktor-server-cors:$ktor")
     implementation("io.ktor:ktor-server-auth-jwt:$ktor")

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@ import io.gitlab.arturbosch.detekt.*
 plugins {
     kotlin("multiplatform") version "1.7.10" apply false
     kotlin("plugin.serialization") version "1.7.10" apply false
-    id("org.jetbrains.compose") version "1.2.0-alpha01-dev774" apply false
+    id("org.jetbrains.compose") version "1.2.0-alpha01-dev786" apply false
     id("app.cash.sqldelight") version "2.0.0-alpha03" apply false
 
     id("com.android.application") version "7.2.2" apply false

diff --git a/clients/build.gradle.kts b/clients/build.gradle.kts
@@ -55,7 +55,7 @@ kotlin {
 
     sourceSets {
         val sqlDelight = "2.0.0-alpha03"
-        val ktor = "2.1.0"
+        val ktor = "2.1.1"
         commonMain {
             dependencies {
                 api(projects.shared)

diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 dependencies {
     implementation(projects.composeClients)
 
-    val ktor = "2.1.0"
+    val ktor = "2.1.1"
     implementation("io.ktor:ktor-client-cio:$ktor")
     implementation("app.cash.sqldelight:sqlite-driver:2.0.0-alpha03")
     implementation(compose.desktop.currentOs)

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -27,7 +27,7 @@ kotlin {
 
                 api("app.softwork:kotlinx-uuid-core:0.0.17")
 
-                val ktor = "2.1.0"
+                val ktor = "2.1.1"
                 api("io.ktor:ktor-client-core:$ktor")
                 api("io.ktor:ktor-resources:$ktor")
                 api("io.ktor:ktor-client-resources:$ktor")

diff --git a/web/build.gradle.kts b/web/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
     implementation(projects.clients)
 
     implementation(compose.web.core)
-    implementation("app.softwork:bootstrap-compose:0.1.7")
+    implementation("app.softwork:bootstrap-compose:0.1.8")
     implementation("app.softwork:routing-compose:0.2.8")
     implementation(npm("sql.js", "1.7.0"))
 
@@ -37,8 +37,8 @@ dependencies {
 
 licensee {
     allow("Apache-2.0")
-    allowDependency("org.jetbrains.compose.web", "web-core-js", "1.2.0-alpha01-dev774")
-    allowDependency("org.jetbrains.compose.web", "web-core", "1.2.0-alpha01-dev774")
-    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime-js", "1.2.0-alpha01-dev774")
-    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime", "1.2.0-alpha01-dev774")
+    allowDependency("org.jetbrains.compose.web", "web-core-js", "1.2.0-alpha01-dev778")
+    allowDependency("org.jetbrains.compose.web", "web-core", "1.2.0-alpha01-dev778")
+    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime-js", "1.2.0-alpha01-dev778")
+    allowDependency("org.jetbrains.compose.web", "internal-web-core-runtime", "1.2.0-alpha01-dev778")
 }