Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-01-26 03:32:22 +00:00
Code Issues Projects Releases Wiki Activity

tweak gradle to work with openjdk-11

Browse Source
This commit is contained in:
Irmen de Jong 2019-08-11 22:56:54 +02:00
parent 2665618fa6
commit d4a77321d2
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/build.gradle
View File

@ -22,8 +22,6 @@ repositories {
jcenter() jcenter()
} }
sourceCompatibility = 1.8
def prog8version = rootProject.file('compiler/res/version.txt').text.trim() def prog8version = rootProject.file('compiler/res/version.txt').text.trim()
dependencies { dependencies {
@ -49,6 +47,12 @@ compileKotlin {
} }
} }
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
}
sourceSets { sourceSets {
main { main {
java { java {

2
compiler/compiler.iml
View File

@ -8,7 +8,7 @@
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" /> <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="antlr-runtime-4.7.2" level="project" /> <orderEntry type="library" name="antlr-runtime-4.7.2" level="project" />

1
parser/build.gradle
View File

@ -7,6 +7,7 @@ repositories {
mavenCentral() mavenCentral()
} }
configurations { configurations {
// strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820 // strange antlr plugin issue, see https://github.com/gradle/gradle/issues/820
// this avoids linking in the complete antlr binary jar // this avoids linking in the complete antlr binary jar

2
parser/parser.iml
View File

@ -6,7 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/build" /> <excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" /> <orderEntry type="jdk" jdkName="openjdk-11" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="antlr-4.7.2-complete" level="project" /> <orderEntry type="library" name="antlr-4.7.2-complete" level="project" />
</component> </component>