diff --git a/ragconnect.base/build.gradle b/ragconnect.base/build.gradle index c1ee98d52184b358a411a17a359f75a4fa601e8e..f831f53a03693a80be0044dd9df127d93d58a46b 100644 --- a/ragconnect.base/build.gradle +++ b/ragconnect.base/build.gradle @@ -24,6 +24,9 @@ repositories { mavenCentral() jcenter() } +tasks.compileJava { + options.release.set(11) +} dependencies { implementation project(':relast-preprocessor') @@ -33,6 +36,12 @@ dependencies { api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(11)) + } +} + def versionFile = 'src/main/resources/ragConnectVersion.properties' def props = new Properties() diff --git a/ragconnect.tests/build.gradle b/ragconnect.tests/build.gradle index ee6da58c40c1bb690258d3958ac53a6ec44ac362..cfeb6ae4680eca67212c256e3e39debc514609c7 100644 --- a/ragconnect.tests/build.gradle +++ b/ragconnect.tests/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { classpath 'org.jastadd:jastaddgradle:1.13.3' - classpath 'org.jastadd.preprocessor:testing:0.2.10' + classpath 'org.jastadd.preprocessor:testing:0.2.11' } } @@ -32,11 +32,14 @@ group = 'de.tudresden.inf.st' repositories { mavenCentral() } +tasks.compileTestJava { + options.release.set(11) +} dependencies { implementation project(':ragconnect.base') - runtimeOnly group: 'org.jastadd', name: 'jastadd', version: '2.3.5' + runtimeOnly group: 'org.jastadd', name: 'jastadd', version: '2.3.5-dresden' // runtimeOnly fileTree(include: ['jastadd2.jar'], dir: '../libs') testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0' @@ -61,6 +64,12 @@ dependencies { api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(11)) + } +} + //task helper { // doLast { // println(defaultOnlyRead.inputs.files.files) @@ -278,7 +287,6 @@ task compileIncremental(type: RagConnectTest) { inputFiles = [file('src/test/01-input/incremental/Test.relast'), file('src/test/01-input/incremental/Test.connect')] rootNode = 'A' - logWrites = true } relast { useJastAddNames = true @@ -303,9 +311,6 @@ task compileMapping(type: RagConnectTest) { inputFiles = [file('src/test/01-input/mapping/Test.relast'), file('src/test/01-input/mapping/Test.connect')] rootNode = 'A' - logReads = true - logWrites = true - verbose = true } relast { useJastAddNames = true @@ -532,6 +537,7 @@ task compileSingleListVariantIncremental(type: RagConnectTest, dependsOn: ':ragc inputFiles = [file('src/test/01-input/singleListVariant/Test.relast'), file('src/test/01-input/singleListVariant/Test.connect')] rootNode = 'Root' + extraOptions = ['--experimental-jastadd-329'] } relast { useJastAddNames = true