Skip to content

Commit ce1e7e8

Browse files
authored
Fix jline relocation (#6677)
1 parent f7e3976 commit ce1e7e8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

patches/server/0001-Setup-Gradle-project.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
2828
+/.factorypath
2929
diff --git a/build.gradle.kts b/build.gradle.kts
3030
new file mode 100644
31-
index 0000000000000000000000000000000000000000..6f084d7500d9de76604440bdcc582be1af04fc8c
31+
index 0000000000000000000000000000000000000000..8dea71d371fb31b50da6b53b0f80030ed1c7c484
3232
--- /dev/null
3333
+++ b/build.gradle.kts
3434
@@ -0,0 +1,173 @@
@@ -113,8 +113,8 @@ index 0000000000000000000000000000000000000000..6f084d7500d9de76604440bdcc582be1
113113
+
114114
+ fun cb(pack: String) = "org.bukkit.craftbukkit.libs.$pack"
115115
+
116+
+ relocate("org.jline:jline-terminal-jansi", "org.jline" to cb("jline"))
116117
+ sequenceOf(
117-
+ "org.jline:jline-terminal-jansi" to "jline",
118118
+ "commons-codec:commons-codec" to "org.apache.commons.codec",
119119
+ "commons-io:commons-io" to "org.apache.commons.io",
120120
+ "it.unimi.dsi:fastutil" to "it.unimi",

patches/server/0003-Build-system-changes.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 6f084d7500d9de76604440bdcc582be1af04fc8c..d97e9ba4432fc87c84f9f128820ff741464e1e25 100644
8+
index 8dea71d371fb31b50da6b53b0f80030ed1c7c484..9248d3701a2ac282d85ab92a515397b5150ffa86 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -18,21 +18,24 @@ repositories {
@@ -46,7 +46,7 @@ index 6f084d7500d9de76604440bdcc582be1af04fc8c..d97e9ba4432fc87c84f9f128820ff741
4646
for (tld in setOf("net", "com", "org")) {
4747
attributes("$tld/bukkit", "Sealed" to true)
4848
@@ -83,7 +87,7 @@ relocation {
49-
"org.jline:jline-terminal-jansi" to "jline",
49+
sequenceOf(
5050
"commons-codec:commons-codec" to "org.apache.commons.codec",
5151
"commons-io:commons-io" to "org.apache.commons.io",
5252
- "it.unimi.dsi:fastutil" to "it.unimi",

0 commit comments

Comments
 (0)