Merge remote-tracking branch 'upstream/master'

buildSrc/build.gradle.kts

@@ -25,7 +25,6 @@
 
 plugins {
     `kotlin-dsl`
-    groovy
 }
 
 repositories {
@@ -35,7 +34,6 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation(localGroovy())
     implementation(group = "net.runelite", name = "fernflower", version = "07082019")
 }
 

buildSrc/src/main/kotlin/FernflowerTask.kt

@@ -1,26 +1,43 @@
 import org.gradle.api.DefaultTask
+import org.gradle.api.tasks.CacheableTask
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputDirectory
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.jetbrains.java.decompiler.main.decompiler.ConsoleDecompiler
-import java.io.File
 
+@CacheableTask
 open class FernflowerTask: DefaultTask() {
 
+    @Input
+    @Optional
     var extraArgs: List<String>? = null
+
+    @Input
+    @Optional
     var inputJar: String? = null
+
+    @Input
+    @Optional
     var outputDir: String? = null
 
-    fun getInputJar(): File {
-        return project.file(inputJar ?: project.buildDir.toString() + "/libs/" + project.name + '-' + project.version + ".jar")
-    }
+    @InputFile
+    @PathSensitive(PathSensitivity.ABSOLUTE)
+    var getInputJar = project.file(inputJar ?: project.buildDir.toString() + "/libs/" + project.name + '-'
+    + project.version + ".jar")
+
+    @OutputDirectory
+    @PathSensitive(PathSensitivity.ABSOLUTE)
+    var getOutputDir = project.file(outputDir ?: project.buildDir.toString() + "/decompiled-sources")
 
-    fun getOutputDir(): File {
-        return project.file(outputDir ?: project.buildDir.toString() + "/decompiled-sources")
-    }
 
     @TaskAction
     fun decompile() {
-        getOutputDir().mkdirs()
-        val args = mutableListOf(getInputJar().toString(), getOutputDir().toString())
+        getOutputDir.mkdirs()
+        val args = mutableListOf(getInputJar.toString(), getOutputDir.toString())
         if (extraArgs != null) {
             args.addAll(extraArgs!!)
         }

buildSrc/src/main/resources/META-INF/gradle-plugins/fernflower.properties

@@ -1 +0,0 @@
-implementation-class=kt