Merge pull request #116 from worldline/dependabot/gradle/material/app…

…-compose-multiplatform/dev-dependencies-11232066d4 Bump the dev-dependencies group across 11 directories with 51 updates
worldline · Oct 2, 2024 · 5e09459 · 5e09459
2 parents c014769 + f0500d2
commit 5e09459
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 55 deletions.
diff --git a/material/app-compose-multiplatform-with-web/shared/build.gradle.kts b/material/app-compose-multiplatform-with-web/shared/build.gradle.kts
@@ -72,9 +72,9 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("androidx.activity:activity-compose:1.6.1")
-                api("androidx.appcompat:appcompat:1.6.1")
-                api("androidx.core:core-ktx:1.9.0")
+                api("androidx.activity:activity-compose:1.9.2")
+                api("androidx.appcompat:appcompat:1.7.0")
+                api("androidx.core:core-ktx:1.13.1")
                 implementation("io.ktor:ktor-client-okhttp:$ktorVersion")
             }
         }
@@ -91,7 +91,7 @@ kotlin {
         val desktopMain by getting {
             dependencies {
                 implementation(compose.desktop.common)
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.9.0")
                 implementation("io.ktor:ktor-client-cio:$ktorVersion")
             }
         }

diff --git a/material/app-compose-multiplatform-with-web/webApp/build.gradle.kts b/material/app-compose-multiplatform-with-web/webApp/build.gradle.kts
@@ -71,8 +71,8 @@ kotlin {
         val jsMain by getting {
             dependsOn(jsWasmMain)
             dependencies {
-                implementation("io.ktor:ktor-client-core:2.3.3")
-                implementation("io.ktor:ktor-client-js:2.3.3")
+                implementation("io.ktor:ktor-client-core:3.2.0")
+                implementation("io.ktor:ktor-client-js:3.2.0")
             }
         }
         val wasmMain by getting {

diff --git a/material/app-compose-multiplatform/shared/build.gradle.kts b/material/app-compose-multiplatform/shared/build.gradle.kts
@@ -32,9 +32,9 @@ kotlin {
         }
         val androidMain by getting {
             dependencies {
-                api("androidx.activity:activity-compose:1.7.2")
-                api("androidx.appcompat:appcompat:1.6.1")
-                api("androidx.core:core-ktx:1.12.0")
+                api("androidx.activity:activity-compose:1.9.2")
+                api("androidx.appcompat:appcompat:1.7.0")
+                api("androidx.core:core-ktx:1.13.1")
             }
         }
         val desktopMain by getting {

diff --git a/material/app-native-wasi/build.gradle.kts b/material/app-native-wasi/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
-    kotlin("multiplatform") version "1.9.20-Beta"
+    kotlin("multiplatform") version "2.1.0-Beta1"
 }
 
 group = "tech.worldline.demo"

diff --git a/material/fullstack-app-kmp/androidApp/build.gradle.kts b/material/fullstack-app-kmp/androidApp/build.gradle.kts
@@ -34,10 +34,10 @@ android {
 
 dependencies {
     implementation(project(":shared"))
-    implementation("androidx.compose.ui:ui:1.4.1")
-    implementation("androidx.compose.ui:ui-tooling:1.4.1")
-    implementation("androidx.compose.ui:ui-tooling-preview:1.4.1")
-    implementation("androidx.compose.foundation:foundation:1.4.1")
-    implementation("androidx.compose.material:material:1.4.1")
-    implementation("androidx.activity:activity-compose:1.7.0")
+    implementation("androidx.compose.ui:ui:1.7.2")
+    implementation("androidx.compose.ui:ui-tooling:1.7.2")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.7.2")
+    implementation("androidx.compose.foundation:foundation:1.7.2")
+    implementation("androidx.compose.material:material:1.7.2")
+    implementation("androidx.activity:activity-compose:1.9.2")
 }
diff --git a/material/fullstack-app-kmp/build.gradle.kts b/material/fullstack-app-kmp/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
     kotlin("android").version("1.8.10").apply(false)
     kotlin("multiplatform").version("1.8.10").apply(false)
     id("org.jetbrains.compose").version("1.3.1").apply(false)
-    id("org.jetbrains.kotlin.jvm") version "1.8.10" apply false
-    kotlin("plugin.serialization") version "1.8.10" apply false
+    id("org.jetbrains.kotlin.jvm") version "2.0.20" apply false
+    kotlin("plugin.serialization") version "2.0.20" apply false
 }
 
 tasks.register("cleanAll", Delete::class) {

diff --git a/material/fullstack-app-kmp/shared/build.gradle.kts b/material/fullstack-app-kmp/shared/build.gradle.kts
@@ -48,10 +48,10 @@ kotlin {
                 implementation(compose.material)
                 implementation(compose.runtime)
                 implementation("io.ktor:ktor-client-core:$ktorVersion") // core source of ktor
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") // For making asynchronous calls
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0") // For making asynchronous calls
                 implementation("io.ktor:ktor-client-content-negotiation:$ktorVersion") // Simplify handling of content type based deserialization
                 implementation("io.ktor:ktor-serialization-kotlinx-json:$ktorVersion")
-                api("moe.tlaster:precompose:1.3.15")
+                api("moe.tlaster:precompose:1.6.2")
 
             }
         }
@@ -115,6 +115,6 @@ android {
 }
 
 dependencies {
-    implementation("androidx.compose.ui:ui-tooling-preview:1.4.1")
-    debugImplementation("androidx.compose.ui:ui-tooling:1.4.1")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.7.2")
+    debugImplementation("androidx.compose.ui:ui-tooling:1.7.2")
 }
diff --git a/material/fullstack-app-kmp/sharedFullStack/build.gradle.kts b/material/fullstack-app-kmp/sharedFullStack/build.gradle.kts
@@ -67,17 +67,17 @@ kotlin {
                 implementation("io.ktor:ktor-server-content-negotiation:$ktorVersion")
                 implementation("io.ktor:ktor-server-netty:$ktorVersion")
                 implementation("io.ktor:ktor-server-html-builder-jvm:$ktorVersion")
-                implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0")
+                implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.11.0")
                 implementation("io.ktor:ktor-server-cors:$ktorVersion")
-                implementation("ch.qos.logback:logback-classic:1.2.11")
+                implementation("ch.qos.logback:logback-classic:1.5.8")
             }
         }
         val jsMain by getting {
             dependencies {
-                val reactVersion = "18.2.0-pre.346"
+                val reactVersion = "18.3.1-pre.814"
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react:$reactVersion")
                 implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:$reactVersion")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.9.3-pre.346")
+                implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:11.13.3-pre.814")
             }
         }
     }

diff --git a/material/rest-api-http4k/build.gradle.kts b/material/rest-api-http4k/build.gradle.kts
@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion.VERSION_11
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.0.20"
     application
 }
 
@@ -59,7 +59,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
     testImplementation("org.http4k:http4k-testing-approval:${http4kVersion}")
     testImplementation("org.http4k:http4k-testing-hamkrest:${http4kVersion}")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.1")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.11.1")
 }
 
diff --git a/material/rest-api-ktor-server/build.gradle.kts b/material/rest-api-ktor-server/build.gradle.kts
@@ -3,9 +3,9 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.10"
-    id("io.ktor.plugin") version "2.3.4"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "2.3.12"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 
 group = "com.worldline.training"

diff --git a/material/rest-api-spring-kotlin/build.gradle.kts b/material/rest-api-spring-kotlin/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("org.springframework.boot") version "3.1.3"
-	id("io.spring.dependency-management") version "1.1.3"
-	kotlin("jvm") version "1.8.22"
-	kotlin("plugin.spring") version "1.8.22"
-	kotlin("plugin.jpa") version "1.8.22"
+	id("org.springframework.boot") version "3.3.4"
+	id("io.spring.dependency-management") version "1.1.6"
+	kotlin("jvm") version "2.0.20"
+	kotlin("plugin.spring") version "2.0.20"
+	kotlin("plugin.jpa") version "2.0.20"
 }
 
 group = "com.worldline.training"

diff --git a/material/rest-api-ui-ktor-quiz-collector/build.gradle.kts b/material/rest-api-ui-ktor-quiz-collector/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.ktor)
-    id("org.graalvm.buildtools.native") version "0.9.8"
+    id("org.graalvm.buildtools.native") version "0.10.3"
     id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 

diff --git a/material/rest-api-ui-ktor-quiz-collector/gradle/libs.versions.toml b/material/rest-api-ui-ktor-quiz-collector/gradle/libs.versions.toml
@@ -1,28 +1,28 @@
 [versions]
-ktor-version = "3.0.0-beta-2"
+ktor-version = "3.0.0-rc-1"
 kotlin-version = "2.0.20"
-logback-version = "1.4.14"
-kotlinx-html-version = "0.10.1"
+logback-version = "1.5.8"
+kotlinx-html-version = "0.11.0"
 
 [libraries]
 ktor-server-compression = { module = "io.ktor:ktor-server-compression-jvm", version.ref = "ktor-version" }
 ktor-server-html-builder = { module = "io.ktor:ktor-server-html-builder-jvm", version.ref = "ktor-version" }
 kotlinx-html = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinx-html-version" }
 ktor-server-core = { module = "io.ktor:ktor-server-core-jvm", version.ref = "ktor-version" }
-kotlin-css = { module = "org.jetbrains:kotlin-css-jvm", version = "1.0.0-pre.129-kotlin-1.4.20" }
+kotlin-css = { module = "org.jetbrains:kotlin-css-jvm", version = "1.0.0-pre.156-kotlin-1.5.0" }
 ktor-server-cors = { module = "io.ktor:ktor-server-cors-jvm", version.ref = "ktor-version" }
 ktor-server-host-common = { module = "io.ktor:ktor-server-host-common-jvm", version.ref = "ktor-version" }
 ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation-jvm", version.ref = "ktor-version" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json-jvm", version.ref = "ktor-version" }
 ktor-server-webjars = { module = "io.ktor:ktor-server-webjars-jvm", version.ref = "ktor-version" }
-jquery = { module = "org.webjars:jquery", version = "3.2.1" }
-ktor-swagger-ui = { module = "io.github.smiley4:ktor-swagger-ui", version = "2.9.0" }
+jquery = { module = "org.webjars:jquery", version = "3.7.1" }
+ktor-swagger-ui = { module = "io.github.smiley4:ktor-swagger-ui", version = "3.4.0" }
 ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor-version" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback-version" }
 ktor-server-config-yaml = { module = "io.ktor:ktor-server-config-yaml", version.ref = "ktor-version" }
 ktor-server-test-host = { module = "io.ktor:ktor-server-test-host-jvm", version.ref = "ktor-version" }
 kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin-version" }
-kandy-lets-plot = { module = "org.jetbrains.kotlinx:kandy-lets-plot", version = "0.7.0" }
+kandy-lets-plot = { module = "org.jetbrains.kotlinx:kandy-lets-plot", version = "0.7.1" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" }

diff --git a/material/samples/app/build.gradle.kts b/material/samples/app/build.gradle.kts
@@ -17,12 +17,12 @@ repositories {
 
 dependencies {
     // Use JUnit Jupiter for testing.
-    testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.11.1")
 
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
     // This dependency is used by the application.
-    implementation("com.google.guava:guava:32.1.1-jre")
+    implementation("com.google.guava:guava:33.3.1-jre")
 }
 
 // Apply a specific Java toolchain to ease working on different environments.

diff --git a/material/samples/settings.gradle.kts b/material/samples/settings.gradle.kts
@@ -7,7 +7,7 @@
 
 plugins {
     // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
 }
 
 rootProject.name = "kotlin-training-samples"

diff --git a/material/webapp-kotlin-wasm/build.gradle.kts b/material/webapp-kotlin-wasm/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 
 plugins {
-    kotlin("multiplatform") version "1.9.20"
+    kotlin("multiplatform") version "2.0.20"
     // kotlin("multiplatform") version "2.0.0-Beta1"
 }
 

diff --git a/material/webapp-vaadin-spring-kotlindsl-demo/build.gradle.kts b/material/webapp-vaadin-spring-kotlindsl-demo/build.gradle.kts
@@ -1,11 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.2.4"
-    id("io.spring.dependency-management") version "1.1.4"
-    id("com.vaadin") version "24.3.9"
-    kotlin("jvm") version "1.9.23"
-    kotlin("plugin.spring") version "1.9.23"
+    id("org.springframework.boot") version "3.3.4"
+    id("io.spring.dependency-management") version "1.1.6"
+    id("com.vaadin") version "24.4.13"
+    kotlin("jvm") version "2.0.20"
+    kotlin("plugin.spring") version "2.0.20"
 }
 
 group = "com.worldline"
@@ -24,7 +24,7 @@ extra["vaadinVersion"] = "24.3.9"
 dependencies {
     implementation("com.vaadin:vaadin-spring-boot-starter")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("com.github.mvysny.karibudsl:karibu-dsl:2.1.3")
+    implementation("com.github.mvysny.karibudsl:karibu-dsl:2.1.4")
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
 }