Setup dev bundle publishing (#6163)
This commit is contained in:
parent
f2471d20b4
commit
fa184f7429
7 changed files with 102 additions and 53 deletions
|
@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
|
|||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index e67df300ac722061765278680ff0afc042a6d0cb..1ed07304bdf4288608dade345997802cb7753159 100644
|
||||
index 71f781083f2f81d064605b2a652181f22b98733d..bacfd25d2fa07d2b0441494a39fe3830b7e4d1f0 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -18,21 +18,24 @@ repositories {
|
||||
|
@ -45,7 +45,16 @@ index e67df300ac722061765278680ff0afc042a6d0cb..1ed07304bdf4288608dade345997802c
|
|||
)
|
||||
for (tld in setOf("net", "com", "org")) {
|
||||
attributes("$tld/bukkit", "Sealed" to true)
|
||||
@@ -70,15 +74,23 @@ publishing {
|
||||
@@ -77,7 +81,7 @@ relocation {
|
||||
"org.jline:jline-terminal-jansi" to "jline",
|
||||
"commons-codec:commons-codec" to "org.apache.commons.codec",
|
||||
"commons-io:commons-io" to "org.apache.commons.io",
|
||||
- "it.unimi.dsi:fastutil" to "it.unimi",
|
||||
+ //"it.unimi.dsi:fastutil" to "it.unimi", // Paper - don't relocate fastutil
|
||||
"org.apache.commons:commons-lang3" to "org.apache.commons.lang3",
|
||||
"org.ow2.asm:asm" to "org.objectweb.asm"
|
||||
).forEach { (owner, pack) ->
|
||||
@@ -102,9 +106,17 @@ relocation {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -60,16 +69,9 @@ index e67df300ac722061765278680ff0afc042a6d0cb..1ed07304bdf4288608dade345997802c
|
|||
+ rename { "pom.xml" }
|
||||
+ }
|
||||
+
|
||||
val packageVersion = "1_17_R1"
|
||||
relocate("org.bukkit.craftbukkit", "org.bukkit.craftbukkit.v$packageVersion") {
|
||||
exclude("org.bukkit.craftbukkit.Main*")
|
||||
}
|
||||
listOf(
|
||||
- "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
|
||||
+ "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil
|
||||
"org.apache.commons.lang3", "org.apache.http", "org.apache.maven", "org.codehaus.plexus",
|
||||
"org.eclipse.aether", "org.eclipse.sisu", "org.objectweb.asm"
|
||||
).forEach { pack ->
|
||||
for (relocation in relocation.relocations.get()) {
|
||||
relocate(relocation.fromPackage, relocation.toPackage) {
|
||||
for (exclude in relocation.excludes) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index 1338f52370dafbb8820a67cc4528eb20e0b9155c..90af1b123722bac1c4c5956465a153ec1ea998ff 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue