Skip to content
Snippets Groups Projects
Commit 610ac55a authored by Johannes Mey's avatar Johannes Mey
Browse files

minor fixes

parent 6f4b1dba
No related branches found
No related tags found
No related merge requests found
Pipeline #13332 passed
...@@ -69,6 +69,7 @@ try { ...@@ -69,6 +69,7 @@ try {
throw new GradleException("File ${versionFile} not found or unreadable. Aborting.") throw new GradleException("File ${versionFile} not found or unreadable. Aborting.")
} }
// set using `gradle newVersion -Pvalue=<VERSION>`
task newVersion() { task newVersion() {
doFirst { doFirst {
def props = new Properties() def props = new Properties()
...@@ -102,7 +103,7 @@ dependencies { ...@@ -102,7 +103,7 @@ dependencies {
api group: 'org.jastadd', name: 'jastadd', version: '2.3.5' api group: 'org.jastadd', name: 'jastadd', version: '2.3.5'
api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' 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' implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
// pnml lib // pnml lib
...@@ -122,10 +123,6 @@ dependencies { ...@@ -122,10 +123,6 @@ dependencies {
testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.0' testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.18.0'
} }
jar {
archiveAppendix = 'base'
}
test { test {
useJUnitPlatform() useJUnitPlatform()
} }
...@@ -172,7 +169,7 @@ task relastToJastAdd(type: JavaExec) { ...@@ -172,7 +169,7 @@ task relastToJastAdd(type: JavaExec) {
args "--useJastAddNames", args "--useJastAddNames",
"--grammarName=src/gen/jastadd/placeTransition", "--grammarName=src/gen/jastadd/placeTransition",
"--listClass=ArrayList", "--listClass=java.util.ArrayList",
"--jastAddList=JastAddList", "--jastAddList=JastAddList",
"--resolverHelper", "--resolverHelper",
'--file' '--file'
...@@ -186,6 +183,7 @@ task relastToJastAdd(type: JavaExec) { ...@@ -186,6 +183,7 @@ task relastToJastAdd(type: JavaExec) {
jastadd { jastadd {
configureModuleBuild() configureModuleBuild()
modules { modules {
//noinspection GroovyAssignabilityCheck
module('pnml') { module('pnml') {
jastadd { jastadd {
...@@ -196,14 +194,6 @@ jastadd { ...@@ -196,14 +194,6 @@ jastadd {
include 'src/gen/jastadd/**/*.jadd' include 'src/gen/jastadd/**/*.jadd'
include 'src/gen/jastadd/**/*.jrag' include 'src/gen/jastadd/**/*.jrag'
} }
scanner {
include 'src/main/jastadd/PnmlScanner.flex'
}
parser {
include 'src/main/jastadd/PnmlParser.parser'
}
} }
} }
...@@ -246,6 +236,6 @@ publishing { ...@@ -246,6 +236,6 @@ publishing {
} }
} }
// Workflow configuration for phases clean.dependsOn(cleanGen)
relastToJastAdd.dependsOn ecoreToRelast relastToJastAdd.dependsOn ecoreToRelast
generateAst.dependsOn relastToJastAdd generateAst.dependsOn relastToJastAdd
#Sat Apr 09 11:12:02 CEST 2022 #Sun Apr 10 15:35:51 CEST 2022
version=0.3.0 version=0.3.1
<?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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment