From 8ad3f6dd7f1491e023f9b60585e40759a434d540 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Thu, 7 Apr 2022 12:38:59 -0500 Subject: [PATCH] Sync with master --- .gitignore | 18 +++++++++++++++--- Jenkinsfile | 19 +++++++++++++++++++ build.gradle | 1 - 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 Jenkinsfile diff --git a/.gitignore b/.gitignore index ee148d2..5bbd195 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,15 @@ -.gradle/ -build/ -.idea/ \ No newline at end of file +/.idea/ +*.iml +/target/ + +# OS +.DS_Store +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db + +# Gradle +/build/ +/.gradle/ \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..fc3d527 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,19 @@ +pipeline { + agent any + stages { + stage("build") { + steps { + withGradle { + sh "./gradlew build --no-daemon" + } + } + } + } + post { + always { + archiveArtifacts artifacts: "build/libs/*-SNAPSHOT.jar", fingerprint: true + discordSend description: "Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, title: JOB_NAME, webhookURL: env.BLACKOUT_WEBHOOK_URL + cleanWs() + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index d2a6ba2..0d754ab 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,6 @@ def paperVersion = "1.17.1" dependencies { paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:${paperVersion}-R0.1-SNAPSHOT") - library 'org.json:json:20211205' library "org.projectlombok:lombok:1.18.22" annotationProcessor "org.projectlombok:lombok:1.18.22"