Fix bukkit-bungeecord jar using deprecated Gradle features

jpenilla · Jan 2, 2025 · a5a8d10 · a5a8d10
1 parent 7963781
commit a5a8d10
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/dist/bukkit-bungeecord/build.gradle.kts b/dist/bukkit-bungeecord/build.gradle.kts
@@ -9,17 +9,26 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-).map { it.dependencyProject }
+)
+
+val platformsConfig = configurations.register("platforms") {
+  attributes.attribute(productionJarAttribute, "true")
+  isCanBeConsumed = false
+  isCanBeResolved = true
+}
+
+dependencies {
+  for (platform in platforms) {
+    platformsConfig.name(platform)
+  }
+}
 
 val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 
-  for (platform in platforms) {
-    val jarTask = platform.miniMOTDPlatform.jarTask
-    from(zipTree(jarTask.flatMap { it.archiveFile }))
-  }
+  from(platformsConfig.flatMap { it.elements }.map { it.map { e -> zipTree(e) } })
 }
 
 miniMOTDPlatform {

diff --git a/gradle/build-logic/src/main/kotlin/extensions.kt b/gradle/build-logic/src/main/kotlin/extensions.kt
@@ -1,6 +1,7 @@
 import net.kyori.indra.git.IndraGitExtension
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
+import org.gradle.api.attributes.Attribute
 import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.getByType
 
@@ -33,3 +34,5 @@ val bukkitVersions = listOf(
   "1.20.6",
   "1.21.4",
 )
+
+val productionJarAttribute = Attribute.of("minimotd.productionJar", String::class.java)
diff --git a/gradle/build-logic/src/main/kotlin/minimotd.platform-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/minimotd.platform-conventions.gradle.kts
@@ -32,3 +32,10 @@ if (name != "minimotd-bukkit-bungeecord") {
     }
   }
 }
+
+configurations.consumable("productionJar") {
+  outgoing {
+    artifact(platformExtension.jarTask)
+  }
+  attributes.attribute(productionJarAttribute, "true")
+}