Update
This commit is contained in:
@@ -3,12 +3,12 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
|
||||
|
||||
plugins {
|
||||
java // TODO java launcher tasks
|
||||
id("io.papermc.paperweight.patcher") version "2.0.0-beta.8"
|
||||
id("io.papermc.paperweight.patcher") version "2.0.0-beta.11"
|
||||
}
|
||||
|
||||
paperweight {
|
||||
upstreams.paper {
|
||||
ref = "54debf494f467a71c561cf8765c4f21725c99dd8"
|
||||
ref = providers.gradleProperty("paperRef")
|
||||
|
||||
patchFile {
|
||||
path = "paper-server/build.gradle.kts"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/paper-api/build.gradle.kts
|
||||
+++ b/paper-api/build.gradle.kts
|
||||
@@ -105,6 +_,18 @@
|
||||
@@ -103,6 +_,18 @@
|
||||
main {
|
||||
java {
|
||||
srcDir(generatedApiPath)
|
||||
@@ -19,7 +19,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -174,7 +_,7 @@
|
||||
@@ -169,7 +_,7 @@
|
||||
|
||||
tasks.withType<Javadoc> {
|
||||
val options = options as StandardJavadocDocletOptions
|
||||
@@ -28,7 +28,7 @@
|
||||
options.use()
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
@@ -212,11 +_,11 @@
|
||||
@@ -202,11 +_,11 @@
|
||||
}
|
||||
|
||||
// workaround for https://github.com/gradle/gradle/issues/4046
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/paper-server/build.gradle.kts
|
||||
+++ b/paper-server/build.gradle.kts
|
||||
@@ -20,8 +_,19 @@
|
||||
@@ -21,8 +_,19 @@
|
||||
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
|
||||
// gitFilePatches = true
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
}
|
||||
|
||||
spigot {
|
||||
@@ -104,7 +_,20 @@
|
||||
@@ -105,7 +_,20 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,11 +44,11 @@
|
||||
extendsFrom(configurations.compileClasspath.get())
|
||||
}
|
||||
@@ -123,7 +_,7 @@
|
||||
// Paper end - configure mockito agent that is needed in newer java versions
|
||||
}
|
||||
|
||||
dependencies {
|
||||
- implementation(project(":paper-api"))
|
||||
+ implementation(project(":fork-api"))
|
||||
implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency
|
||||
// Paper start
|
||||
implementation("ca.spottedleaf:concurrentutil:0.0.2")
|
||||
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
|
||||
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
group=fork.test
|
||||
version=1.21.4-R0.1-SNAPSHOT
|
||||
mcVersion=1.21.4
|
||||
paperRef=daddcf67420e92ce1eba27949f3c847a92ffab14
|
||||
|
||||
org.gradle.configuration-cache=true
|
||||
#org.gradle.caching=true
|
||||
|
||||
Reference in New Issue
Block a user