Upgrade Gradle to 8.3

- Remove references Project#getBuildDir

Author: DRSchlaubi

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "dev.arbjerg"
-version = "1.0.14"
+version = "1.0.15"
 
 repositories {
     mavenCentral()

example/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

example/gradle/wrapper/gradle-wrapper.properties

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

example/gradlew

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.jar

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradle/wrapper/gradle-wrapper.properties

@@ -5,7 +5,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ProjectDependency
-import org.gradle.api.file.RelativePath
 import org.gradle.api.provider.Provider
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
@@ -14,7 +13,6 @@ import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.jvm.tasks.Jar
 import org.gradle.kotlin.dsl.*
-import kotlin.io.path.div
 
 private const val lavalinkExtensionName = "lavalinkPlugin"
 
@@ -122,12 +120,12 @@ private fun Project.configureTasks(serverDependency: Provider<Dependency>) {
                     val project = dependency.dependencyProject
                     if (project.plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
                         dependsOn(project.tasks.named("jvmMainClasses"))
-                        from(project.buildDir.toPath() / "classes" / "kotlin" / "jvm" / "main") {
+                        from(project.layout.buildDirectory.file("classes/kotlin/jvm/main")) {
                             include("**/*.class")
                         }
                     } else {
                         dependsOn(project.tasks.named("classes"))
-                        from(project.buildDir.toPath() / "classes") {
+                        from(project.layout.buildDirectory.dir("classes")) {
                             include("**/main/**/*.class")
                             eachFile {
                                 path = path.substringAfter("main/")

gradlew

@@ -3,18 +3,19 @@ package dev.arbjerg.lavalink.gradle.tasks
 import dev.arbjerg.lavalink.gradle.extension
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
+import org.gradle.api.file.Directory
+import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.properties
 import org.gradle.language.base.plugins.LifecycleBasePlugin
-import java.nio.file.Path
 import java.nio.file.StandardOpenOption
 import java.util.*
 import kotlin.io.path.bufferedWriter
 import kotlin.io.path.createDirectories
 import kotlin.io.path.div
 
-internal val Project.generatedPluginManifest: Path
-    get() = project.buildDir.toPath() / "generated" / "lavalink" / "main" / "resources"
+internal val Project.generatedPluginManifest: Provider<Directory>
+    get() = project.layout.buildDirectory.dir("generated/lavalink/main/resources")
 
 abstract class GeneratePluginPropertiesTask : DefaultTask() {
 
@@ -39,7 +40,7 @@ abstract class GeneratePluginPropertiesTask : DefaultTask() {
             set("path", extension.path.get())
         }
 
-        val file = project.generatedPluginManifest / "lavalink-plugins" / "${extension.name.get()}.properties"
+        val file = project.generatedPluginManifest.get().asFile.toPath() / "lavalink-plugins" / "${extension.name.get()}.properties"
         file.parent.createDirectories()
         file.bufferedWriter(options = arrayOf(StandardOpenOption.CREATE)).use { writer ->
             properties.store(writer, null)

src/main/kotlin/LavalinkGradlePlugin.kt

@@ -2,13 +2,13 @@ package dev.arbjerg.lavalink.gradle.tasks
 
 import dev.arbjerg.lavalink.gradle.LavalinkGradlePlugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.*
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.TaskAction
-import kotlin.io.path.div
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.environment
 
 internal val Project.testServerFolder
-    get() = project.buildDir.toPath() / "lavalink-test-server-plugins"
+    get() = project.layout.buildDirectory.dir("lavalink-test-server-plugins")
 
 abstract class RunLavalinkTask : JavaExec() {
     init {
@@ -21,7 +21,7 @@ abstract class RunLavalinkTask : JavaExec() {
     override fun exec() {
         workingDir(project.rootDir)
         configureClassPath()
-        environment("lavalink.pluginsDir" to project.testServerFolder)
+        environment("lavalink.pluginsDir" to project.testServerFolder.get())
         super.exec()
     }