From 22e870ba69e19b39ef295caabfce43b244b33ba9 Mon Sep 17 00:00:00 2001
From: Johannes Mey <johannes.mey@tu-dresden.de>
Date: Thu, 28 Oct 2021 19:06:15 +0200
Subject: [PATCH] fix jar generation
---
build.gradle | 4 ++--
relast.preprocessor | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 4074bc5..78228de 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ jar {
}
from {
- configurations.runtimeClasspath.collect { return (it.exists() && !it.toString().endsWith("model.jar")) ? (it.isDirectory() ? it : zipTree(it)) : null }
+ configurations.runtimeClasspath.collect { return (it.exists() && (!it.toString().contains("/build/libs/")|| it.toString().contains("-base-"))) ? (it.isDirectory() ? it : zipTree(it)) : null }
}
}
@@ -143,4 +143,4 @@ jastadd {
clean.dependsOn(cleanGen)
generateAst.dependsOn(relast)
-jar.dependsOn("relast.preprocessor:jar") // the jar is a fat jar that contains the jar of the preprocessor
\ No newline at end of file
+jar.dependsOn("relast.preprocessor:jar") // the jar is a fat jar that contains the jar of the preprocessor
diff --git a/relast.preprocessor b/relast.preprocessor
index f00da96..4b4b779 160000
--- a/relast.preprocessor
+++ b/relast.preprocessor
@@ -1 +1 @@
-Subproject commit f00da960ae05cfee60e7e04df09fbbf81b02dc80
+Subproject commit 4b4b7798e65fae598958afb4e33a1d9b0938be58
--
GitLab