框架更新

TheFloodDragon · Jun 30, 2023 · 8ff5018 · 8ff5018
1 parent eccdd2d
commit 8ff5018
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 15 deletions.
diff --git a/plugin/all/build.gradle.kts b/plugin/all/build.gradle.kts
@@ -1,5 +1,16 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 dependencies {
     parent!!.childProjects.values.filter {
         it.name.contains("platform")
     }.forEach { implementation(it) }
+}
+
+tasks {
+    withType<ShadowJar> {
+        archiveVersion.set(rootVersion)
+    }
+    build {
+        dependsOn(shadowJar)
+    }
 }
diff --git a/plugin/platform-bukkit/build.gradle.kts b/plugin/platform-bukkit/build.gradle.kts
@@ -1,7 +1,14 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 dependencies {
-    implementation(project(":project:runtime-bukkit"))
+    compileOnly("com.google.guava:guava:31.1-jre")
+
+    rootProject.allprojects.forEach {
+        if (it.parent?.name == "project" && !it.name.contains("bungee"))
+            implementation(it)
+    }
+
+    shadowTaboo("platform-bukkit")
 }
 
 tasks {

diff --git a/...n/java/cn/fd/utilities/env/BukkitEnv.java → ...n/java/cn/fd/utilities/env/BukkitEnv.java b/...n/java/cn/fd/utilities/env/BukkitEnv.java → ...n/java/cn/fd/utilities/env/BukkitEnv.java
diff --git a/...fd/utilities/adventure/AdventureBukkit.kt → ...fd/utilities/adventure/AdventureBukkit.kt b/...fd/utilities/adventure/AdventureBukkit.kt → ...fd/utilities/adventure/AdventureBukkit.kt
diff --git a/...lin/cn/fd/utilities/bukkit/FDUtilities.kt → ...lin/cn/fd/utilities/bukkit/FDUtilities.kt b/...lin/cn/fd/utilities/bukkit/FDUtilities.kt → ...lin/cn/fd/utilities/bukkit/FDUtilities.kt
diff --git a/...cn/fd/utilities/bukkit/command/TestOne.kt → ...cn/fd/utilities/bukkit/command/TestOne.kt b/...cn/fd/utilities/bukkit/command/TestOne.kt → ...cn/fd/utilities/bukkit/command/TestOne.kt
diff --git a/...ities/bukkit/loader/DependenciesLoader.kt → ...ities/bukkit/loader/DependenciesLoader.kt b/...ities/bukkit/loader/DependenciesLoader.kt → ...ities/bukkit/loader/DependenciesLoader.kt
diff --git a/project/runtime-bukkit/build.gradle.kts → project/taboolib-generate/build.gradle.kts b/project/runtime-bukkit/build.gradle.kts → project/taboolib-generate/build.gradle.kts
@@ -2,23 +2,9 @@ plugins {
     id("io.izzel.taboolib") version taboolibPluginVersion
 }
 
-dependencies {
-
-    compileOnly("com.google.guava:guava:31.1-jre")
-
-//    rootProject.allprojects.forEach {
-//        if (it.parent?.name == "project" && !it.name.contains("bungee"))
-//            implementation(it)
-//    }
-    parent!!.childProjects.values.filter {
-        it.name.contains("module")
-    }.forEach { implementation(it) }
-}
-
 taboolib {
     version = taboolibVersion
     taboolibModules.forEach { install(it) }
-    install("platform-bukkit") //Bukkit
 
     description {
         name = rootName