Put pom in correct location for Paperclip install to maven local feature

This commit is contained in:
Jason Penilla 2021-06-14 18:50:13 -07:00
parent 09ead8b043
commit 0c732e2ef5
No known key found for this signature in database
GPG Key ID: 0E75A301420E48F8
9 changed files with 51 additions and 17 deletions

View File

@ -1,5 +1,6 @@
plugins { plugins {
`java-library` `java-library`
`maven-publish`
} }
java { java {
@ -23,3 +24,9 @@ dependencies {
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:7.3.1") testImplementation("org.ow2.asm:asm-tree:7.3.1")
} }
configure<PublishingExtension> {
publications.create<MavenPublication>("maven") {
from(components["java"])
}
}

View File

@ -16,14 +16,15 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4
/.project /.project
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..35b57f52fcfd91cff04dc60c3a8a16b31f775fc0 index 0000000000000000000000000000000000000000..271a6672e7fe9ce51bf96c8c18f5579fc47b2414
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,59 @@ @@ -0,0 +1,66 @@
+import java.util.Locale +import java.util.Locale
+ +
+plugins { +plugins {
+ `java-library` + `java-library`
+ `maven-publish`
+} +}
+ +
+java { +java {
@ -52,6 +53,12 @@ index 0000000000000000000000000000000000000000..35b57f52fcfd91cff04dc60c3a8a16b3
+ testImplementation("org.ow2.asm:asm-tree:9.1") + testImplementation("org.ow2.asm:asm-tree:9.1")
+} +}
+ +
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ from(components["java"])
+ }
+}
+
+val generateApiVersioningFile by tasks.registering { +val generateApiVersioningFile by tasks.registering {
+ val pomProps = layout.buildDirectory.file("pom.properties") + val pomProps = layout.buildDirectory.file("pom.properties")
+ outputs.file(pomProps) + outputs.file(pomProps)

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 35b57f52fcfd91cff04dc60c3a8a16b31f775fc0..328fe3d7708b0e93dad080c7689d0d7cde138288 100644 index 271a6672e7fe9ce51bf96c8c18f5579fc47b2414..125fee17f7ab37fb2b4deb096f37a43cb9519e96 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -16,12 +16,14 @@ dependencies { @@ -17,12 +17,14 @@ dependencies {
api("com.google.code.gson:gson:2.8.0") api("com.google.code.gson:gson:2.8.0")
api("net.md-5:bungeecord-chat:1.16-R0.4") api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.29") api("org.yaml:snakeyaml:1.29")

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 Doesn't expose to plugins, just allows Paper-API to use it for optimization
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 20c8a34b299ba455c29b4e31d311de0b3a063288..6243c2fc2021e6c4fe0f036892bc83983364f360 100644 index 125fee17f7ab37fb2b4deb096f37a43cb9519e96..e4123d5f918a5f21b7f6fddba7084643f86ad5aa 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies { @@ -18,6 +18,7 @@ dependencies {
api("net.md-5:bungeecord-chat:1.16-R0.4") api("net.md-5:bungeecord-chat:1.16-R0.4")
api("org.yaml:snakeyaml:1.29") api("org.yaml:snakeyaml:1.29")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper 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> Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 6243c2fc2021e6c4fe0f036892bc83983364f360..d22f6ce80583f4a12e61b5ca89033deeeebde5d5 100644 index e4123d5f918a5f21b7f6fddba7084643f86ad5aa..176180570bf2705d975cf349faf08b5ba32cdab3 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -18,6 +18,11 @@ dependencies { @@ -19,6 +19,11 @@ dependencies {
api("org.yaml:snakeyaml:1.29") api("org.yaml:snakeyaml:1.29")
api("com.googlecode.json-simple:json-simple:1.1.1") // Paper api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
api("it.unimi.dsi:fastutil:8.2.2") api("it.unimi.dsi:fastutil:8.2.2")

View File

@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
Uses method handles for private or static methods. Uses method handles for private or static methods.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index d22f6ce80583f4a12e61b5ca89033deeeebde5d5..a5f7258a543c8a9e2ce55c6f8f1b6f3435ef608e 100644 index 176180570bf2705d975cf349faf08b5ba32cdab3..c10c9f86db276b42d8b7c21c353970691990f125 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -23,6 +23,8 @@ dependencies { @@ -24,6 +24,8 @@ dependencies {
api("net.kyori:adventure-text-serializer-gson") api("net.kyori:adventure-text-serializer-gson")
api("net.kyori:adventure-text-serializer-legacy") api("net.kyori:adventure-text-serializer-legacy")
api("net.kyori:adventure-text-serializer-plain") api("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. several layers of logging abstraction.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index a5f7258a543c8a9e2ce55c6f8f1b6f3435ef608e..12c4f278d52bd6fb626fc7cd9414e8869c49fcd2 100644 index c10c9f86db276b42d8b7c21c353970691990f125..6d04816e22f44a33c001d2b7e080402fba6af86c 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies { @@ -26,6 +26,7 @@ dependencies {
api("net.kyori:adventure-text-serializer-plain") api("net.kyori:adventure-text-serializer-plain")
api("org.ow2.asm:asm:9.0") api("org.ow2.asm:asm:9.0")
api("org.ow2.asm:asm-commons:9.0") api("org.ow2.asm:asm-commons:9.0")

View File

@ -17,11 +17,10 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..3e05459f27c4c5697ae65da504d67a6a
/.project /.project
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..21b97f37a4c4d35d80bc1c1b98f55bcfb8d21f20 index 0000000000000000000000000000000000000000..80fab4621582aed02cc029900999ceff72e027ef
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,121 @@ @@ -0,0 +1,131 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.AppendingTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer +import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import io.papermc.paperweight.util.Git +import io.papermc.paperweight.util.Git
@ -33,6 +32,7 @@ index 0000000000000000000000000000000000000000..21b97f37a4c4d35d80bc1c1b98f55bcf
+ +
+plugins { +plugins {
+ java + java
+ `maven-publish`
+ id("com.github.johnrengelman.shadow") + id("com.github.johnrengelman.shadow")
+} +}
+ +
@ -86,6 +86,16 @@ index 0000000000000000000000000000000000000000..21b97f37a4c4d35d80bc1c1b98f55bcf
+ } + }
+} +}
+ +
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ // todo: confirm this is correct
+ from(components["java"])
+ artifact(tasks.reobfJar) {
+ classifier = "reobf"
+ }
+ }
+}
+
+tasks.shadowJar { +tasks.shadowJar {
+ listOf( + listOf(
+ "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", + "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index ccb67fe90e25010f7c8ca168d60d096ef95c4429..f353524ada2caa05824b1e7ded17a1c00473d906 100644 index 80fab4621582aed02cc029900999ceff72e027ef..07be9eb1dd7f0f85e8a36cc4e8df807bae989372 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -22,21 +22,24 @@ repositories { @@ -22,21 +22,24 @@ repositories {
@ -47,9 +47,19 @@ index ccb67fe90e25010f7c8ca168d60d096ef95c4429..f353524ada2caa05824b1e7ded17a1c0
)) ))
for (tld in listOf("net", "com", "org")) { for (tld in listOf("net", "com", "org")) {
attributes(mapOf( attributes(mapOf(
@@ -65,7 +69,7 @@ tasks.jar { @@ -73,9 +77,17 @@ configure<PublishingExtension> {
}
}
+val generatePom = tasks.named<GenerateMavenPom>("generatePomFileForMavenPublication")
+
tasks.shadowJar { tasks.shadowJar {
+ // Needed for Paperclip's install to maven local feature
+ from(generatePom) {
+ into("META-INF/maven/io.papermc.paper/paper")
+ rename { "pom.xml" }
+ }
+
listOf( listOf(
- "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io", - "jline", "it.unimi", "org.apache.commons.codec", "org.apache.commons.io",
+ "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil + "jline", "org.apache.commons.codec", "org.apache.commons.io", // Paper - don't relocate fastutil