Skip to content

Commit 988ea17

Browse files
Merge pull request #10 from OSGP/feature/FDP-1737-update-java
FDP-1737: Update Spring, Java and Kotlin
2 parents 8ed8b6c + 5c4f5ae commit 988ea17

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

build.gradle.kts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
55
import java.net.URI
66

77
plugins {
8-
id("io.spring.dependency-management") version "1.1.0" apply false
9-
kotlin("jvm") version "1.9.0" apply false
10-
kotlin("plugin.spring") version "1.9.0" apply false
8+
id("io.spring.dependency-management") version "1.1.4" apply false
9+
kotlin("jvm") version "1.9.22" apply false
10+
kotlin("plugin.spring") version "1.9.22" apply false
1111
}
1212

1313
group = "com.gxf.utilities"
@@ -17,10 +17,6 @@ version = System.getenv("GITHUB_REF_NAME")
1717
?.let { if (SemVer.valid(it)) it.removePrefix("v") else "${it}-SNAPSHOT" }
1818
?: "develop"
1919

20-
21-
22-
23-
2420
subprojects {
2521
apply(plugin = "org.jetbrains.kotlin.jvm")
2622
apply(plugin = "org.jetbrains.kotlin.plugin.spring")
@@ -39,19 +35,19 @@ subprojects {
3935
withSourcesJar()
4036

4137
toolchain {
42-
languageVersion.set(JavaLanguageVersion.of(17))
38+
languageVersion.set(JavaLanguageVersion.of(21))
4339
}
4440
}
4541

4642
extensions.configure<StandardDependencyManagementExtension> {
4743
imports {
48-
mavenBom("org.springframework.boot:spring-boot-dependencies:3.1.3")
44+
mavenBom("org.springframework.boot:spring-boot-dependencies:3.2.2")
4945
}
5046
}
5147

5248
tasks.withType<KotlinCompile> {
5349
compilerOptions {
54-
jvmTarget = JvmTarget.JVM_17
50+
jvmTarget = JvmTarget.JVM_21
5551
freeCompilerArgs = listOf("-Xjsr305=strict")
5652
}
5753
}

0 commit comments

Comments
 (0)