GH-184 Fix toolchain setup

dzikoysk · Jan 12, 2025 · 01ccf5d · 01ccf5d
1 parent 65e1339
commit 01ccf5d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `java-library`
     `maven-publish`
@@ -101,6 +103,17 @@ subprojects {
         testImplementation("org.assertj:assertj-core:3.23.1")
     }
 
+    tasks.withType<KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = "1.8"
+            languageVersion = "1.7"
+            freeCompilerArgs = listOf(
+                "-Xjvm-default=all", // For generating default methods in interfaces
+                // "-Xcontext-receivers"
+            )
+        }
+    }
+
     tasks.withType<Test> {
         useJUnitPlatform()
     }

diff --git a/cdn-kt/build.gradle.kts b/cdn-kt/build.gradle.kts
@@ -10,17 +10,4 @@ dependencies {
     api(project(":cdn"))
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
-}
-
-kotlin {
-    jvmToolchain(8)
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-        freeCompilerArgs = listOf(
-            "-Xjvm-default=all", // For generating default methods in interfaces
-            // "-Xcontext-receivers"
-        )
-    }
 }
diff --git a/cdn-tests/build.gradle.kts b/cdn-tests/build.gradle.kts
@@ -17,8 +17,4 @@ dependencies {
     testImplementation("org.yaml:snakeyaml:1.33")
     testImplementation("com.google.code.gson:gson:2.10.1")
     testImplementation("com.fasterxml.jackson.core:jackson-databind:2.14.0")
-}
-
-kotlin {
-    jvmToolchain(8)
 }