From c92f9140817a43d97e42328754fe10520e7b1565 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sat, 4 Dec 2021 18:36:47 +0100
Subject: [PATCH] gradle build settings tweak to avoid jdk version conflict

---
 codeGeneration/build.gradle      | 12 ++++++++++++
 codeOptimizers/build.gradle      | 12 ++++++++++++
 compiler/build.gradle            | 13 ++++++++++++-
 compilerAst/build.gradle         | 13 +++++++++++++
 compilerInterfaces/build.gradle  | 12 ++++++++++++
 dbusCompilerService/build.gradle | 12 ++++++++++++
 httpCompilerService/build.gradle | 12 ++++++++++++
 7 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/codeGeneration/build.gradle b/codeGeneration/build.gradle
index cffee9ed1..7c4ddac06 100644
--- a/codeGeneration/build.gradle
+++ b/codeGeneration/build.gradle
@@ -11,6 +11,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
     implementation project(':compilerInterfaces')
     implementation project(':compilerAst')
diff --git a/codeOptimizers/build.gradle b/codeOptimizers/build.gradle
index 2786568b4..7dc1a3435 100644
--- a/codeOptimizers/build.gradle
+++ b/codeOptimizers/build.gradle
@@ -11,6 +11,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
     implementation project(':compilerInterfaces')
     implementation project(':compilerAst')
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 43b20e420..b144968db 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -12,6 +12,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 def prog8version = rootProject.file('compiler/res/version.txt').text.trim()
 
 dependencies {
@@ -41,7 +53,6 @@ configurations {
     }
 }
 
-
 sourceSets {
     main {
         java {
diff --git a/compilerAst/build.gradle b/compilerAst/build.gradle
index 80330b28c..8c68e2596 100644
--- a/compilerAst/build.gradle
+++ b/compilerAst/build.gradle
@@ -9,7 +9,20 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     implementation 'org.antlr:antlr4-runtime:4.9.2'
     implementation "com.michael-bull.kotlin-result:kotlin-result-jvm:1.1.12"
     implementation project(':parser')
diff --git a/compilerInterfaces/build.gradle b/compilerInterfaces/build.gradle
index 410bf26ae..0c14b3b32 100644
--- a/compilerInterfaces/build.gradle
+++ b/compilerInterfaces/build.gradle
@@ -11,6 +11,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
     implementation project(':compilerAst')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
diff --git a/dbusCompilerService/build.gradle b/dbusCompilerService/build.gradle
index 6ff859eb5..2b120de67 100644
--- a/dbusCompilerService/build.gradle
+++ b/dbusCompilerService/build.gradle
@@ -12,6 +12,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
     // implementation "org.jetbrains.kotlin:kotlin-reflect"
diff --git a/httpCompilerService/build.gradle b/httpCompilerService/build.gradle
index 47a2e7901..89361bb1a 100644
--- a/httpCompilerService/build.gradle
+++ b/httpCompilerService/build.gradle
@@ -12,6 +12,18 @@ java {
     }
 }
 
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = javaVersion
+    }
+}
+
 dependencies {
     implementation project(':compilerInterfaces')
     implementation project(':compiler')