From e2a8cc236e229b10ebea24427ae76e50992a743b Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Sun, 24 Mar 2024 13:36:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.3.3=20=E7=A8=B3=E5=AE=9A=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 8 ++++----
build.gradle.kts | 2 +-
core-bukkit/build.gradle.kts | 25 +------------------------
core-bungee/build.gradle.kts | 27 +--------------------------
4 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/README.md b/README.md
index f864603..f1cb78a 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@ repositories {
dependencies {
// 对于 Bukkit 插件
- compileOnly("cn.hamster3.mc.plugin:core-bukkit:1.3.3-SNAPSHOT")
+ compileOnly("cn.hamster3.mc.plugin:core-bukkit:1.3.3")
// 对于 BungeeCord 插件
- compileOnly("cn.hamster3.mc.plugin:core-bungee:1.3.3-SNAPSHOT")
+ compileOnly("cn.hamster3.mc.plugin:core-bungee:1.3.3")
}
```
@@ -54,13 +54,13 @@ dependencies {
cn.hamster3.mc.plugin
core-bukkit
- 1.3.3-SNAPSHOT
+ 1.3.3
cn.hamster3.mc.plugin
core-bungee
- 1.3.3-SNAPSHOT
+ 1.3.3
diff --git a/build.gradle.kts b/build.gradle.kts
index 42a8933..e4a617a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
}
group = "cn.hamster3.mc.plugin"
-version = "1.3.3-SNAPSHOT"
+version = "1.3.3"
description = "叁只仓鼠的 Minecraft 插件开发通用工具包"
subprojects {
diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts
index 51ae50c..c8e8219 100644
--- a/core-bukkit/build.gradle.kts
+++ b/core-bukkit/build.gradle.kts
@@ -1,12 +1,7 @@
@file:Suppress("VulnerableLibrariesLocal")
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
evaluationDependsOn(":core-common")
-val shade = configurations.create("shade")
-val shadeJava8 = configurations.create("shadeJava8")
-
dependencies {
api(project(":core-common")) { isTransitive = false }
compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT")
@@ -37,11 +32,8 @@ dependencies {
implementation("de.tr7zw:item-nbt-api:2.12.2")
// https://mvnrepository.com/artifact/com.zaxxer/HikariCP
implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") }
-
- // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
- shade("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") { exclude(group = "org.jetbrains") }
// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8
- shadeJava8("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") }
+ implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") }
}
tasks {
@@ -54,23 +46,8 @@ tasks {
archiveBaseName = "HamsterCore-Bukkit"
}
shadowJar {
- from(shade.map { if (it.isDirectory) it else zipTree(it) })
destinationDirectory = rootProject.layout.buildDirectory
relocate("de.tr7zw.changeme.nbtapi", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi")
relocate("de.tr7zw.annotations", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi.annotations")
}
- val shadowJava8 = register("shadowJava8") {
- dependsOn(":core-common:build")
- archiveClassifier = "Java8"
- from(project.configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
- from(processResources.get().outputs)
- from(jar.get().outputs)
- from(shadeJava8.map { if (it.isDirectory) it else zipTree(it) })
- destinationDirectory = rootProject.layout.buildDirectory
- relocate("de.tr7zw.changeme.nbtapi", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi")
- relocate("de.tr7zw.annotations", "cn.hamster3.mc.plugin.core.lib.de.tr7zw.nbtapi.annotations")
- }
- build {
- dependsOn(shadowJava8)
- }
}
diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts
index 863d91b..a1d582c 100644
--- a/core-bungee/build.gradle.kts
+++ b/core-bungee/build.gradle.kts
@@ -1,12 +1,7 @@
@file:Suppress("VulnerableLibrariesLocal")
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
evaluationDependsOn(":core-common")
-val shade = configurations.create("shade")
-val shadeJava8 = configurations.create("shadeJava8")
-
dependencies {
api(project(":core-common")) { isTransitive = false }
compileOnly("net.md-5:bungeecord-api:1.20-R0.1")
@@ -30,11 +25,8 @@ dependencies {
api("com.sun.mail:jakarta.mail:2.0.1")
implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") }
-
- // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
- shade("org.jetbrains.kotlin:kotlin-stdlib:1.9.23") { exclude(group = "org.jetbrains") }
// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib-jdk8
- shadeJava8("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") }
+ implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") { exclude(group = "org.jetbrains") }
}
tasks {
@@ -47,23 +39,6 @@ tasks {
archiveBaseName = "HamsterCore-BungeeCord"
}
shadowJar {
- from(shade.map { if (it.isDirectory) it else zipTree(it) })
destinationDirectory = rootProject.layout.buildDirectory
}
- shadowJar {
- from(shade.map { if (it.isDirectory) it else zipTree(it) })
- destinationDirectory = rootProject.layout.buildDirectory
- }
- val shadowJava8 = register("shadowJava8") {
- dependsOn(":core-common:build")
- archiveClassifier = "Java8"
- from(project.configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) })
- from(processResources.get().outputs)
- from(jar.get().outputs)
- from(shadeJava8.map { if (it.isDirectory) it else zipTree(it) })
- destinationDirectory = rootProject.layout.buildDirectory
- }
- build {
- dependsOn(shadowJava8)
- }
}