From 6c5e07e02b4d1b87598945112b3aea42c89b8572 Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Mon, 3 Jun 2024 14:26:27 +0200 Subject: [PATCH] Update Kotlin examples to Kotlin 2.0 Signed-off-by: slinkydeveloper --- .../kotlin/food-ordering/app/build.gradle.kts | 8 ++++---- .../food-ordering/app/restate-app/build.gradle.kts | 6 +++--- .../food-ordering/app/restaurant/build.gradle.kts | 2 +- .../sagas/sagas-kotlin/build.gradle.kts | 14 ++++++-------- .../lambda/build.gradle.kts | 10 +++++----- templates/kotlin-gradle/build.gradle.kts | 14 ++++++-------- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts index 6760b659..12efff77 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts @@ -2,8 +2,8 @@ import org.jetbrains.kotlin.gradle.dsl.kotlinExtension plugins { application - kotlin("jvm") version "1.9.22" - kotlin("plugin.serialization") version "1.9.22" + kotlin("jvm") version "2.0.0" + kotlin("plugin.serialization") version "2.0.0" id("com.diffplug.spotless") version "6.25.0" } @@ -13,8 +13,8 @@ subprojects { apply(plugin = "com.diffplug.spotless") dependencies { - implementation("org.apache.logging.log4j:log4j-core:2.20.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") + implementation("org.apache.logging.log4j:log4j-core:2.23.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") } kotlin { diff --git a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts index 885fbacc..107c84dc 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/restate-app/build.gradle.kts @@ -1,12 +1,12 @@ plugins { application id("com.google.cloud.tools.jib") version "3.4.0" - id("com.google.devtools.ksp") version "1.9.22-1.0.18" + id("com.google.devtools.ksp") version "2.0.0-1.0.21" } repositories { mavenCentral() } -val restateVersion = "0.9.2" +val restateVersion = "0.10.0-SNAPSHOT" dependencies { // Restate SDK @@ -18,7 +18,7 @@ dependencies { implementation("org.apache.kafka:kafka-clients:3.6.1") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.23.0") } // Set main class diff --git a/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts index 197faed2..46499567 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/restaurant/build.gradle.kts @@ -5,7 +5,7 @@ plugins { repositories { mavenCentral() } -val restateVersion = "0.9.2" +val restateVersion = "0.10.0-SNAPSHOT" dependencies { // Kafka diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts index e78f6d62..4219449e 100644 --- a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts @@ -1,19 +1,17 @@ -import java.net.URI - plugins { application - kotlin("jvm") version "1.9.22" + kotlin("jvm") version "2.0.0" // Kotlinx serialization (optional) - kotlin("plugin.serialization") version "1.9.22" + kotlin("plugin.serialization") version "2.0.0" - id("com.google.devtools.ksp") version "1.9.22-1.0.18" + id("com.google.devtools.ksp") version "2.0.0-1.0.21" } repositories { mavenCentral() } -val restateVersion = "0.9.2" +val restateVersion = "0.10.0-SNAPSHOT" dependencies { // Annotation processor @@ -24,10 +22,10 @@ dependencies { implementation("dev.restate:sdk-http-vertx:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.23.0") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") } // Setup Java/Kotlin compiler target diff --git a/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts b/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts index 1bc4a32b..72a1a1ef 100644 --- a/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts +++ b/templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts @@ -1,11 +1,11 @@ import java.net.URI plugins { - kotlin("jvm") version "1.9.22" + kotlin("jvm") version "2.0.0" // Kotlinx serialization (optional) - kotlin("plugin.serialization") version "1.9.22" + kotlin("plugin.serialization") version "2.0.0" - id("com.google.devtools.ksp") version "1.9.22-1.0.18" + id("com.google.devtools.ksp") version "2.0.0-1.0.21" id("distribution") } @@ -14,7 +14,7 @@ repositories { mavenCentral() } -val restateVersion = "0.9.2" +val restateVersion = "0.10.0-SNAPSHOT" dependencies { // Annotation processor @@ -25,7 +25,7 @@ dependencies { implementation("dev.restate:sdk-lambda:$restateVersion") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") // AWS Lambda-specific logging, see https://docs.aws.amazon.com/lambda/latest/dg/java-logging.html#java-logging-log4j2 val log4j2version = "2.23.1" diff --git a/templates/kotlin-gradle/build.gradle.kts b/templates/kotlin-gradle/build.gradle.kts index 73c7e191..fad5eade 100644 --- a/templates/kotlin-gradle/build.gradle.kts +++ b/templates/kotlin-gradle/build.gradle.kts @@ -1,19 +1,17 @@ -import java.net.URI - plugins { application - kotlin("jvm") version "1.9.22" + kotlin("jvm") version "2.0.0" // Kotlinx serialization (optional) - kotlin("plugin.serialization") version "1.9.22" + kotlin("plugin.serialization") version "2.0.0" - id("com.google.devtools.ksp") version "1.9.22-1.0.18" + id("com.google.devtools.ksp") version "2.0.0-1.0.21" } repositories { mavenCentral() } -val restateVersion = "0.9.2" +val restateVersion = "0.10.0-SNAPSHOT" dependencies { // Annotation processor @@ -24,10 +22,10 @@ dependencies { implementation("dev.restate:sdk-http-vertx:$restateVersion") // Logging (optional) - implementation("org.apache.logging.log4j:log4j-core:2.20.0") + implementation("org.apache.logging.log4j:log4j-core:2.23.0") // Kotlinx serialization (optional) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") } // Setup Java/Kotlin compiler target