build(gradle): Configure Java 17 for all modules

CLOVIS-AI · Jun 17, 2023 · c225528 · c225528
1 parent 52e5876
commit c225528
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 40 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -30,6 +30,10 @@ application {
 		applicationDefaultJvmArgs = listOf("-Dio.ktor.development=true")
 }
 
-tasks.named<Test>("test") {
+kotlin {
+	jvmToolchain(17)
+}
+
+tasks.test {
 	useJUnitPlatform()
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -7,7 +7,14 @@ plugins {
 }
 
 kotlin {
-	jvm()
+	jvm {
+		jvmToolchain(17)
+		testRuns.named("test") {
+			executionTask.configure {
+				useJUnitPlatform()
+			}
+		}
+	}
 	js(IR) {
 		browser {
 			testTask {
@@ -47,7 +54,3 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 		}
 	}
 }
-
-tasks.named<Test>("jvmTest") {
-	useJUnitPlatform()
-}
diff --git a/fake/build.gradle.kts b/fake/build.gradle.kts
@@ -5,7 +5,14 @@ plugins {
 }
 
 kotlin {
-	jvm()
+	jvm {
+		jvmToolchain(17)
+		testRuns.named("test") {
+			executionTask.configure {
+				useJUnitPlatform()
+			}
+		}
+	}
 	js(IR) {
 		browser {
 			testTask {
@@ -38,7 +45,3 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 		includes.from("${project.projectDir}/README.md")
 	}
 }
-
-tasks.named<Test>("jvmTest") {
-	useJUnitPlatform()
-}
diff --git a/mongo/build.gradle.kts b/mongo/build.gradle.kts
@@ -31,6 +31,10 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 	}
 }
 
-tasks.named<Test>("test") {
+kotlin {
+	jvmToolchain(17)
+}
+
+tasks.test {
 	useJUnitPlatform()
 }
diff --git a/remote-client/build.gradle.kts b/remote-client/build.gradle.kts
@@ -7,7 +7,14 @@ plugins {
 }
 
 kotlin {
-	jvm()
+	jvm {
+		jvmToolchain(17)
+		testRuns.named("test") {
+			executionTask.configure {
+				useJUnitPlatform()
+			}
+		}
+	}
 	js(IR) {
 		browser {
 			testTask {
@@ -49,7 +56,3 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 		}
 	}
 }
-
-tasks.named<Test>("jvmTest") {
-	useJUnitPlatform()
-}
diff --git a/remote-common/build.gradle.kts b/remote-common/build.gradle.kts
@@ -8,7 +8,14 @@ plugins {
 }
 
 kotlin {
-	jvm()
+	jvm {
+		jvmToolchain(17)
+		testRuns.named("test") {
+			executionTask.configure {
+				useJUnitPlatform()
+			}
+		}
+	}
 	js(IR) {
 		browser {
 			testTask {
@@ -50,7 +57,3 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 		}
 	}
 }
-
-tasks.named<Test>("jvmTest") {
-	useJUnitPlatform()
-}
diff --git a/remote-server/build.gradle.kts b/remote-server/build.gradle.kts
@@ -37,6 +37,10 @@ tasks.withType<org.jetbrains.dokka.gradle.DokkaTaskPartial>().configureEach {
 	}
 }
 
+kotlin {
+	jvmToolchain(17)
+}
+
 tasks.named<Test>("test") {
 	useJUnitPlatform()
 }
diff --git a/test-structure/build.gradle.kts b/test-structure/build.gradle.kts
@@ -5,7 +5,14 @@ plugins {
 }
 
 kotlin {
-    jvm()
+    jvm {
+        jvmToolchain(17)
+        testRuns.named("test") {
+            executionTask.configure {
+                useJUnitPlatform()
+            }
+        }
+    }
     js(IR) {
         browser {
             testTask {
@@ -24,8 +31,7 @@ kotlin {
 
         val commonMain by getting {
             dependencies {
-                api(Kotlin.test.common)
-                api(Kotlin.test.annotationsCommon)
+                api(kotlin("test"))
 
                 api("opensavvy.pedestal:state:_")
                 api("opensavvy.pedestal:state-arrow:_")
@@ -45,15 +51,5 @@ kotlin {
                 api(Kotlin.test.junit5)
             }
         }
-
-        val jsMain by getting {
-            dependencies {
-                api(Kotlin.test.js)
-            }
-        }
     }
 }
-
-tasks.named<Test>("jvmTest") {
-    useJUnitPlatform()
-}
diff --git a/test/build.gradle.kts b/test/build.gradle.kts
@@ -5,7 +5,14 @@ plugins {
 }
 
 kotlin {
-	jvm()
+	jvm {
+		jvmToolchain(17)
+		testRuns.named("test") {
+			executionTask.configure {
+				useJUnitPlatform()
+			}
+		}
+	}
 	js(IR) {
 		browser {
 			testTask {
@@ -37,7 +44,3 @@ kotlin {
 		}
 	}
 }
-
-tasks.named<Test>("jvmTest") {
-	useJUnitPlatform()
-}