Added: entitylib.shadow-conventions.gradle.kts

Renamed: entitylib.java-conventions.gradle.kts -> entitylib.library-conventions.gradle.kts
Switched: johnrengelman's shadow to googler's shadow fork

api/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
     `el-version`
 }
 

build.gradle.kts

@@ -1,6 +1,5 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    id("java-library")
 }
 
 group = "me.tofaa.entitylib"

buildSrc/build.gradle.kts

@@ -9,5 +9,10 @@ kotlin {
 }
 
 repositories {
+    gradlePluginPortal()
     mavenCentral()
 }
+
+dependencies {
+    implementation(libs.shadow)
+}

buildSrc/libs.versions.toml

@@ -0,0 +1,5 @@
+[versions]
+shadow = "8.1.8"
+
+[libraries]
+shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" }

buildSrc/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("libs.versions.toml"))
+        }
+    }
+}

buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    java
+    `java-library`
     `maven-publish`
 }
 
@@ -32,8 +32,6 @@ tasks {
 
     withType<JavaCompile> {
         options.encoding = Charsets.UTF_8.name()
-        // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
-        // See https://openjdk.java.net/jeps/247 for more information.
         options.release = 8
     }
 

buildSrc/src/main/kotlin/entitylib.shadow-conventions.gradle.kts

@@ -0,0 +1,19 @@
+plugins {
+    java
+    io.github.goooler.shadow
+}
+
+tasks {
+    shadowJar {
+        archiveFileName = "EntityLib-${project.name}-${project.version}.jar"
+        archiveClassifier = null
+
+        mergeServiceFiles()
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+}
+
+configurations.implementation.get().extendsFrom(configurations.shadow.get())

code-gen/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {

common/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {

libs.versions.toml

@@ -6,7 +6,6 @@ packetevents = "2.4.1-SNAPSHOT"
 paper = "1.21-R0.1-SNAPSHOT"
 velocity = "3.3.0-SNAPSHOT"
 run-paper = "2.3.0"
-shadow = "8.1.1"
 javapoet = "1.13.0"
 
 [libraries]
@@ -30,4 +29,3 @@ adventure = ["adventure-api", "adventure-text-serializer-gson", "adventure-text-
 [plugins]
 run-paper = { id = "xyz.jpenilla.run-paper", version.ref = "run-paper" }
 run-velocity = { id = "xyz.jpenilla.run-velocity", version.ref = "run-paper" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }

model-engine-addon/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
 }
 
 repositories {

platforms/spigot/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
 }
 
 repositories {

platforms/standalone/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
 }
 
 dependencies {

platforms/velocity/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    `java-library`
+    entitylib.`shadow-conventions`
 }
 
 repositories {

test-plugin/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    entitylib.`java-conventions`
+    entitylib.`library-conventions`
-    alias(libs.plugins.shadow)
+    entitylib.`shadow-conventions`
     alias(libs.plugins.run.paper)
 }