diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52200cdef6c313fa1c9122dccb9495960b49d7c0..9b33d3f5b8f680bb60fc0cdbc9f3341f8074b89a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,10 +10,12 @@ stages: build: image: openjdk:11 stage: build - before_script: - - ls -lah * script: - "./gradlew assemble" + artifacts: + paths: + - "dumpAst/src/gen" + expire_in: 1 week test: image: openjdk:11 @@ -34,10 +36,10 @@ publish_dev: script: - "./gradlew setDevVersionForCI" - "./gradlew publish" - only: - - dev + except: + - main -publish_master: +publish_main: image: openjdk:11 stage: publish needs: @@ -46,7 +48,6 @@ publish_master: - "./gradlew publish" only: - main - - master ragdoc_build: image: @@ -57,6 +58,7 @@ ragdoc_build: - build script: - JAVA_FILES=$(find dumpAst/src/ -name '*.java') + - echo $JAVA_FILES | wc -l - /ragdoc-builder/start-builder.sh -excludeGenerated -d data/ $JAVA_FILES artifacts: paths: @@ -78,7 +80,6 @@ ragdoc_view: only: - dev - main - - master artifacts: paths: - "pages/docs/ragdoc" @@ -98,4 +99,3 @@ pages: - public/ only: - main - - master diff --git a/build.gradle b/build.gradle index 75be59becf474138cededdb8bc4617030741edac..2ecc97593fa23bab973d4411c2bda9636548da92 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,3 @@ plugins { - id 'com.github.ben-manes.versions' + id 'com.github.ben-manes.versions' version '0.36.0' } diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore deleted file mode 100644 index 9f2a078806e1b8600d753f53ee7437b168a1b55b..0000000000000000000000000000000000000000 --- a/buildSrc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build/ -.gradle/ diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle deleted file mode 100644 index 95bfe53999d61b768da82463f837ec9f5254e997..0000000000000000000000000000000000000000 --- a/buildSrc/build.gradle +++ /dev/null @@ -1,11 +0,0 @@ -plugins { - id 'groovy-gradle-plugin' -} - -repositories { - gradlePluginPortal() -} - -dependencies { - implementation 'com.github.ben-manes:gradle-versions-plugin:0.36.0' -} diff --git a/buildSrc/src/main/groovy/relast2uml.java-application-conventions.gradle b/buildSrc/src/main/groovy/relast2uml.java-application-conventions.gradle deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/buildSrc/src/main/groovy/relast2uml.java-common-conventions.gradle b/buildSrc/src/main/groovy/relast2uml.java-common-conventions.gradle deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/buildSrc/src/main/groovy/relast2uml.java-jastadd-conventions.gradle b/buildSrc/src/main/groovy/relast2uml.java-jastadd-conventions.gradle deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle b/buildSrc/src/main/groovy/relast2uml.java-publishing-conventions.gradle deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/dumpAst/build.gradle b/dumpAst/build.gradle index 39e370c1df74809b6993201fd2082b35294e63b3..8210eb050a316995f02a228956e5496afa244068 100644 --- a/dumpAst/build.gradle +++ b/dumpAst/build.gradle @@ -25,7 +25,8 @@ repositories { dependencies { jastadd2 "org.jastadd:jastadd:2.3.5" - implementation fileTree(include: ['plantuml.jar'], dir: '../libs') + // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml + implementation group: 'net.sourceforge.plantuml', name: 'plantuml', version: '1.2022.2' api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11' implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: "0.9.10" implementation group: 'org.yaml', name: 'snakeyaml', version: '1.27' @@ -120,12 +121,6 @@ jastadd { // --- Versioning and Publishing --- group = 'de.tudresden.inf.st' -jar { - from { - configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } - } -} - def versionFile = "src/main/resources/${project.getName()}Version.properties" try { diff --git a/libs/plantuml.jar b/libs/plantuml.jar deleted file mode 100644 index f3a204fc9cb7297951950e05c34f4bd270c5ebb6..0000000000000000000000000000000000000000 Binary files a/libs/plantuml.jar and /dev/null differ