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

@ -27,12 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473db88c3a8
index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977dd49ce1d
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,68 @@
+import java.util.Locale
+
@@ -0,0 +1,65 @@
+plugins {
+ `java-library`
+ `maven-publish`
@ -66,7 +64,6 @@ index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473
+
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ artifactId = project.name.toLowerCase(Locale.ENGLISH)
+ from(components["java"])
+ }
+}
@ -82,7 +79,7 @@ index 0000000000000000000000000000000000000000..2ffdda3764d92227264dd4a1ef9bf473
+
+tasks.jar {
+ from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
+ into("META-INF/maven/${project.group}/${project.name.toLowerCase(Locale.ENGLISH)}")
+ into("META-INF/maven/${project.group}/${project.name}")
+ }
+ manifest {
+ attributes(

View file

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ffdda3764d92227264dd4a1ef9bf473db88c3a8..430fa84c1de3eae24f48f915031c1a0265ad7e43 100644
index 3ccff060bcb816520a27ec2f34adc977dd49ce1d..738b1c0540e5184eb6d7296107d458aa5be0bfd3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,15 +17,23 @@ dependencies {
@@ -15,15 +15,23 @@ dependencies {
api("com.google.code.gson:gson:2.8.8")
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
@ -33,7 +33,7 @@ index 2ffdda3764d92227264dd4a1ef9bf473db88c3a8..430fa84c1de3eae24f48f915031c1a02
testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:9.2")
@@ -62,7 +70,7 @@ tasks.withType<Javadoc> {
@@ -59,7 +67,7 @@ tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).links(
"https://guava.dev/releases/31.0.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",

View file

@ -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 430fa84c1de3eae24f48f915031c1a0265ad7e43..0f34457a5f18df3ba99f1168b99442d59df65e7b 100644
index 738b1c0540e5184eb6d7296107d458aa5be0bfd3..1455ed17cd055ec97e0adbbd309edae4ac6d1204 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
@@ -16,6 +16,7 @@ dependencies {
api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.28")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper

View file

@ -7,10 +7,10 @@ Co-authored-by: zml <zml@stellardrift.ca>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
diff --git a/build.gradle.kts b/build.gradle.kts
index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f78b15635 100644
index 1455ed17cd055ec97e0adbbd309edae4ac6d1204..72005a85bb8e7b516e9d96a27daca1dc426de6f3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,19 @@ java {
@@ -8,6 +8,19 @@ java {
withJavadocJar()
}
@ -30,7 +30,7 @@ index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f
dependencies {
// api dependencies are listed transitively to API consumers
api("commons-lang:commons-lang:2.6")
@@ -19,6 +32,11 @@ dependencies {
@@ -17,6 +30,11 @@ dependencies {
api("org.yaml:snakeyaml:1.28")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
api("it.unimi.dsi:fastutil:8.5.6")
@ -42,7 +42,7 @@ index 0f34457a5f18df3ba99f1168b99442d59df65e7b..50cee5c955b1a57e18f202897efa807f
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
@@ -68,10 +86,25 @@ tasks.jar {
@@ -65,10 +83,25 @@ tasks.jar {
}
tasks.withType<Javadoc> {
@ -4076,7 +4076,7 @@ index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..d5b39fb4fc16a342b5661e08df150685
/**
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 8d14d81c078d29781591e0ce96ea80338565e42b..f82f085ab9069abce10c2339446ef0d0bec8888c 100644
index c6a8a37a933cfc5a5885602a8a70fdda8fb6aa10..61441e56da69ee8cb92a2b1239f5406425a8344d 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -26,6 +26,12 @@ import org.objectweb.asm.tree.ParameterNode;

View file

@ -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 50cee5c955b1a57e18f202897efa807f78b15635..283e2aefa17fe38ab10073761db2b77ba0ae8b46 100644
index 72005a85bb8e7b516e9d96a27daca1dc426de6f3..af2f95b6c6a71b4919edb38e520292676c1cc25d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -38,6 +38,9 @@ dependencies {
@@ -36,6 +36,9 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")

View file

@ -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 283e2aefa17fe38ab10073761db2b77ba0ae8b46..0446e0131198ecd6d6d1e381eec5bbab18031b62 100644
index af2f95b6c6a71b4919edb38e520292676c1cc25d..720ba2774196f24cca6c4d1b173f90f8151c8a5e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,8 @@ dependencies {
@@ -35,6 +35,8 @@ dependencies {
apiAndDocs("net.kyori:adventure-text-serializer-gson")
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
apiAndDocs("net.kyori:adventure-text-serializer-plain")