Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 02:50:09 +01:00
[ci skip] Update Gradle wrapper to 7.4
Dieser Commit ist enthalten in:
Ursprung
b757019dc5
Commit
9cab01ed1d
@ -103,7 +103,7 @@ tasks.generateDevelopmentBundle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
if (project.providers.gradleProperty("publishDevBundle").forUseAtConfigurationTime().isPresent) {
|
if (project.providers.gradleProperty("publishDevBundle").isPresent) {
|
||||||
publications.create<MavenPublication>("devBundle") {
|
publications.create<MavenPublication>("devBundle") {
|
||||||
artifact(tasks.generateDevelopmentBundle) {
|
artifact(tasks.generateDevelopmentBundle) {
|
||||||
artifactId = "dev-bundle"
|
artifactId = "dev-bundle"
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binäre Datei nicht angezeigt.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
|
|||||||
+/.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..dc8f0a7ac3387323428f71139ac07ec98cd33ed8
|
index 0000000000000000000000000000000000000000..ce1c653cac81f0d681547a68704a41bbb700f148
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/build.gradle.kts
|
+++ b/build.gradle.kts
|
||||||
@@ -0,0 +1,141 @@
|
@@ -0,0 +1,141 @@
|
||||||
@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
|
|||||||
+ mainClass.set("org.bukkit.craftbukkit.Main")
|
+ mainClass.set("org.bukkit.craftbukkit.Main")
|
||||||
+ standardInput = System.`in`
|
+ standardInput = System.`in`
|
||||||
+ workingDir = rootProject.layout.projectDirectory
|
+ workingDir = rootProject.layout.projectDirectory
|
||||||
+ .dir(providers.gradleProperty("paper.runWorkDir").forUseAtConfigurationTime().getOrElse("run"))
|
+ .dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
|
||||||
+ .asFile
|
+ .asFile
|
||||||
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
|
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
|
||||||
+
|
+
|
||||||
@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
|
|||||||
+ systemProperty("disable.watchdog", true)
|
+ systemProperty("disable.watchdog", true)
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").forUseAtConfigurationTime().getOrElse("2")
|
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
|
||||||
+ val modifiedJvmArgs = jvmArgs ?: arrayListOf()
|
+ val modifiedJvmArgs = jvmArgs ?: arrayListOf()
|
||||||
+ modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
|
+ modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
|
||||||
+ jvmArgs = modifiedJvmArgs
|
+ jvmArgs = modifiedJvmArgs
|
||||||
|
@ -10,7 +10,7 @@ dependencies {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.processResources {
|
tasks.processResources {
|
||||||
val apiVersion = rootProject.providers.gradleProperty("mcVersion").forUseAtConfigurationTime().get()
|
val apiVersion = rootProject.providers.gradleProperty("mcVersion").get()
|
||||||
.split(".", "-").take(2).joinToString(".")
|
.split(".", "-").take(2).joinToString(".")
|
||||||
val props = mapOf(
|
val props = mapOf(
|
||||||
"version" to project.version,
|
"version" to project.version,
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren