fix problems with jar contents

.gitlab-ci.yml

@@ -20,11 +20,10 @@ build:
   image: openjdk:11
   stage: build
   script:
-    - ./gradlew --console=plain --no-daemon assemble
+    - ./gradlew --console=plain --no-daemon assemble jar
   artifacts:
     paths:
-      - "src/gen"
-    expire_in: 1 week
+      - build/libs/*.jar
 
 test:
   image: openjdk:11

build.gradle

@@ -23,16 +23,26 @@ configurations {
     relast
 }
 
+def jastaddSources = objects.sourceDirectorySet("resources", "Resources1")
+jastaddSources.srcDir 'src/main'
+jastaddSources.include 'jastadd/**'
+
+def jastaddGenSources = objects.sourceDirectorySet("resources", "Resources2")
+jastaddGenSources.srcDir 'src/gen'
+jastaddGenSources.include 'jastadd/*.relast', 'jastadd/*.ecore.jadd'
+
 sourceSets {
     model {
         java {
             srcDir 'src/gen/java'
         }
     }
+
     main {
         compileClasspath += sourceSets.model.output
         resources {
-            srcDir 'src/main/jastadd'
+            source(jastaddSources)
+            source(jastaddGenSources)
         }
     }
     test {
@@ -41,6 +51,10 @@ sourceSets {
     }
 }
 
+jar {
+    includeEmptyDirs false
+}
+
 File genSrc = file('src/gen/java')
 idea.module.generatedSourceDirs += genSrc