From f9f10bc7b2af42aa3415e255f865805e4c7ae56b Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sat, 9 Apr 2022 11:27:38 +0200
Subject: [PATCH] cleanup build file
---
build.gradle | 55 +++++++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/build.gradle b/build.gradle
index f73506c..5c07b93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
plugins {
id 'java-library'
id 'org.jastadd' version "${jastaddgradle_version}"
- id 'java'
id 'idea'
id 'maven-publish'
}
@@ -27,13 +26,13 @@ configurations {
sourceSets {
model {
java {
- srcDir "src/gen/java"
+ srcDir 'src/gen/java'
}
}
main {
compileClasspath += sourceSets.model.output
resources {
- srcDir "src/main/jastadd"
+ srcDir 'src/main/jastadd'
}
}
test {
@@ -42,7 +41,7 @@ sourceSets {
}
}
-File genSrc = file("src/gen/java")
+File genSrc = file('src/gen/java')
idea.module.generatedSourceDirs += genSrc
def versionFile = 'src/main/resources/PnmlRelAstVersion.properties'
@@ -80,7 +79,7 @@ task setDevVersionForCI() {
dependencies {
- modelImplementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
+ modelRuntimeOnly group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
modelImplementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
modelImplementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
@@ -89,8 +88,6 @@ dependencies {
api group: 'org.jastadd', name: 'jastadd', version: '2.3.5'
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-// implementation group: 'com.github.jknack', name: 'handlebars', version: '4.3.0'
-// implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
@@ -102,8 +99,8 @@ dependencies {
implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.ptnet', version: '2.2.12'
implementation group: 'fr.lip6.pnml', name: 'fr.lip6.pnml.framework.utils', version: '2.2.12'
implementation group: 'org.apache.ws.commons.axiom', name: 'axiom-api', version: '1.2.22'
- implementation group: 'org.apache.ws.commons.axiom', name: 'axiom-impl', version: '1.2.22'
- implementation group: 'com.thaiopensource', name: 'jing', version: '20091111'
+ runtimeOnly group: 'org.apache.ws.commons.axiom', name: 'axiom-impl', version: '1.2.22'
+ runtimeOnly group: 'com.thaiopensource', name: 'jing', version: '20091111'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.2'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.2'
@@ -112,7 +109,7 @@ dependencies {
}
jar {
- archiveAppendix = "base"
+ archiveAppendix = 'base'
}
test {
@@ -120,16 +117,16 @@ test {
}
// Generated files
-def ecoreFile = "./src/main/resources/placeTransition.ecore"
-def ecoreRelastAspect = "./src/gen/jastadd/placeTransition.ecore.jadd"
-def ecoreRelastGrammar = "./src/gen/jastadd/placeTransition.relast"
+def ecoreFile = './src/main/resources/placeTransition.ecore'
+def ecoreRelastAspect = './src/gen/jastadd/placeTransition.ecore.jadd'
+def ecoreRelastGrammar = './src/gen/jastadd/placeTransition.relast'
def ecoreInputFiles = [ecoreFile]
def ecoreOutputFiles = [ecoreRelastAspect,
ecoreRelastGrammar]
-def relastInputFiles = [ecoreRelastGrammar, "src/main/jastadd/marking/Marking.relast"]
-def relastOutputFiles = ["src/gen/jastadd/placeTransition.ast", "src/gen/jastadd/placeTransition.jadd"]
+def relastInputFiles = [ecoreRelastGrammar, 'src/main/jastadd/marking/Marking.relast']
+def relastOutputFiles = ['src/gen/jastadd/placeTransition.ast', 'src/gen/jastadd/placeTransition.jadd']
// First phase: Ecore -> RelAst
task ecoreToRelast(type: JavaExec) {
@@ -139,7 +136,7 @@ task ecoreToRelast(type: JavaExec) {
doFirst {
delete ecoreOutputFiles
- mkdir "src/gen/jastadd"
+ mkdir 'src/gen/jastadd'
}
args ecoreFile, ecoreRelastGrammar
@@ -164,7 +161,7 @@ task relastToJastAdd(type: JavaExec) {
"--listClass=ArrayList",
"--jastAddList=JastAddList",
"--resolverHelper",
- "--file"
+ '--file'
args relastInputFiles
inputs.files relastInputFiles
@@ -175,33 +172,33 @@ task relastToJastAdd(type: JavaExec) {
jastadd {
configureModuleBuild()
modules {
- module("pnml") {
+ module('pnml') {
jastadd {
- include "src/main/jastadd/**/*.ast"
- include "src/main/jastadd/**/*.jadd"
- include "src/main/jastadd/**/*.jrag"
- include "src/gen/jastadd/**/*.ast"
- include "src/gen/jastadd/**/*.jadd"
- include "src/gen/jastadd/**/*.jrag"
+ include 'src/main/jastadd/**/*.ast'
+ include 'src/main/jastadd/**/*.jadd'
+ include 'src/main/jastadd/**/*.jrag'
+ include 'src/gen/jastadd/**/*.ast'
+ include 'src/gen/jastadd/**/*.jadd'
+ include 'src/gen/jastadd/**/*.jrag'
}
scanner {
- include "src/main/jastadd/PnmlScanner.flex"
+ include 'src/main/jastadd/PnmlScanner.flex'
}
parser {
- include "src/main/jastadd/PnmlParser.parser"
+ include 'src/main/jastadd/PnmlParser.parser'
}
}
}
cleanGen.doFirst {
- delete "src/gen"
- delete "src/gen-res"
+ delete 'src/gen'
+ delete 'src/gen-res'
}
- module = "pnml"
+ module = 'pnml'
astPackage = 'de.tudresden.inf.st.pnml.jastadd.model'
--
GitLab