Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Update Kotlin examples to Kotlin 2.0 #146

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

repositories { mavenCentral() }

val restateVersion = "0.9.2"
val restateVersion = "0.10.0-SNAPSHOT"

dependencies {
// Kafka
Expand Down
14 changes: 6 additions & 8 deletions patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions templates/kotlin-gradle-lambda-cdk/lambda/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
Expand All @@ -14,7 +14,7 @@ repositories {
mavenCentral()
}

val restateVersion = "0.9.2"
val restateVersion = "0.10.0-SNAPSHOT"

dependencies {
// Annotation processor
Expand All @@ -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"
Expand Down
14 changes: 6 additions & 8 deletions templates/kotlin-gradle/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down