set up jvm toolchain to specify Java version

ekino · Sep 2, 2024 · ab5a546 · ab5a546
1 parent 15cc2f6
commit ab5a546
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ JCV-DB provides assertions to validate database content against a json file. The
 ## Prerequisites
 
 If you want to test this project locally we must have the following software install:
--	Java 11
+-	Java 11 (if launching without using Gradle)
 -	Docker
 -	Docker compose
 

diff --git a/jcv-db-assertj-db/build.gradle.kts b/jcv-db-assertj-db/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -30,13 +29,11 @@ java {
     withSourcesJar()
 }
 
-tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
-        }
-    }
+kotlin {
+    jvmToolchain(11)
+}
 
+tasks {
     withType<Test> {
         useJUnitPlatform()
         jvmArgs("-Duser.language=en")

diff --git a/jcv-db-cassandra/build.gradle.kts b/jcv-db-cassandra/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -30,13 +29,11 @@ java {
     withSourcesJar()
 }
 
-tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
-        }
-    }
+kotlin {
+    jvmToolchain(11)
+}
 
+tasks {
     withType<Test> {
         useJUnitPlatform()
         jvmArgs("-Duser.language=en")

diff --git a/jcv-db-core/build.gradle.kts b/jcv-db-core/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -30,13 +29,11 @@ java {
     withSourcesJar()
 }
 
-tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
-        }
-    }
+kotlin {
+    jvmToolchain(11)
+}
 
+tasks {
     withType<Test> {
         useJUnitPlatform()
         jvmArgs("-Duser.language=en")

diff --git a/jcv-db-jdbc/build.gradle.kts b/jcv-db-jdbc/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -26,17 +25,16 @@ val javadocJar by tasks.registering(Jar::class) {
     from(layout.buildDirectory.file("dokka"))
 }
 
+
 java {
     withSourcesJar()
 }
 
-tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
-        }
-    }
+kotlin {
+    jvmToolchain(11)
+}
 
+tasks {
     withType<Test> {
         useJUnitPlatform()
         jvmArgs("-Duser.language=en")

diff --git a/jcv-db-mongo/build.gradle.kts b/jcv-db-mongo/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.dokka.gradle.DokkaTask
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.jvm)
@@ -30,12 +29,11 @@ java {
     withSourcesJar()
 }
 
+kotlin {
+    jvmToolchain(11)
+}
+
 tasks {
-    withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_11.toString()
-        }
-    }
 
     withType<Test> {
         useJUnitPlatform()