all java versions to jvm 17

RADAR-base · Mar 14, 2024 · a6146f8 · a6146f8
1 parent 5b3319a
commit a6146f8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.9.10"
+    kotlin("jvm") version "1.9.22"
 }
 
 repositories {
@@ -11,11 +11,11 @@ repositories {
 
 tasks.withType<KotlinCompile> {
     compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
+        jvmTarget.set(JvmTarget.JVM_17)
     }
 }
 
-tasks.withType<JavaCompile> {
-    sourceCompatibility = "11"
-    targetCompatibility = "11"
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -13,7 +13,7 @@ object Versions {
 
     const val hk2 = "3.0.5"
     const val managementPortal = "2.1.0"
-    const val radarCommons = "1.1.1"
+    const val radarCommons = "1.1.2"
     const val javaJwt = "4.4.0"
     const val jakartaWsRs = "3.1.0"
     const val jakartaAnnotation = "2.1.1"
@@ -32,7 +32,7 @@ object Versions {
 
     const val hibernate = "6.4.2.Final"
     const val liquibase = "4.25.1"
-    const val postgres = "42.7.1"
+    const val postgres = "42.7.2"
     const val h2 = "2.2.224"
 
     const val wrapper = "8.4"

diff --git a/radar-jersey-hibernate/build.gradle.kts b/radar-jersey-hibernate/build.gradle.kts
@@ -31,3 +31,8 @@ dependencies {
     testImplementation("org.hamcrest:hamcrest:${Versions.hamcrest}")
     testImplementation("com.squareup.okhttp3:okhttp:${Versions.okhttp}")
 }
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
diff --git a/radar-jersey/build.gradle.kts b/radar-jersey/build.gradle.kts
@@ -55,6 +55,11 @@ dependencies {
     testImplementation("org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}")
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 tasks.processResources {
     val properties = mapOf("version" to project.version)
     inputs.properties(properties)