diff --git a/build.gradle b/build.gradle index 0a3b93f22a86f1cd020ce9f653c3352e1ec8cb6a..89c113e43e0ec627f43e59f96000e088442cadcf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // --- Plugin definitions --- plugins { - id 'com.github.ben-manes.versions' version '0.36.0' + id 'com.github.ben-manes.versions' version '0.42.0' id 'java' id 'idea' id 'org.jastadd' version "${jastadd_gradle_version}" @@ -23,13 +23,13 @@ configurations { } dependencies { - grammar2uml group: 'de.tudresden.inf.st', name: 'grammar2uml', version: '0.2.4' + grammar2uml group: 'de.tudresden.inf.st', name: 'grammar2uml', version: "${grammar2uml_version}" - relast group: 'org.jastadd', name: 'relast', version: "0.4.0-143" - ragconnect group: 'de.tudresden.inf.st', name: 'ragconnect', version: '1.0.0-alpha-214' + relast group: 'org.jastadd', name: 'relast', version: "${relast_version}" + ragconnect group: 'de.tudresden.inf.st', name: 'ragconnect', version: "${ragconnect_version}" - implementation group: 'de.tudresden.inf.st', name: 'dumpAst', version: '1.0.4-70' - jastadd2 group: 'org.jastadd', name: 'jastadd2', version: '2.3.5-dresden' + implementation group: 'de.tudresden.inf.st', name: 'dumpAst', version: "${dumpAst_version}" + jastadd2 group: 'org.jastadd', name: 'jastadd2', version: "${jastadd_version}" implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.16' implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4j_version}" @@ -47,6 +47,7 @@ idea.module.generatedSourceDirs += genSrc def relastFiles = ["src/gen/jastadd/MinimalModel.relast", "src/gen/jastadd/RagConnect.relast"] task grammar2uml(type: JavaExec) { + group = 'documentation' main = 'de.tudresden.inf.st.jastadd.grammar2uml.compiler.Compiler' classpath = configurations.grammar2uml @@ -57,12 +58,12 @@ task grammar2uml(type: JavaExec) { ]) } -// phases: ragConnect -> RelAst -> JastAdd -// phase: ragConnect +// phases: RagConnect -> RelAst -> JastAdd +// phase: RagConnect task ragConnect(type: JavaExec) { - group = 'Build' - main = 'org.jastadd.ragconnect.compiler.Compiler' + group = 'build' classpath = configurations.ragconnect + main = 'org.jastadd.ragconnect.compiler.Compiler' args([ '--o=src/gen/jastadd', @@ -79,9 +80,9 @@ task ragConnect(type: JavaExec) { // phase: RelAst task relastToJastAdd(type: JavaExec) { - group = 'Build' + group = 'build' classpath = configurations.relast - mainClass = 'org.jastadd.relast.compiler.Compiler' + main = 'org.jastadd.relast.compiler.Compiler' args([ "--grammarName=./src/gen/jastadd/model", diff --git a/gradle.properties b/gradle.properties index f42f592a3f2a51b0702e1ffa9b523faaf64a4d29..f2a1308ddeeebe5887c40570915c47ec5446bddd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,9 @@ -# suppress inspection "UnusedProperty" for whole file -systemProp.socksProxyHost=127.0.0.1 -systemProp.socksProxyPort=9999 -jackson_version = 2.13.2 -jackson_yaml_version = 2.13.2 -jupiter_version = 5.8.2 -assertj_version = 3.22.0 -log4j_version = 2.17.2 -protobuf_version = 4.0.0-rc-2 -protobuf_plugin_version = 0.8.18 -jastadd_gradle_version = 1.14.5 +jackson_version = 2.13.3 +log4j_version = 2.18.0 + +jastadd_gradle_version = 1.15.0 +jastadd_version = 2.3.5-dresden-7 +ragconnect_version = 1.0.0-alpha-214 +relast_version = 0.4.0-143 +grammar2uml_version = 0.2.4 +dumpAst_version = 1.2.0