Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
This commit is contained in:
parent
80836709e7
commit
e942509e73
76 changed files with 152 additions and 253 deletions
|
@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
|
|||
+/.factorypath
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..8d27de2c9da08ca32ff18fc4b8b02ea583edfc1c
|
||||
index 0000000000000000000000000000000000000000..e67df300ac722061765278680ff0afc042a6d0cb
|
||||
--- /dev/null
|
||||
+++ b/build.gradle.kts
|
||||
@@ -0,0 +1,144 @@
|
||||
|
@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..8d27de2c9da08ca32ff18fc4b8b02ea5
|
|||
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
|
||||
+ exclude(group = "org.apache.logging.log4j", module = "log4j-api")
|
||||
+ }
|
||||
+ implementation("org.ow2.asm:asm:9.1")
|
||||
+ 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
|
||||
|
@ -178,7 +178,7 @@ index 0000000000000000000000000000000000000000..8d27de2c9da08ca32ff18fc4b8b02ea5
|
|||
+}
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
deleted file mode 100644
|
||||
index 9dafd60b6dcabf203ee6d60c0ea82d2845b9eec7..0000000000000000000000000000000000000000
|
||||
index c936167e107ab76cfb21febb9534353f481a95d3..0000000000000000000000000000000000000000
|
||||
--- a/pom.xml
|
||||
+++ /dev/null
|
||||
@@ -1,472 +0,0 @@
|
||||
|
@ -244,7 +244,7 @@ index 9dafd60b6dcabf203ee6d60c0ea82d2845b9eec7..00000000000000000000000000000000
|
|||
- <dependency>
|
||||
- <groupId>org.ow2.asm</groupId>
|
||||
- <artifactId>asm</artifactId>
|
||||
- <version>9.1</version>
|
||||
- <version>9.2</version>
|
||||
- <scope>compile</scope>
|
||||
- </dependency>
|
||||
- <!-- deprecated API depend -->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue