Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3cf03fc Fix/update wiki (#9758)
PaperMC/Paper@298c478 Fix tests that broke during the junit 5 update (#9757)
This commit is contained in:
granny
2023-09-24 16:42:20 -07:00
parent cb4586d9e0
commit e068628a9f
2 changed files with 3 additions and 3 deletions

View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.2-R0.1-SNAPSHOT version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2 mcVersion = 1.20.2
paperCommit = 5cbce366b28af1ace0b61db5afbe7dcebab7a6b0 paperCommit = 298c47857ba33c6d2e42ece4e85b3ed4143298e8
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index f1ade7432ae6fae1bceb90f975448ab43543942f..6b2cbb566dfdc2bc751a0870594b1499df7ea797 100644 index 683159586641dd9aa42ae96fa51602469755723f..ffee77918e7390c810010e057d088c2967d1e7b0 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -43,7 +43,7 @@ index f1ade7432ae6fae1bceb90f975448ab43543942f..6b2cbb566dfdc2bc751a0870594b1499
"Implementation-Vendor" to date, // Paper "Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -149,7 +157,7 @@ fun TaskContainer.registerRunTask( @@ -156,7 +164,7 @@ fun TaskContainer.registerRunTask(
name: String, name: String,
block: JavaExec.() -> Unit block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {