Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 15:04:06 +01:00
Code Issues Projects Releases Wiki Activity

Bump Paperclip and fix configuration cache issue

Browse Source
This commit is contained in:
Kyle Wood 2021-11-27 21:06:16 -06:00 committed by MiniDigger | Martin
parent 8c78a82906
commit 0af80abdca
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@ -49,7 +49,7 @@ dependencies {
paramMappings("net.fabricmc:yarn:1.18-rc3+build.1:mergedv2") paramMappings("net.fabricmc:yarn:1.18-rc3+build.1:mergedv2")
remapper("net.fabricmc:tiny-remapper:0.7.0:fat") remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
decompiler("net.minecraftforge:forgeflower:1.5.498.22") decompiler("net.minecraftforge:forgeflower:1.5.498.22")
paperclip("io.papermc:paperclip:3.0.0-SNAPSHOT") paperclip("io.papermc:paperclip:3.0.1")
} }
paperweight { paperweight {

7
patches/api/0001-Convert-project-to-Gradle.patch
View File

@ -27,10 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21
+/.factorypath +/.factorypath
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..3ccff060bcb816520a27ec2f34adc977dd49ce1d index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb6a5c2768
--- /dev/null --- /dev/null
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -0,0 +1,65 @@ @@ -0,0 +1,66 @@
+plugins { +plugins {
+ `java-library` + `java-library`
+ `maven-publish` + `maven-publish`
@ -72,8 +72,9 @@ index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977
+ inputs.property("version", project.version) + inputs.property("version", project.version)
+ val pomProps = layout.buildDirectory.file("pom.properties") + val pomProps = layout.buildDirectory.file("pom.properties")
+ outputs.file(pomProps) + outputs.file(pomProps)
+ val projectVersion = project.version
+ doLast { + doLast {
+ pomProps.get().asFile.writeText("version=${project.version}") + pomProps.get().asFile.writeText("version=$projectVersion")
+ } + }
+} +}
+ +

4
patches/api/0002-Build-system-changes.patch
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 3ccff060bcb816520a27ec2f34adc977dd49ce1d..1168642d832727af2173dfcae6d132a9d44132c1 100644 index 1b16a242187079f80720fc1990ee09bb6a5c2768..b6ec62c00140a1e225e93c4b0413c0767f4ca5b8 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -15,15 +15,27 @@ dependencies { @@ -15,15 +15,27 @@ dependencies {
@ -37,7 +37,7 @@ index 3ccff060bcb816520a27ec2f34adc977dd49ce1d..1168642d832727af2173dfcae6d132a9
testImplementation("junit:junit:4.13.1") testImplementation("junit:junit:4.13.1")
testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-library:1.3")
testImplementation("org.ow2.asm:asm-tree:9.2") testImplementation("org.ow2.asm:asm-tree:9.2")
@@ -59,7 +71,7 @@ tasks.withType<Javadoc> { @@ -60,7 +72,7 @@ tasks.withType<Javadoc> {
(options as StandardJavadocDocletOptions).links( (options as StandardJavadocDocletOptions).links(
"https://guava.dev/releases/31.0.1-jre/api/docs/", "https://guava.dev/releases/31.0.1-jre/api/docs/",
"https://javadoc.io/doc/org.yaml/snakeyaml/1.28/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",

4
patches/api/0008-Adventure.patch
View File

@ -7,7 +7,7 @@ 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 a1fd76a7a7fea04a67752ff60834b566fe6f5ec5..57c216660b86a35f3e182d90c2a107563eaf5cb1 100644 index 0a202cb63769d68ecda1644cb259c17740e5b00e..c0279749aacf5735309545cd40d164676dcf75fc 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -8,6 +8,19 @@ java { @@ -8,6 +8,19 @@ java {
@ -42,7 +42,7 @@ index a1fd76a7a7fea04a67752ff60834b566fe6f5ec5..57c216660b86a35f3e182d90c2a10756
// Paper end // Paper end
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1") compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
@@ -69,10 +87,25 @@ tasks.jar { @@ -70,10 +88,25 @@ tasks.jar {
} }
tasks.withType<Javadoc> { tasks.withType<Javadoc> {