Convert task actions to lambdas; supported as of Gradle 7.6 (#929)

cashapp · Jun 8, 2023 · 2841f89 · 2841f89
1 parent a5419d5
commit 2841f89
Showing 1 changed file with 13 additions and 25 deletions.
diff --git a/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt b/paparazzi-gradle-plugin/src/main/java/app/cash/paparazzi/gradle/PaparazziPlugin.kt
@@ -21,11 +21,9 @@ import com.android.build.gradle.BaseExtension
 import com.android.build.gradle.LibraryExtension
 import com.android.build.gradle.internal.publishing.AndroidArtifacts.ArtifactType
 import com.android.build.gradle.tasks.MergeSourceSetFolders
-import org.gradle.api.Action
 import org.gradle.api.DefaultTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.artifacts.component.ProjectComponentIdentifier
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE
@@ -194,33 +192,23 @@ class PaparazziPlugin : Plugin<Project> {
         test.outputs.dir(reportOutputDir)
         test.outputs.dir(snapshotOutputDir)
 
-        @Suppress("ObjectLiteralToLambda")
-        // why not a lambda?  See: https://docs.gradle.org/7.2/userguide/validation_problems.html#implementation_unknown
-        test.doFirst(object : Action<Task> {
-          override fun execute(t: Task) {
-            // Note: these are lazy properties that are not resolvable in the Gradle configuration phase.
-            // They need special handling, so they're added as inputs.property above, and systemProperty here.
-            test.systemProperties["paparazzi.platform.data.root"] =
-              nativePlatformFileCollection.singleFile.absolutePath
-            test.systemProperties["paparazzi.test.record"] = isRecordRun.get()
-            test.systemProperties["paparazzi.test.verify"] = isVerifyRun.get()
-          }
-        })
+        test.doFirst {
+          // Note: these are lazy properties that are not resolvable in the Gradle configuration phase.
+          // They need special handling, so they're added as inputs.property above, and systemProperty here.
+          test.systemProperties["paparazzi.platform.data.root"] =
+            nativePlatformFileCollection.singleFile.absolutePath
+          test.systemProperties["paparazzi.test.record"] = isRecordRun.get()
+          test.systemProperties["paparazzi.test.verify"] = isVerifyRun.get()
+        }
+
+        test.doLast {
+          val uri = reportOutputDir.get().asFile.toPath().resolve("index.html").toUri()
+          test.logger.log(LIFECYCLE, "See the Paparazzi report at: $uri")
+        }
       }
 
       recordTaskProvider.configure { it.dependsOn(testTaskProvider) }
       verifyTaskProvider.configure { it.dependsOn(testTaskProvider) }
-
-      testTaskProvider.configure { test ->
-        @Suppress("ObjectLiteralToLambda")
-        // why not a lambda?  See: https://docs.gradle.org/7.2/userguide/validation_problems.html#implementation_unknown
-        test.doLast(object : Action<Task> {
-          override fun execute(t: Task) {
-            val uri = reportOutputDir.get().asFile.toPath().resolve("index.html").toUri()
-            test.logger.log(LIFECYCLE, "See the Paparazzi report at: $uri")
-          }
-        })
-      }
     }
   }