Upgrade paperweight with bundler jar updates

This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).
This commit is contained in:
Kyle Wood 2021-11-26 00:08:46 -06:00 committed by MiniDigger | Martin
parent e8f01f89d2
commit e519a51f95
19 changed files with 61 additions and 63 deletions

View file

@ -5,12 +5,12 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddce4e02def 100644
index e2d2a87d68e611276f743064c6aaf82272d36582..552edd36f892bc8d1a0333984987c6d41174d967 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,10 +14,9 @@ repositories {
@@ -13,10 +13,9 @@ repositories {
dependencies {
implementation(project(":Paper-API"))
implementation(project(":paper-api"))
implementation("jline:jline:2.12.1")
- implementation("org.apache.logging.log4j:log4j-iostreams:2.14.1") {
- exclude(group = "org.apache.logging.log4j", module = "log4j-api")
@ -21,7 +21,7 @@ index 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddc
implementation("com.googlecode.json-simple:json-simple:1.1.1") {
// This includes junit transitively for whatever reason
isTransitive = false
@@ -41,6 +40,7 @@ tasks.jar {
@@ -40,6 +39,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 9778c18a2822b00d48134583de87ea281623427d..a5494ea5ee3354bae16dab1b5a910ddc
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -49,6 +49,8 @@ tasks.jar {
@@ -48,6 +48,8 @@ tasks.jar {
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
"Specification-Vendor" to "Bukkit Team",