Remove redundant and unneeded repos, reorder repos (#6867)

This commit is contained in:
Jason 2021-11-03 19:42:18 -07:00 committed by GitHub
parent d9e2817ffd
commit 3e310e096c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 62 additions and 68 deletions

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20a4b355a8 100644
index b64b0200a6b19f93ba0592ecc6f29b4534df4812..c462f9fc70ef2286da21d7c5b96ac68ff602a310 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,21 +17,24 @@ repositories {
@@ -17,21 +17,23 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation("jline:jline:2.12.1")
@ -31,13 +31,12 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+ implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper
+ implementation("io.netty:netty-all:4.1.65.Final") // Paper
+
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -52,6 +55,7 @@ tasks.jar {
@@ -52,6 +54,7 @@ tasks.jar {
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team",
@ -45,7 +44,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
)
for (tld in setOf("net", "com", "org")) {
attributes("$tld/bukkit", "Sealed" to true)
@@ -82,7 +86,7 @@ relocation {
@@ -82,7 +85,7 @@ relocation {
sequenceOf(
"commons-codec:commons-codec" to "org.apache.commons.codec",
"commons-io:commons-io" to "org.apache.commons.io",
@ -54,7 +53,7 @@ index b64b0200a6b19f93ba0592ecc6f29b4534df4812..1f4c0f2156c588fcbb3b0329a416dc20
"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 {
@@ -102,9 +105,17 @@ relocation {
}
}