Skip to content

Commit 80f42a2

Browse files
committed
Upgrade to Spring Boot 3
1 parent 027437a commit 80f42a2

7 files changed

Lines changed: 42 additions & 25 deletions

File tree

cinema-api/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@ plugins {
55
id("io.github.ermadmi78.kobby") version "3.1.0"
66
}
77

8+
kotlin {
9+
jvmToolchain(17)
10+
}
11+
812
dependencies {
913
// Add this dependency to enable Jackson annotation generation in DTO classes
10-
compileOnly("com.fasterxml.jackson.core:jackson-annotations:2.13.5")
14+
compileOnly("com.fasterxml.jackson.core:jackson-annotations:2.15.3")
1115

1216
// Add this dependency to enable default Ktor adapters generation
13-
compileOnly("io.ktor:ktor-client-cio:2.2.4")
17+
compileOnly("io.ktor:ktor-client-cio:2.3.6")
1418
}

cinema-client/build.gradle.kts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ description = "Cinema Client"
33
plugins {
44
kotlin("jvm")
55
id("org.jetbrains.kotlin.plugin.spring")
6-
id("org.springframework.boot") version "2.7.10"
6+
id("org.springframework.boot") version "3.1.5"
7+
}
8+
9+
kotlin {
10+
jvmToolchain(17)
711
}
812

913
dependencies {
@@ -12,13 +16,13 @@ dependencies {
1216
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
1317
implementation("org.springframework.boot:spring-boot-starter")
1418

15-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5")
16-
implementation("com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5")
19+
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3")
20+
implementation("com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.3")
1721

18-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
22+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
1923

20-
implementation("io.ktor:ktor-client-cio:2.2.4")
21-
implementation("io.ktor:ktor-client-websockets:2.2.4")
24+
implementation("io.ktor:ktor-client-cio:2.3.6")
25+
implementation("io.ktor:ktor-client-websockets:2.3.6")
2226

2327
implementation(kotlin("stdlib"))
2428
implementation(kotlin("reflect"))

cinema-server/build.gradle.kts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,26 @@ description = "Cinema Server"
55
plugins {
66
kotlin("jvm")
77
id("org.jetbrains.kotlin.plugin.spring")
8-
id("org.springframework.boot") version "2.7.10"
8+
id("org.springframework.boot") version "3.1.5"
9+
}
10+
11+
kotlin {
12+
jvmToolchain(17)
913
}
1014

1115
dependencies {
1216
implementation(project(":cinema-api"))
1317

14-
implementation("com.graphql-java-kickstart:graphql-spring-boot-starter:14.0.0")
18+
implementation("com.graphql-java-kickstart:graphql-spring-boot-starter:15.0.0")
1519

1620
implementation(platform(SpringBootPlugin.BOM_COORDINATES))
1721
implementation("org.springframework.boot:spring-boot-starter-webflux")
1822

19-
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.5")
23+
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.3")
2024

2125
implementation(kotlin("stdlib"))
2226
implementation(kotlin("reflect"))
2327

24-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
25-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.4")
28+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
29+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.7.3")
2630
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# suppress inspection "UnusedProperty" for whole file
22
kotlin.code.style=official
3-
kotlin.version=1.8.21
4-
kotlinVersion=1.8.21
3+
kotlin.version=1.9.20
4+
kotlinVersion=1.9.20
55

66
group=io.github.ermadmi78
77
version=0.0.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.jar

1.61 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 13 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)