aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason Penilla <[email protected]>2024-10-25 12:47:24 -0700
committerJason Penilla <[email protected]>2024-10-25 12:47:24 -0700
commit2e76d3f1e200c567e62337e0d50ddcb01e3ea895 (patch)
treec60b56b23b9036eb0ee27c7745535738f15ea3d5
parentb711764991073ae1556969a9a86a4501c8767be0 (diff)
downloadPaper-2e76d3f1e200c567e62337e0d50ddcb01e3ea895.tar.gz
Paper-2e76d3f1e200c567e62337e0d50ddcb01e3ea895.zip
Specify mainCapabilityAttribute for paper-api
-rw-r--r--build.gradle.kts2
-rw-r--r--patches/api/0465-Brigadier-based-command-API.patch10
2 files changed, 8 insertions, 4 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 9f0522ccbd..20ab99b72b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ import kotlin.io.path.*
plugins {
java
`maven-publish`
- id("io.papermc.paperweight.core") version "1.7.3"
+ id("io.papermc.paperweight.core") version "1.7.4"
}
allprojects {
diff --git a/patches/api/0465-Brigadier-based-command-API.patch b/patches/api/0465-Brigadier-based-command-API.patch
index 069f7c4c4a..2d29373bc2 100644
--- a/patches/api/0465-Brigadier-based-command-API.patch
+++ b/patches/api/0465-Brigadier-based-command-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Brigadier based command API
Co-authored-by: Jake Potrebic <[email protected]>
diff --git a/build.gradle.kts b/build.gradle.kts
-index 6c8464d9e862b1b4dbf7a77e25446aa870803dae..e7c96be769fde8375b9a1b128cc7ce474144d16d 100644
+index 6c8464d9e862b1b4dbf7a77e25446aa870803dae..254fd96d3950b4494c7e43547b00b5175ee53c93 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,6 +27,7 @@ configurations.api {
@@ -17,18 +17,22 @@ index 6c8464d9e862b1b4dbf7a77e25446aa870803dae..e7c96be769fde8375b9a1b128cc7ce47
// api dependencies are listed transitively to API consumers
api("com.google.guava:guava:32.1.2-jre")
api("com.google.code.gson:gson:2.10.1")
-@@ -93,9 +94,29 @@ sourceSets {
+@@ -93,9 +94,33 @@ sourceSets {
}
}
// Paper end
+// Paper start - brigadier API
+val outgoingVariants = arrayOf("runtimeElements", "apiElements", "sourcesElements", "javadocElements")
++val mainCapability = "${project.group}:${project.name}:${project.version}"
+configurations {
+ val outgoing = outgoingVariants.map { named(it) }
+ for (config in outgoing) {
+ config {
++ attributes {
++ attribute(io.papermc.paperweight.util.mainCapabilityAttribute, mainCapability)
++ }
+ outgoing {
-+ capability("${project.group}:${project.name}:${project.version}")
++ capability(mainCapability)
+ capability("io.papermc.paper:paper-mojangapi:${project.version}")
+ capability("com.destroystokyo.paper:paper-mojangapi:${project.version}")
+ }