[ci skip] Update Gradle wrapper to 7.4

peaches94 · Feb 21, 2022 · 9cab01e · 9cab01e
1 parent b757019
commit 9cab01e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -103,7 +103,7 @@ tasks.generateDevelopmentBundle {
 }
 
 publishing {
-    if (project.providers.gradleProperty("publishDevBundle").forUseAtConfigurationTime().isPresent) {
+    if (project.providers.gradleProperty("publishDevBundle").isPresent) {
         publications.create<MavenPublication>("devBundle") {
             artifact(tasks.generateDevelopmentBundle) {
                 artifactId = "dev-bundle"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch
@@ -28,7 +28,7 @@ index 67fb370cad6924895a6b27052dbd5c1767e3f0c9..bb338269c9e3bef4c274157c490d8b8f
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec98cd33ed8
+index 0000000000000000000000000000000000000000..ce1c653cac81f0d681547a68704a41bbb700f148
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,141 @@
@@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
 +    mainClass.set("org.bukkit.craftbukkit.Main")
 +    standardInput = System.`in`
 +    workingDir = rootProject.layout.projectDirectory
-+        .dir(providers.gradleProperty("paper.runWorkDir").forUseAtConfigurationTime().getOrElse("run"))
++        .dir(providers.gradleProperty("paper.runWorkDir").getOrElse("run"))
 +        .asFile
 +    javaLauncher.set(project.javaToolchains.defaultJavaLauncher(project))
 +
@@ -140,7 +140,7 @@ index 0000000000000000000000000000000000000000..dc8f0a7ac3387323428f71139ac07ec9
 +        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()
 +    modifiedJvmArgs.addAll(listOf("-Xms${memoryGb}G", "-Xmx${memoryGb}G"))
 +    jvmArgs = modifiedJvmArgs

diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
 }
 
 tasks.processResources {
-    val apiVersion = rootProject.providers.gradleProperty("mcVersion").forUseAtConfigurationTime().get()
+    val apiVersion = rootProject.providers.gradleProperty("mcVersion").get()
         .split(".", "-").take(2).joinToString(".")
     val props = mapOf(
         "version" to project.version,