From 093f0031098f5db90466fbb62279efec9ebb3f92 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Tue, 12 Mar 2024 02:43:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 806f401..309ab0f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,14 +2,13 @@
 
 plugins {
     id("java")
+    id("com.github.johnrengelman.shadow") version "8+"
 }
 
 group = "cn.hamster3.mc.plugin"
 version = "1.0.3"
 description = "为Minecraft服务器导入 OpenJDK Nashorn 引擎来执行 JavaScript 脚本"
 
-val shade = configurations.create("shade")
-
 repositories {
     maven {
         url = uri("https://maven.airgame.net/maven-public/")
@@ -27,7 +26,6 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.openjdk.nashorn/nashorn-core
     implementation("org.openjdk.nashorn:nashorn-core:15.4")
-    shade("org.openjdk.nashorn:nashorn-core:15.4")
 }
 
 tasks {
@@ -42,24 +40,21 @@ tasks {
         }
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
-    val shadeJar = create<Jar>("shadeJar") {
-        archiveBaseName = "HamsterScript"
-        archiveClassifier = "all"
-        destinationDirectory = rootProject.layout.buildDirectory
-        from(shade.map { if (it.isDirectory) it else zipTree(it) })
-    }
     jar {
-        archiveBaseName = "HamsterScript"
+        destinationDirectory = rootProject.layout.buildDirectory
+    }
+    shadowJar {
         destinationDirectory = rootProject.layout.buildDirectory
     }
     withType<JavaCompile>().configureEach {
         options.encoding = "UTF-8"
     }
     withType<Jar>().configureEach {
+        archiveBaseName = "HamsterScript"
         from(rootProject.file("LICENSE"))
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     }
     build {
-        dependsOn(shadeJar)
+        dependsOn(shadowJar)
     }
 }