diff options
| author | Jason Penilla <[email protected]> | 2021-11-26 22:54:18 -0800 |
|---|---|---|
| committer | MiniDigger | Martin <[email protected]> | 2021-11-30 19:26:33 +0100 |
| commit | c0f2385c99b8783a0965acfe699b912108f91f18 (patch) | |
| tree | 31dfab1301bdc2a3a095dbf59bd454eb674a50c2 /patches/server/0003-Build-system-changes.patch | |
| parent | 231e0cd3b53e0fcf5904eaf9f161287ee655aa36 (diff) | |
| download | Paper-c0f2385c99b8783a0965acfe699b912108f91f18.tar.gz Paper-c0f2385c99b8783a0965acfe699b912108f91f18.zip | |
Remove redundant json-simple dependency and move isTransitive = false from server to api
Diffstat (limited to 'patches/server/0003-Build-system-changes.patch')
| -rw-r--r-- | patches/server/0003-Build-system-changes.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index 47161b12ef..c8b1f05dfc 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -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", |