diff --git a/Jenkinsfile b/Jenkinsfile index 2f86acd..6d26d2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { } post { always { - archiveArtifacts artifacts: "**/build/libs/*.jar", fingerprint: true + archiveArtifacts artifacts: "build/libs/*.jar", fingerprint: true javadoc javadocDir: "api/build/docs/javadoc", keepAll: false discordSend description: "**Build:** ${env.BUILD_NUMBER}\n**Status:** ${currentBuild.currentResult}", enableArtifactsList: true, footer: "Built with Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, scmWebUrl: "https://github.com/plexusorg/Plex", showChangeset: true, title: env.JOB_NAME, webhookURL: env.PLEX_WEBHOOK_URL cleanWs() diff --git a/api/build.gradle b/api/build.gradle index 67f545b..65739c8 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -6,6 +6,16 @@ jar { archiveBaseName.set("Plex-API") } +tasks { + jar { + finalizedBy(rootProject.tasks.copyJars) + } + + shadowJar { + enabled = false + } +} + publishing { publications { maven(MavenPublication) { diff --git a/api/src/main/java/dev/plex/api/event/AdminAddEvent.java b/api/src/main/java/dev/plex/api/event/AdminAddEvent.java index 32e5843..c66baf9 100644 --- a/api/src/main/java/dev/plex/api/event/AdminAddEvent.java +++ b/api/src/main/java/dev/plex/api/event/AdminAddEvent.java @@ -36,5 +36,4 @@ public class AdminAddEvent extends Event { return handlers; } - } diff --git a/api/src/main/java/dev/plex/api/event/GameModeUpdateEvent.java b/api/src/main/java/dev/plex/api/event/GameModeUpdateEvent.java index 3609f02..75567ff 100644 --- a/api/src/main/java/dev/plex/api/event/GameModeUpdateEvent.java +++ b/api/src/main/java/dev/plex/api/event/GameModeUpdateEvent.java @@ -13,7 +13,6 @@ import org.jetbrains.annotations.NotNull; @Data public class GameModeUpdateEvent extends Event { - private static final HandlerList handlers = new HandlerList(); private final CommandSender sender; diff --git a/api/src/main/java/dev/plex/api/event/PunishedPlayerMuteEvent.java b/api/src/main/java/dev/plex/api/event/PunishedPlayerMuteEvent.java index acb330a..4efcb9c 100644 --- a/api/src/main/java/dev/plex/api/event/PunishedPlayerMuteEvent.java +++ b/api/src/main/java/dev/plex/api/event/PunishedPlayerMuteEvent.java @@ -11,7 +11,6 @@ import org.bukkit.event.HandlerList; @Getter public class PunishedPlayerMuteEvent extends PunishedPlayerEvent implements Cancellable { - private static final HandlerList handlers = new HandlerList(); /** diff --git a/api/src/main/java/dev/plex/api/player/IPlexPlayer.java b/api/src/main/java/dev/plex/api/player/IPlexPlayer.java index ba0cb76..96c4f9f 100644 --- a/api/src/main/java/dev/plex/api/player/IPlexPlayer.java +++ b/api/src/main/java/dev/plex/api/player/IPlexPlayer.java @@ -7,7 +7,6 @@ import org.bukkit.permissions.PermissionAttachment; public interface IPlexPlayer { - String getId(); UUID getUuid(); diff --git a/api/src/main/java/dev/plex/api/rank/IRank.java b/api/src/main/java/dev/plex/api/rank/IRank.java index 4b70835..4646235 100644 --- a/api/src/main/java/dev/plex/api/rank/IRank.java +++ b/api/src/main/java/dev/plex/api/rank/IRank.java @@ -6,7 +6,6 @@ import org.json.JSONObject; public interface IRank { - int getLevel(); String getLoginMessage(); diff --git a/build.gradle b/build.gradle index 65f3ec0..a10fc6f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,7 @@ plugins { id "java" id "maven-publish" + id "com.github.johnrengelman.shadow" version "7.1.2" } group = "dev.plex" @@ -10,6 +11,7 @@ description = "Plex" subprojects { apply plugin: "java" apply plugin: "maven-publish" + apply plugin: "com.github.johnrengelman.shadow" repositories { maven { @@ -55,4 +57,10 @@ subprojects { } } } +} + +task copyJars(type: Copy, dependsOn: subprojects.jar) { + from(subprojects.jar) + from(subprojects.shadowJar) + into project.file('build/libs') } \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 655186f..f9a3fc6 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -1,6 +1,5 @@ plugins { id "net.minecrell.plugin-yml.bukkit" version "0.6.1-SNAPSHOT" - id "com.github.johnrengelman.shadow" version "7.1.2" } dependencies { @@ -104,6 +103,10 @@ tasks { enabled = false } + shadowJar { + finalizedBy(rootProject.tasks.copyJars) + } + javadoc { options.memberLevel = JavadocMemberLevel.PRIVATE }