Skip to content
Snippets Groups Projects
Commit c0d2b529 authored by René Schöne's avatar René Schöne
Browse files

working on concise grammar

- update build.gradle's
- use java11
- use "our" jastadd-fork for testing, and try experimental-options for suspicious test singleVariantIncremental
parent a2780086
No related branches found
No related tags found
2 merge requests!22Resolve "Feature: Add context-free connect",!21Resolve "Make grammar(s) more concise"
...@@ -24,6 +24,9 @@ repositories { ...@@ -24,6 +24,9 @@ repositories {
mavenCentral() mavenCentral()
jcenter() jcenter()
} }
tasks.compileJava {
options.release.set(11)
}
dependencies { dependencies {
implementation project(':relast-preprocessor') implementation project(':relast-preprocessor')
...@@ -33,6 +36,12 @@ dependencies { ...@@ -33,6 +36,12 @@ dependencies {
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' 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 versionFile = 'src/main/resources/ragConnectVersion.properties'
def props = new Properties() def props = new Properties()
......
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'org.jastadd:jastaddgradle:1.13.3' 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' ...@@ -32,11 +32,14 @@ group = 'de.tudresden.inf.st'
repositories { repositories {
mavenCentral() mavenCentral()
} }
tasks.compileTestJava {
options.release.set(11)
}
dependencies { dependencies {
implementation project(':ragconnect.base') 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') // runtimeOnly fileTree(include: ['jastadd2.jar'], dir: '../libs')
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0' testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0'
...@@ -61,6 +64,12 @@ dependencies { ...@@ -61,6 +64,12 @@ dependencies {
api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0' api group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
} }
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(11))
}
}
//task helper { //task helper {
// doLast { // doLast {
// println(defaultOnlyRead.inputs.files.files) // println(defaultOnlyRead.inputs.files.files)
...@@ -278,7 +287,6 @@ task compileIncremental(type: RagConnectTest) { ...@@ -278,7 +287,6 @@ task compileIncremental(type: RagConnectTest) {
inputFiles = [file('src/test/01-input/incremental/Test.relast'), inputFiles = [file('src/test/01-input/incremental/Test.relast'),
file('src/test/01-input/incremental/Test.connect')] file('src/test/01-input/incremental/Test.connect')]
rootNode = 'A' rootNode = 'A'
logWrites = true
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
...@@ -303,9 +311,6 @@ task compileMapping(type: RagConnectTest) { ...@@ -303,9 +311,6 @@ task compileMapping(type: RagConnectTest) {
inputFiles = [file('src/test/01-input/mapping/Test.relast'), inputFiles = [file('src/test/01-input/mapping/Test.relast'),
file('src/test/01-input/mapping/Test.connect')] file('src/test/01-input/mapping/Test.connect')]
rootNode = 'A' rootNode = 'A'
logReads = true
logWrites = true
verbose = true
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
...@@ -532,6 +537,7 @@ task compileSingleListVariantIncremental(type: RagConnectTest, dependsOn: ':ragc ...@@ -532,6 +537,7 @@ task compileSingleListVariantIncremental(type: RagConnectTest, dependsOn: ':ragc
inputFiles = [file('src/test/01-input/singleListVariant/Test.relast'), inputFiles = [file('src/test/01-input/singleListVariant/Test.relast'),
file('src/test/01-input/singleListVariant/Test.connect')] file('src/test/01-input/singleListVariant/Test.connect')]
rootNode = 'Root' rootNode = 'Root'
extraOptions = ['--experimental-jastadd-329']
} }
relast { relast {
useJastAddNames = true useJastAddNames = true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment