Melhoria da compatibilidade com shadowJar

ArmaRealms · Sep 18, 2024 · a26e980 · a26e980
1 parent 120fe2e
commit a26e980
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 27 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,7 +2,6 @@ import org.gradle.kotlin.dsl.support.uppercaseFirstChar
 
 plugins {
     id("root-plugin")
-    id("com.gradleup.shadow") version "8.3.1"
 }
 
 java {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -2,12 +2,8 @@ plugins {
     `kotlin-dsl`
 }
 
-repositories {
-    gradlePluginPortal()
-    mavenCentral()
-}
-
 dependencies {
     implementation(libs.paperweight)
+    implementation(libs.shadowjar)
     implementation(libs.runpaper)
 }
diff --git a/buildSrc/src/main/kotlin/paper-plugin.gradle.kts b/buildSrc/src/main/kotlin/paper-plugin.gradle.kts
@@ -1,8 +1,6 @@
 plugins {
     id("io.papermc.paperweight.userdev")
-
     id("xyz.jpenilla.run-paper")
-
     id("root-plugin")
 }
 
@@ -12,15 +10,10 @@ base {
 
 repositories {
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
-
     maven("https://repo.papermc.io/repository/maven-public/")
-
     maven("https://repo.codemc.io/repository/maven-public/")
-
     maven("https://repo.triumphteam.dev/snapshots/")
-
     maven("https://repo.oraxen.com/releases/")
-
     flatDir { dirs("libs") }
 }
 

diff --git a/buildSrc/src/main/kotlin/root-plugin.gradle.kts b/buildSrc/src/main/kotlin/root-plugin.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+    id("com.gradleup.shadow")
     `java-library`
     `maven-publish`
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,25 +1,23 @@
 [versions]
 kyori_version = "4.17.0"
-
 paperweight_version = "1.7.2"
 runpaper_version = "2.2.3"
-
+shadow_version = "8.3.2"
 modrinth_version = "2.8.7"
 hangar_version = "0.1.2"
 
 [plugins]
 hangar = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar_version" }
 modrinth = { id = "com.modrinth.minotaur", version.ref = "modrinth_version" }
-
+shadowjar = { id = "com.gradleup.shadow.shadow-gradle-plugin", version.ref = "shadow_version" }
 paperweight = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight_version" }
 runpaper = { id = "xyz.jpenilla.run-paper", version.ref = "runpaper_version" }
 
 [libraries]
 adventure = { module = "net.kyori:adventure-api", version.ref = "kyori_version" }
 minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori_version" }
-
 paperweight = { module = "io.papermc.paperweight:paperweight-userdev", version.ref = "paperweight_version" }
 runpaper = { module = "xyz.jpenilla:run-task", version.ref = "runpaper_version" }
-
+shadowjar = { module = "com.gradleup.shadow:shadow-gradle-plugin", version.ref = "shadow_version" }
 hangar = { module = "io.papermc:hangar-publish-plugin", version.ref = "hangar_version" }
 modrinth = { module = "com.modrinth.minotaur:Minotaur", version.ref = "modrinth_version" }
diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -1,23 +1,15 @@
 plugins {
     id("paper-plugin")
-    id("com.gradleup.shadow") version "8.3.1"
 }
 
 dependencies {
     api(project(":common"))
-
     implementation(libs.cluster.paper)
-
     implementation(libs.triumphcmds)
-
     implementation(libs.nbtapi)
-
     compileOnly(libs.decentholograms)
-
     compileOnly(libs.placeholderapi)
-
     compileOnly(libs.oraxen)
-
     compileOnly(fileTree("libs").include("*.jar"))
 }
 

diff --git a/paper/run/server.properties b/paper/run/server.properties
@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Wed Sep 18 10:49:27 GMT-03:00 2024
+#Wed Sep 18 10:59:37 GMT-03:00 2024
 accepts-transfers=false
 allow-flight=false
 allow-nether=false
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ import org.gradle.kotlin.dsl.support.uppercaseFirstChar @@
     plugins {
         id("root-plugin")
-        id("com.gradleup.shadow") version "8.3.1"
     }
     java {
@@ Expand Down @@