From 610ac55ada5ecca847494b837c6fea30e060dde7 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Sun, 10 Apr 2022 15:35:54 +0200
Subject: [PATCH] minor fixes

---
 build.gradle                                  | 20 +++++------------
 .../resources/PnmlRelAstVersion.properties    |  4 ++--
 src/main/resources/log4j2.xml                 | 22 -------------------
 3 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/resources/log4j2.xml

diff --git a/build.gradle b/build.gradle
index 827082f..12c6d3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,7 @@ try {
     throw new GradleException("File ${versionFile} not found or unreadable. Aborting.")
 }
 
+// set using `gradle newVersion -Pvalue=<VERSION>`
 task newVersion() {
     doFirst {
         def props = new Properties()
@@ -102,7 +103,7 @@ 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: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
+    api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'
     implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
 
     // pnml lib
@@ -122,10 +123,6 @@ dependencies {
     testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.0'
 }
 
-jar {
-    archiveAppendix = 'base'
-}
-
 test {
     useJUnitPlatform()
 }
@@ -172,7 +169,7 @@ task relastToJastAdd(type: JavaExec) {
 
     args "--useJastAddNames",
             "--grammarName=src/gen/jastadd/placeTransition",
-            "--listClass=ArrayList",
+            "--listClass=java.util.ArrayList",
             "--jastAddList=JastAddList",
             "--resolverHelper",
             '--file'
@@ -186,6 +183,7 @@ task relastToJastAdd(type: JavaExec) {
 jastadd {
     configureModuleBuild()
     modules {
+        //noinspection GroovyAssignabilityCheck
         module('pnml') {
 
             jastadd {
@@ -196,14 +194,6 @@ jastadd {
                 include 'src/gen/jastadd/**/*.jadd'
                 include 'src/gen/jastadd/**/*.jrag'
             }
-
-            scanner {
-                include 'src/main/jastadd/PnmlScanner.flex'
-            }
-
-            parser {
-                include 'src/main/jastadd/PnmlParser.parser'
-            }
         }
     }
 
@@ -246,6 +236,6 @@ publishing {
     }
 }
 
-// Workflow configuration for phases
+clean.dependsOn(cleanGen)
 relastToJastAdd.dependsOn ecoreToRelast
 generateAst.dependsOn relastToJastAdd
diff --git a/src/main/resources/PnmlRelAstVersion.properties b/src/main/resources/PnmlRelAstVersion.properties
index b79771d..bb127fc 100644
--- a/src/main/resources/PnmlRelAstVersion.properties
+++ b/src/main/resources/PnmlRelAstVersion.properties
@@ -1,2 +1,2 @@
-#Sat Apr 09 11:12:02 CEST 2022
-version=0.3.0
+#Sun Apr 10 15:35:51 CEST 2022
+version=0.3.1
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
deleted file mode 100644
index 0a98e43..0000000
--- a/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Configuration>
-    <Appenders>
-        <Console name="Console">
-            <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} %-5level} %c{1.} - %msg%n"/>
-        </Console>
-        <RollingFile name="RollingFile" fileName="logs/pnml-relast.log"
-                    filePattern="logs/pnml-%i.log">
-            <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n"/>
-            <Policies>
-                <OnStartupTriggeringPolicy/>
-            </Policies>
-            <DefaultRolloverStrategy max="20"/>
-        </RollingFile>
-    </Appenders>
-    <Loggers>
-        <Root level="info">
-            <AppenderRef ref="Console"/>
-            <AppenderRef ref="RollingFile"/>
-        </Root>
-    </Loggers>
-</Configuration>
-- 
GitLab