From 01ccf5dc6c3609bfad75b31a114734a6bc93cd5e Mon Sep 17 00:00:00 2001
From: dzikoysk <dzikoysk@dzikoysk.net>
Date: Sun, 12 Jan 2025 22:29:57 +0100
Subject: [PATCH] GH-184 Fix toolchain setup

---
 build.gradle.kts           | 13 +++++++++++++
 cdn-kt/build.gradle.kts    | 13 -------------
 cdn-tests/build.gradle.kts |  4 ----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0c7518b..84c1945 100644
--- 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
index d681907..0f2aaf8 100644
--- 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"
-        )
-    }
 }
\ No newline at end of file
diff --git a/cdn-tests/build.gradle.kts b/cdn-tests/build.gradle.kts
index 151c634..433ece0 100644
--- 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)
 }
\ No newline at end of file