From b75a22c4b1f9a0cf75d77fcf065b83eec8c20f04 Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Mon, 14 Jun 2021 01:48:04 +0200 Subject: [PATCH] not even checkstyle can help us now --- patches/api/0001-Convert-project-to-Gradle.patch | 12 ++---------- patches/api/0002-POM-changes.patch | 6 +++--- patches/api/0003-Add-FastUtil-to-Bukkit.patch | 6 +++--- patches/api/0006-Adventure.patch | 4 ++-- patches/api/0024-Use-ASM-for-event-executors.patch | 6 +++--- ...0067-Allow-plugins-to-use-SLF4J-for-logging.patch | 4 ++-- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 1fb1db17a..64567fb6d 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -16,15 +16,14 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4 /.project diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..f3dd92e136a71aa39e422de7b2c5f2f3fdec554e +index 0000000000000000000000000000000000000000..35b57f52fcfd91cff04dc60c3a8a16b31f775fc0 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,67 @@ +@@ -0,0 +1,59 @@ +import java.util.Locale + +plugins { + `java-library` -+ checkstyle +} + +java { @@ -51,8 +50,6 @@ index 0000000000000000000000000000000000000000..f3dd92e136a71aa39e422de7b2c5f2f3 + testImplementation("junit:junit:4.13.1") + testImplementation("org.hamcrest:hamcrest-library:1.3") + testImplementation("org.ow2.asm:asm-tree:9.1") -+ -+ checkstyle("com.puppycrawl.tools:checkstyle:8.39") +} + +val generateApiVersioningFile by tasks.registering { @@ -82,8 +79,3 @@ index 0000000000000000000000000000000000000000..f3dd92e136a71aa39e422de7b2c5f2f3 + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/" + ) +} -+ -+checkstyle { -+ configFile = file("checkstyle.xml") -+ sourceSets = listOf(project.sourceSets.main.get(), project.sourceSets.test.get()) -+} diff --git a/patches/api/0002-POM-changes.patch b/patches/api/0002-POM-changes.patch index 142297431..6eff19161 100644 --- a/patches/api/0002-POM-changes.patch +++ b/patches/api/0002-POM-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] POM changes diff --git a/build.gradle.kts b/build.gradle.kts -index f3dd92e136a71aa39e422de7b2c5f2f3fdec554e..b75ac1f11c3171a3f0c8edb30be3555216f51b0a 100644 +index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..20c8a34b299ba455c29b4e31d311de0b3a063288 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -17,10 +17,12 @@ dependencies { +@@ -16,10 +16,12 @@ dependencies { api("com.google.code.gson:gson:2.8.0") api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.29") @@ -22,7 +22,7 @@ index f3dd92e136a71aa39e422de7b2c5f2f3fdec554e..b75ac1f11c3171a3f0c8edb30be35552 val annotations = "org.jetbrains:annotations-java5:21.0.1" compileOnly(annotations) diff --git a/pom.xml b/pom.xml -index debe5bd7adb1f41e8a6878a8545de4bfcad1a590..d7cf64f05d0a2f5b186ca13b2b88e390abe84226 100644 +index 10eeaef61be733e63f6680f1675e0b527eb30fd9..e5802bcb6fc2376cff2ee8b3069150127312b154 100644 --- a/pom.xml +++ b/pom.xml @@ -2,33 +2,34 @@ diff --git a/patches/api/0003-Add-FastUtil-to-Bukkit.patch b/patches/api/0003-Add-FastUtil-to-Bukkit.patch index 8e8ee65d9..a315769d1 100644 --- a/patches/api/0003-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0003-Add-FastUtil-to-Bukkit.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index b75ac1f11c3171a3f0c8edb30be3555216f51b0a..218e9c682e7b91dc27f2caf46316ba7a7982e5f3 100644 +index 20c8a34b299ba455c29b4e31d311de0b3a063288..6243c2fc2021e6c4fe0f036892bc83983364f360 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -18,6 +18,7 @@ dependencies { +@@ -17,6 +17,7 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.29") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper @@ -18,7 +18,7 @@ index b75ac1f11c3171a3f0c8edb30be3555216f51b0a..218e9c682e7b91dc27f2caf46316ba7a compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") diff --git a/pom.xml b/pom.xml -index d7cf64f05d0a2f5b186ca13b2b88e390abe84226..1ebc4c096638128194cea9c2a4131f901e7d6896 100644 +index e5802bcb6fc2376cff2ee8b3069150127312b154..7b44549b508862b207324a6003fcdfa623f40f07 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,12 @@ diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index 107340f64..ca041f6d3 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -7,10 +7,10 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 218e9c682e7b91dc27f2caf46316ba7a7982e5f3..50c3a01826f0ff939e3ee935d5a4e446f46c8cce 100644 +index 6243c2fc2021e6c4fe0f036892bc83983364f360..d22f6ce80583f4a12e61b5ca89033deeeebde5d5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -19,6 +19,11 @@ dependencies { +@@ -18,6 +18,11 @@ dependencies { api("org.yaml:snakeyaml:1.29") api("com.googlecode.json-simple:json-simple:1.1.1") // Paper api("it.unimi.dsi:fastutil:8.2.2") diff --git a/patches/api/0024-Use-ASM-for-event-executors.patch b/patches/api/0024-Use-ASM-for-event-executors.patch index 2cb4f1f83..ba94a254e 100644 --- a/patches/api/0024-Use-ASM-for-event-executors.patch +++ b/patches/api/0024-Use-ASM-for-event-executors.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 50c3a01826f0ff939e3ee935d5a4e446f46c8cce..c976d4458886603feeb05b7c854a5c1e54fcb287 100644 +index d22f6ce80583f4a12e61b5ca89033deeeebde5d5..a5f7258a543c8a9e2ce55c6f8f1b6f3435ef608e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -24,6 +24,8 @@ dependencies { +@@ -23,6 +23,8 @@ dependencies { api("net.kyori:adventure-text-serializer-gson") api("net.kyori:adventure-text-serializer-legacy") api("net.kyori:adventure-text-serializer-plain") @@ -19,7 +19,7 @@ index 50c3a01826f0ff939e3ee935d5a4e446f46c8cce..c976d4458886603feeb05b7c854a5c1e compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0") diff --git a/pom.xml b/pom.xml -index cae43ce5c1287a4cd117fd069d34ebc1b64b7fdb..2c757ffb2253748c6a81f9b373290108209b6ff2 100644 +index f2238314b948be036d9e7054d7af5bfdac8ebbf6..aefaeec678b2f6b5ba1c15e43c4886eb9af6b143 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,17 @@ diff --git a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index b59af7a1b..219688483 100644 --- a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index c976d4458886603feeb05b7c854a5c1e54fcb287..9633529a71556a453edae71b09a573a957d65c60 100644 +index a5f7258a543c8a9e2ce55c6f8f1b6f3435ef608e..12c4f278d52bd6fb626fc7cd9414e8869c49fcd2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -26,6 +26,7 @@ dependencies { +@@ -25,6 +25,7 @@ dependencies { api("net.kyori:adventure-text-serializer-plain") api("org.ow2.asm:asm:9.0") api("org.ow2.asm:asm-commons:9.0")