Remove redundant json-simple dependency and move isTransitive = false from server to api

This commit is contained in:
Jason Penilla 2021-11-26 22:54:18 -08:00 committed by MiniDigger | Martin
parent 231e0cd3b5
commit c0f2385c99
11 changed files with 51 additions and 51 deletions

View file

@ -28,10 +28,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..e2d2a87d68e611276f743064c6aaf82272d36582
index 0000000000000000000000000000000000000000..139f377673414e1d0213129549e94934b511aa57
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,148 @@
@@ -0,0 +1,144 @@
+import io.papermc.paperweight.util.*
+
+plugins {
@ -51,10 +51,6 @@ index 0000000000000000000000000000000000000000..e2d2a87d68e611276f743064c6aaf822
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
+ }
+ implementation("org.ow2.asm:asm:9.2")
+ implementation("com.googlecode.json-simple:json-simple:1.1.1") {
+ // This includes junit transitively for whatever reason
+ isTransitive = false
+ }
+ runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
+ runtimeOnly("mysql:mysql-connector-java:8.0.27")
+

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index e2d2a87d68e611276f743064c6aaf82272d36582..552edd36f892bc8d1a0333984987c6d41174d967 100644
index 139f377673414e1d0213129549e94934b511aa57..5f1792267c02d1ef4b25444f93ceee52a1dd0661 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,10 +13,9 @@ repositories {
@ -18,10 +18,10 @@ index e2d2a87d68e611276f743064c6aaf82272d36582..552edd36f892bc8d1a0333984987c6d4
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
implementation("org.ow2.asm:asm:9.2")
+ implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
implementation("com.googlecode.json-simple:json-simple:1.1.1") {
// This includes junit transitively for whatever reason
isTransitive = false
@@ -40,6 +39,7 @@ tasks.jar {
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
runtimeOnly("mysql:mysql-connector-java:8.0.27")
@@ -36,6 +35,7 @@ tasks.jar {
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
val implementationVersion = System.getenv("BUILD_NUMBER") ?: "\"$gitHash\""
val date = git("show", "-s", "--format=%ci", gitHash).getText().trim() // Paper
@ -29,7 +29,7 @@ index e2d2a87d68e611276f743064c6aaf82272d36582..552edd36f892bc8d1a0333984987c6d4
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -48,6 +48,8 @@ tasks.jar {
@@ -44,6 +44,8 @@ tasks.jar {
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team",

View file

@ -5,11 +5,11 @@ Subject: [PATCH] Use AsyncAppender to keep logging IO off main thread
diff --git a/build.gradle.kts b/build.gradle.kts
index 03007dc18d52d951ea149d651fb7fd2c9d75f82e..6ffeea41aa7d9370f002043672b3438bd15ef8aa 100644
index a20994ee826d42e3b8dff35d3f67e8bcf8fb79a3..1d62be2d0b8b35eaa7c0f7169df71ca27f8477d3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
}
@@ -28,6 +28,7 @@ dependencies {
implementation("org.ow2.asm:asm-commons:9.2") // Paper - ASM event executor generation
runtimeOnly("org.xerial:sqlite-jdbc:3.36.0.3")
runtimeOnly("mysql:mysql-connector-java:8.0.27")
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Paper

View file

@ -6,7 +6,7 @@ Subject: [PATCH] Deobfuscate stacktraces in log messages, crash reports, and
diff --git a/build.gradle.kts b/build.gradle.kts
index a9a871bb5ca742a174576a23b5c46d8b4a6c0f2c..75def32d9e359d3990b84cd381c2f5bf9e8bffba 100644
index fc59f56860d02ef8c11082feae042a39e3924f45..79d80e5a5e52d2bc45f63eeb81c6f4fd858f7ffc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,6 @@
@ -36,7 +36,7 @@ index a9a871bb5ca742a174576a23b5c46d8b4a6c0f2c..75def32d9e359d3990b84cd381c2f5bf
// Paper end
implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") // Paper
implementation("org.ow2.asm:asm:9.2")
@@ -39,6 +47,8 @@ dependencies {
@@ -35,6 +43,8 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
@ -45,7 +45,7 @@ index a9a871bb5ca742a174576a23b5c46d8b4a6c0f2c..75def32d9e359d3990b84cd381c2f5bf
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
}
@@ -99,6 +109,45 @@ tasks.shadowJar {
@@ -95,6 +105,45 @@ tasks.shadowJar {
}
}

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Implement Mob Goal API
diff --git a/build.gradle.kts b/build.gradle.kts
index 75def32d9e359d3990b84cd381c2f5bf9e8bffba..fb712b3c75068741ca4f69cddcb6c4a7dc1e81ea 100644
index 79d80e5a5e52d2bc45f63eeb81c6f4fd858f7ffc..a5e3868343f6dd0c483d59962b0aed301b973cc6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,6 +49,7 @@ dependencies {
@@ -45,6 +45,7 @@ dependencies {
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Use Velocity compression and cipher natives
diff --git a/build.gradle.kts b/build.gradle.kts
index fb712b3c75068741ca4f69cddcb6c4a7dc1e81ea..72e4828940396b7b326ed64c3c06b785f949b08d 100644
index a5e3868343f6dd0c483d59962b0aed301b973cc6..cd74406039704e5a880f00b9b60bb7b1dedc5398 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,6 +48,11 @@ dependencies {
@@ -44,6 +44,11 @@ dependencies {
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
implementation("net.fabricmc:mapping-io:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation