Skip to content

Commit 9cab01e

Browse files
committed
[ci skip] Update Gradle wrapper to 7.4
1 parent b757019 commit 9cab01e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ tasks.generateDevelopmentBundle {
103103
}
104104

105105
publishing {
106-
if (project.providers.gradleProperty("publishDevBundle").forUseAtConfigurationTime().isPresent) {
106+
if (project.providers.gradleProperty("publishDevBundle").isPresent) {
107107
publications.create<MavenPublication>("devBundle") {
108108
artifact(tasks.generateDevelopmentBundle) {
109109
artifactId = "dev-bundle"

gradle/wrapper/gradle-wrapper.jar

285 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

patches/server/0001-Setup-Gradle-project.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
2828
+/.factorypath
2929
diff --git a/build.gradle.kts b/build.gradle.kts
3030
new file mode 100644
31-
index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec98cd33ed8
31+
index 0000000000000000000000000000000000000000..ce1c653cac81f0d681547a68704a41bbb700f148
3232
--- /dev/null
3333
+++ b/build.gradle.kts
3434
@@ -0,0 +1,141 @@
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
124124
+ mainClass.set("org.bukkit.craftbukkit.Main")
125125
+ standardInput = System.`in`
126126
+ workingDir = rootProject.layout.projectDirectory
127-
+ .dir(providers.gradleProperty("paper.runWorkDir").forUseAtConfigurationTime().getOrElse("run"))
127+
+ .dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
128128
+ .asFile
129129
+ javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
130130
+
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
140140
+ systemProperty("disable.watchdog", true)
141141
+ }
142142
+
143-
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").forUseAtConfigurationTime().getOrElse("2")
143+
+ val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
144144
+ val modifiedJvmArgs = jvmArgs ?: arrayListOf()
145145
+ modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
146146
+ jvmArgs = modifiedJvmArgs

test-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies {
1010
}
1111

1212
tasks.processResources {
13-
val apiVersion = rootProject.providers.gradleProperty("mcVersion").forUseAtConfigurationTime().get()
13+
val apiVersion = rootProject.providers.gradleProperty("mcVersion").get()
1414
.split(".", "-").take(2).joinToString(".")
1515
val props = mapOf(
1616
"version" to project.version,

0 commit comments

Comments
 (0)