Merge pull request #133 from FairyProject/fix/bukkit-yml

fix: Fixed bukkit-yml not properly generating when bukkit-bootstrap exists
FairyProject · Mar 2, 2024 · 0c44fce · 0c44fce
2 parents a090fbf + 333eff4
commit 0c44fce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...le-plugin/src/main/kotlin/io/fairyproject/gradle/resource/impl/FairyResourceBukkitMeta.kt b/...le-plugin/src/main/kotlin/io/fairyproject/gradle/resource/impl/FairyResourceBukkitMeta.kt
@@ -16,10 +16,10 @@ class FairyResourceBukkitMeta : FairyResource {
         fairyExtension: FairyExtension,
         classMapper: Map<ClassType, ClassInfo>
     ): ResourceInfo? {
-        val hasBukkitPlatform = project.configurations.flatMap { it.dependencies }.any {
-            it.isClassBukkitPlatform()
+        val hasBukkit = project.configurations.flatMap { it.dependencies }.any {
+            it.hasBukkitPlatform
         }
-        if (!hasBukkitPlatform)
+        if (!hasBukkit)
             return null
 
         classMapper[ClassType.BUKKIT_PLUGIN] ?: return null
@@ -40,7 +40,7 @@ class FairyResourceBukkitMeta : FairyResource {
         return resourceOf("plugin.yml", stringJoiner.toString().encodeToByteArray())
     }
 
-    private fun Dependency.isClassBukkitPlatform() =
-        group == "io.fairyproject" &&
-                (name == "bukkit-platform" || name == "bukkit-bundles")
+    private val Dependency.hasBukkitPlatform
+    get() = group == "io.fairyproject" &&
+                (name == "bukkit-platform" || name == "bukkit-bundles" || name == "bukkit-bootstrap")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@
 #
 
 # Fairy
-fairy.version = 0.7.0b4-SNAPSHOT
+fairy.version = 0.7.0b5-SNAPSHOT
 gradle-plugin.version = 1.2.0b9
 
 mongojack.version = 4.2.0