From d4a77321d28ad4df0beb57b41c42b053b5c974e6 Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 11 Aug 2019 22:56:54 +0200
Subject: [PATCH] tweak gradle to work with openjdk-11

---
 compiler/build.gradle | 8 ++++++--
 compiler/compiler.iml | 2 +-
 parser/build.gradle   | 1 +
 parser/parser.iml     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/compiler/build.gradle b/compiler/build.gradle
index 65c0698d8..c46121238 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -22,8 +22,6 @@ repositories {
     jcenter()
 }
 
-sourceCompatibility = 1.8
-
 def prog8version = rootProject.file('compiler/res/version.txt').text.trim()
 
 dependencies {
@@ -49,6 +47,12 @@ compileKotlin {
     }
 }
 
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
 sourceSets {
     main {
         java {
diff --git a/compiler/compiler.iml b/compiler/compiler.iml
index 6db2b5400..9df271cf3 100644
--- a/compiler/compiler.iml
+++ b/compiler/compiler.iml
@@ -8,7 +8,7 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
     <orderEntry type="library" name="antlr-runtime-4.7.2" level="project" />
diff --git a/parser/build.gradle b/parser/build.gradle
index 6b06c31bb..a46b4f31d 100644
--- a/parser/build.gradle
+++ b/parser/build.gradle
@@ -7,6 +7,7 @@ repositories {
     mavenCentral()
 }
 
+
 configurations {
     // strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820
     // this avoids linking in the complete antlr binary jar
diff --git a/parser/parser.iml b/parser/parser.iml
index c1e7c1669..2896f4626 100644
--- a/parser/parser.iml
+++ b/parser/parser.iml
@@ -6,7 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="antlr-4.7.2-complete" level="project" />
   </component>