Skip to content

Commit 29ab008

Browse files
committed
build(spigot): generate plugin.yml and add libs to it
1 parent 68024f5 commit 29ab008

File tree

3 files changed

+34
-7
lines changed

3 files changed

+34
-7
lines changed

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ dev-tools = "a2.0.1.0"
7575
artifactory = "5+"
7676
paperweight-userdev = "2.0.0-beta.18"
7777
minotaur = "2.+"
78+
resource-factory = "1.3.0"
7879

7980
[libraries]
8081
# Kotlin & Jetbrains
@@ -159,3 +160,4 @@ artifactory = { id = "com.jfrog.artifactory", version.ref = "artifactory"}
159160
fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
160161
paperweight-userdev = { id = "io.papermc.paperweight.userdev", version.ref = "paperweight-userdev" }
161162
modrinth-minotaur = { id = "com.modrinth.minotaur", version.ref = "minotaur" }
163+
resource-factory-bukkit = { id = "xyz.jpenilla.resource-factory-bukkit-convention", version.ref= "resource-factory"}

spigot/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ dependencies {
6565
compileOnly(libs.oraxen)
6666
compileOnly(libs.wolfyutils.spigot)
6767
compileOnly(libs.nbtapi)
68+
compileOnly(libs.bundles.exposed)
69+
compileOnly(libs.bundles.database.drivers)
6870
paperweight.paperDevBundle(libs.versions.papermc.get())
6971
}
7072

@@ -75,11 +77,11 @@ tasks {
7577
dependencies {
7678
include(project(":common"))
7779

78-
include(dependency(libs.typesafe.config))
79-
include(dependency("${libs.jackson.kotlin.get().group}:.*"))
80-
include(dependency(libs.jackson.dataformat.hocon))
81-
include(dependency(libs.caffeine))
82-
include(dependency(libs.bstats))
80+
// Need to shade this for now, because when defined in plugin.yml it causes classloader issue for
81+
// kotlin stdlib etc., because those are transitive dependencies and cause duplicate class definitions.
82+
libs.bundles.exposed.get().forEach {
83+
include(dependency(it))
84+
}
8385
}
8486
metaInf.duplicatesStrategy = DuplicatesStrategy.FAIL
8587

spigot/loader/build.gradle.kts

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* along with this program. If not, see <https://www.gnu.org/licenses/>.
2121
*/
2222

23-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
24-
2523
plugins {
2624
kotlin("jvm")
2725
`java-library`
@@ -30,6 +28,7 @@ plugins {
3028
alias(libs.plugins.artifactory)
3129
alias(libs.plugins.paperweight.userdev)
3230
alias(libs.plugins.devtools.docker.minecraft)
31+
alias(libs.plugins.resource.factory.bukkit)
3332
id("build.settings.default")
3433
}
3534

@@ -54,6 +53,30 @@ dependencies {
5453
paperweight.paperDevBundle(libs.versions.papermc.get())
5554
}
5655

56+
bukkitPluginYaml {
57+
name = "CustomCrafting"
58+
version = project.version.toString()
59+
main = "com.wolfyscript.customcrafting.spigot.loader.SpigotLoaderPlugin"
60+
apiVersion = libs.versions.minecraft.get() // Only support the latest Minecraft version!
61+
authors.add("WolfyScript")
62+
depend.add("scafall")
63+
64+
libraries.apply {
65+
// libs.bundles.exposed.get().forEach {
66+
// add(it.toString())
67+
// }
68+
libs.bundles.database.drivers.get().forEach {
69+
add(it.toString())
70+
}
71+
72+
addAll(
73+
libs.typesafe.config.get().toString(),
74+
libs.caffeine.get().toString(),
75+
libs.bstats.get().toString(),
76+
)
77+
}
78+
}
79+
5780
tasks {
5881
processResources {
5982
duplicatesStrategy = DuplicatesStrategy.INCLUDE

0 commit comments

Comments
 (0)