mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
Update build.gradle.kts.patch
* Merged Gale's
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
--- a/gale-api/build.gradle.kts
|
||||
+++ b/gale-api/build.gradle.kts
|
||||
--- a/paper-api/build.gradle.kts
|
||||
+++ b/paper-api/build.gradle.kts
|
||||
@@ -9,11 +_,13 @@
|
||||
withJavadocJar()
|
||||
}
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
// Deprecate bungeecord-chat in favor of adventure
|
||||
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
|
||||
@@ -68,29 +_,39 @@
|
||||
@@ -68,32 +_,42 @@
|
||||
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
||||
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
||||
|
||||
@@ -88,30 +88,67 @@
|
||||
+ // Leaf end - Bump Dependencies
|
||||
}
|
||||
|
||||
val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Gale - project setup
|
||||
@@ -105,17 +_,21 @@
|
||||
srcDir(generatedApiPath)
|
||||
// Gale start - project setup
|
||||
srcDir(file("../paper-api/src/main/java"))
|
||||
+ srcDir(file("../gale-api/src/main/java")) // Leaf - project setup
|
||||
}
|
||||
resources {
|
||||
srcDir(file("../paper-api/src/main/resources"))
|
||||
+ srcDir(file("../gale-api/src/main/resources")) // Leaf - project setup
|
||||
}
|
||||
}
|
||||
test {
|
||||
-val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
|
||||
+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Leaf - project setup
|
||||
idea {
|
||||
module {
|
||||
generatedSourceDirs.add(generatedApiPath.toFile())
|
||||
@@ -103,6 +_,20 @@
|
||||
main {
|
||||
java {
|
||||
srcDir(file("../paper-api/src/test/java"))
|
||||
+ srcDir(file("../gale-api/src/test/java")) // Leaf - project setup
|
||||
}
|
||||
resources {
|
||||
srcDir(file("../paper-api/src/test/resources"))
|
||||
+ srcDir(file("../gale-api/src/test/resources")) // Leaf - project setup
|
||||
// Gale end - project setup
|
||||
srcDir(generatedApiPath)
|
||||
+ // Leaf start - project setup
|
||||
+ srcDir(file("../paper-api/src/main/java"))
|
||||
+ }
|
||||
+ resources {
|
||||
+ srcDir(file("../paper-api/src/main/resources"))
|
||||
+ }
|
||||
+ }
|
||||
+ test {
|
||||
+ java {
|
||||
+ srcDir(file("../paper-api/src/test/java"))
|
||||
+ }
|
||||
+ resources {
|
||||
+ srcDir(file("../paper-api/src/test/resources"))
|
||||
+ // Leaf end - project setup
|
||||
}
|
||||
}
|
||||
@@ -203,8 +_,8 @@
|
||||
}
|
||||
@@ -140,6 +_,15 @@
|
||||
}
|
||||
}
|
||||
|
||||
+// Gale start - hide irrelevant compilation warnings
|
||||
+tasks.withType<JavaCompile> {
|
||||
+ val compilerArgs = options.compilerArgs
|
||||
+ compilerArgs.add("-Xlint:-module")
|
||||
+ compilerArgs.add("-Xlint:-removal")
|
||||
+ compilerArgs.add("-Xlint:-dep-ann")
|
||||
+ compilerArgs.add("--add-modules=jdk.incubator.vector") // Gale - Pufferfish - SIMD support
|
||||
+}
|
||||
+// Gale end - hide irrelevant compilation warnings
|
||||
val generateApiVersioningFile by tasks.registering {
|
||||
inputs.property("version", project.version)
|
||||
val pomProps = layout.buildDirectory.file("pom.properties")
|
||||
@@ -159,6 +_,12 @@
|
||||
"Automatic-Module-Name" to "org.bukkit"
|
||||
)
|
||||
}
|
||||
+
|
||||
+ // Gale start - package license into jar
|
||||
+ from("${project.projectDir}/LICENSE.txt") {
|
||||
+ into("")
|
||||
+ }
|
||||
+ // Gale end - package license into jar
|
||||
}
|
||||
|
||||
abstract class Services {
|
||||
@@ -169,12 +_,12 @@
|
||||
|
||||
tasks.withType<Javadoc> {
|
||||
val options = options as StandardJavadocDocletOptions
|
||||
- options.overview = "src/main/javadoc/overview.html"
|
||||
+ options.overview = "../paper-api/src/main/javadoc/overview.html" // Leaf - project setup
|
||||
options.use()
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
@@ -122,7 +159,7 @@
|
||||
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
|
||||
"https://javadoc.io/doc/org.joml/joml/1.10.8/",
|
||||
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
|
||||
@@ -217,8 +_,8 @@
|
||||
@@ -187,8 +_,8 @@
|
||||
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
||||
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
||||
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
||||
@@ -133,7 +170,29 @@
|
||||
)
|
||||
options.tags("apiNote:a:API Note:")
|
||||
|
||||
@@ -276,6 +_,11 @@
|
||||
@@ -202,16 +_,19 @@
|
||||
}
|
||||
|
||||
// workaround for https://github.com/gradle/gradle/issues/4046
|
||||
- inputs.dir("src/main/javadoc").withPropertyName("javadoc-sourceset")
|
||||
+ inputs.dir("../paper-api/src/main/javadoc").withPropertyName("javadoc-sourceset") // Leaf - project setup
|
||||
val fsOps = services.fileSystemOperations
|
||||
doLast {
|
||||
fsOps.copy {
|
||||
- from("src/main/javadoc") {
|
||||
+ from("../paper-api/src/main/javadoc") { // Leaf - project setup
|
||||
include("**/doc-files/**")
|
||||
}
|
||||
into("build/docs/javadoc")
|
||||
}
|
||||
}
|
||||
+
|
||||
+ options.addStringOption("Xdoclint:none", "-quiet") // Gale - hide irrelevant compilation warnings
|
||||
+ options.addStringOption("-add-modules", "jdk.incubator.vector") // Gale - Pufferfish - SIMD support
|
||||
}
|
||||
|
||||
tasks.test {
|
||||
@@ -243,6 +_,11 @@
|
||||
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
|
||||
classpath.from(configurations.compileClasspath)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user