From ecd8b99a88150fabfc33f1182a2837eea92535f3 Mon Sep 17 00:00:00 2001 From: Brianna Date: Fri, 27 Dec 2019 23:53:29 -0500 Subject: [PATCH 1/2] 1.15 --- pom.xml | 2 +- .../java/com/songoda/epicvouchers/libraries/ItemBuilder.java | 4 ++-- src/main/java/com/songoda/epicvouchers/voucher/Voucher.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 889ecdc..abf2010 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ org.spigotmc spigot - 1.14.4 + 1.15 provided diff --git a/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java b/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java index a39d838..f99affd 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java +++ b/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java @@ -162,7 +162,7 @@ public class ItemBuilder { * Unbreakability: */ public boolean isUnbreakable() { - return meta.spigot().isUnbreakable(); + return meta.isUnbreakable(); } public ItemBuilder unbreakable() { @@ -171,7 +171,7 @@ public class ItemBuilder { @SuppressWarnings("deprecation") public ItemBuilder unbreakable(boolean unbreakable) { - meta.spigot().setUnbreakable(unbreakable); + meta.setUnbreakable(unbreakable); return this; } diff --git a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java b/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java index e49cd4d..98cc050 100644 --- a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java +++ b/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java @@ -95,7 +95,7 @@ public class Voucher { } if (unbreakable) { - meta.spigot().setUnbreakable(true); + meta.setUnbreakable(true); } if (hideAttributes) { From badefcd6df3bc0d5548c4e2000f5d994031fd1e3 Mon Sep 17 00:00:00 2001 From: Brianna Date: Fri, 27 Dec 2019 23:59:01 -0500 Subject: [PATCH 2/2] version 2.1.16 --- .gitlab-ci.yml | 21 --------------------- pom.xml | 24 +++++++++++++++++++++++- 2 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index fc6bce9..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -stages: - - build - -variables: - name: "EpicVouchers" - path: "/builds/$CI_PROJECT_PATH" - version: "2.1.14" - -build: - stage: build - image: maven:3.5.3-jdk-8 - script: - - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g - - mvn clean package - - find $path/ -depth -path '*original*' -delete - - mv $path/target/*.jar $path/ - artifacts: - name: $name-$version - paths: - - "$path/*.jar" diff --git a/pom.xml b/pom.xml index abf2010..f5c5b42 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicVouchers 4.0.0 - maven-version-number + 2.1.16 clean install EpicVouchers-${project.version} @@ -16,6 +16,28 @@ 1.8 + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + prepare-package + + replace + + + + + ${project.build.directory}/classes/plugin.yml + + + maven-version-number + ${project.version} + + + + org.apache.maven.plugins maven-shade-plugin