Add support for Gradle Configuration Cache

Author: DRSchlaubi

build.gradle.kts

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

example/gradle.properties

@@ -0,0 +1,4 @@
+kotlin.code.style=official
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true

gradle.properties

@@ -1 +1,4 @@
 kotlin.code.style=official
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.configuration-cache=true

src/main/kotlin/tasks/DownloadLavalinkTask.kt

@@ -6,12 +6,14 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.Dependency
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskAction
 import java.nio.file.Path
+import javax.inject.Inject
 import kotlin.io.path.div
 
 internal val Project.lavalinkJar: Provider<Path>
@@ -23,6 +25,9 @@ abstract class DownloadLavalinkTask : DefaultTask() {
     @get:Internal
     internal abstract val dependencyProvider: Property<Dependency>
 
+    @get:Inject
+    abstract val fs: FileSystemOperations
+
     @Suppress("unused") // only exists for input snapshotting
     @get:Input
     val version: Provider<String>
@@ -33,10 +38,14 @@ abstract class DownloadLavalinkTask : DefaultTask() {
         outputs.dir(project.gradle.gradleUserHomeDir.toPath() / "lavalink-versions")
     }
 
+    private val configurations = project.configurations
+
+    private val lavalinkPath = project.gradle.gradleUserHomeDir.toPath() / "lavalink-versions"
+
     @TaskAction
     fun download() {
         val dependency = dependencyProvider.get()
-        val configuration = project.configurations.detachedConfiguration(dependency)
+        val configuration = configurations.detachedConfiguration(dependency)
             .markResolvable()
 
         val files = configuration.resolve()
@@ -46,9 +55,9 @@ abstract class DownloadLavalinkTask : DefaultTask() {
                     && "plain" !in it.name && "sources" !in it.name && "javadoc" !in it.name
         }
         logger.debug("Resolved lavalink binary to: {}", archive.name)
-        val path = project.gradle.gradleUserHomeDir.toPath() / "lavalink-versions" / dependency.version!!
+        val path = lavalinkPath / dependency.version!!
 
-        didWork = project.copy {
+        didWork = fs.copy {
             from(archive)
             rename { "Lavalink.jar" }
             into(path)

src/main/kotlin/tasks/GeneratePluginPropertiesTask.kt

@@ -31,16 +31,18 @@ abstract class GeneratePluginPropertiesTask : DefaultTask() {
         outputs.dir(project.generatedPluginManifest)
     }
 
+    private val extension = project.extension
+    private val generatedPluginManifest = project.generatedPluginManifest
+
     @TaskAction
     fun generateTask() {
-        val extension = project.extension
         val properties = Properties().apply {
             set("version", extension.version.get())
             set("name", extension.name.get())
             set("path", extension.path.get())
         }
 
-        val file = project.generatedPluginManifest.get().asFile.toPath() / "lavalink-plugins" / "${extension.name.get()}.properties"
+        val file = 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/tasks/RunLavalinkTask.kt

@@ -3,6 +3,7 @@ package dev.arbjerg.lavalink.gradle.tasks
 import dev.arbjerg.lavalink.gradle.LavalinkGradlePlugin
 import org.gradle.api.Project
 import org.gradle.api.tasks.JavaExec
+import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.environment
@@ -17,15 +18,19 @@ abstract class RunLavalinkTask : JavaExec() {
         outputs.upToDateWhen { false }
     }
 
+    private val workingDir = project.rootDir
+    private val testServerFolder = project.testServerFolder
+    private val lavalinkJar = project.lavalinkJar.map { project.files(it) }
+
     @TaskAction
     override fun exec() {
-        workingDir(project.rootDir)
+        workingDir(workingDir)
         configureClassPath()
-        environment("lavalink.pluginsDir" to project.testServerFolder.get())
+        environment("lavalink.pluginsDir" to testServerFolder.get())
         super.exec()
     }
 
     private fun configureClassPath() {
-        classpath += objectFactory.fileCollection().from(project.lavalinkJar.map { project.files(it) })
+        classpath += objectFactory.fileCollection().from(lavalinkJar)
     }
 }