fix more soon-to-be-deprecated usages of DefaultTask.project at execution time

Author: dconeybe

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectExecutableLauncher.kt

@@ -17,6 +17,7 @@ package com.google.firebase.dataconnect.gradle.plugin
 
 import java.io.File
 import org.gradle.api.Task
+import org.gradle.process.ExecOperations
 
 interface DataConnectExecutableConfig {
   var outputDirectory: File?
@@ -33,6 +34,7 @@ fun Task.runDataConnectExecutable(
   dataConnectExecutable: File,
   subCommand: List<String>,
   configDirectory: File,
+  execOperations: ExecOperations,
   configure: DataConnectExecutableConfig.() -> Unit,
 ) {
   val config =
@@ -48,11 +50,11 @@ fun Task.runDataConnectExecutable(
       }
       .apply(configure)
 
-  val logFile = config.logFile?.also { project.mkdir(it.parentFile) }
+  val logFile = config.logFile?.also { it.parentFile.mkdirs() }
   val logFileStream = logFile?.outputStream()
 
   try {
-    project.exec { execSpec ->
+    execOperations.exec { execSpec ->
       execSpec.run {
         executable(dataConnectExecutable)
         isIgnoreExitValue = false

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectGenerateCodeTask.kt

@@ -83,7 +83,7 @@ abstract class DataConnectGenerateCodeTask : DefaultTask() {
 
     if (outputDirectory.exists()) {
       logger.info("Deleting directory: $outputDirectory")
-      project.delete(outputDirectory)
+      outputDirectory.deleteRecursively()
     }
 
     if (configDirectory === null) {
@@ -101,6 +101,7 @@ abstract class DataConnectGenerateCodeTask : DefaultTask() {
       dataConnectExecutable = dataConnectExecutable,
       subCommand = subCommand,
       configDirectory = configDirectory,
+      execOperations=execOperations,
     ) {
       when (dataConnectExecutableCallingConvention) {
         CallingConvention.GRADLE -> this.connectors = connectors
@@ -131,11 +132,11 @@ private fun DataConnectGenerateCodeTask.runKtfmt(
   directory: File,
   logFile: File,
 ) {
-  project.mkdir(logFile.parentFile)
+  logFile.parentFile.mkdirs()
   val logFileStream = logFile.outputStream()
 
   try {
-    project.javaexec { execSpec ->
+    execOperations.javaexec { execSpec ->
       execSpec.run {
         classpath(ktfmtJarFile)
         mainClass.set("com.facebook.ktfmt.cli.Main")

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectMergeConfigDirectoriesTask.kt

@@ -21,12 +21,14 @@ import org.gradle.api.DefaultTask
 import org.gradle.api.file.Directory
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
+import javax.inject.Inject
 
 abstract class DataConnectMergeConfigDirectoriesTask : DefaultTask() {
 
@@ -38,6 +40,8 @@ abstract class DataConnectMergeConfigDirectoriesTask : DefaultTask() {
 
   @get:OutputDirectory @get:Optional abstract val mergedDirectory: DirectoryProperty
 
+  @get:Inject abstract val fileSystemOperations: FileSystemOperations
+
   @TaskAction
   fun run() {
     val defaultConfigDirectories: List<File> =
@@ -52,14 +56,14 @@ abstract class DataConnectMergeConfigDirectoriesTask : DefaultTask() {
     logger.info(
       "defaultConfigDirectories ({}): {}",
       defaultConfigDirectories.size,
-      defaultConfigDirectories.map { it.absolutePath }.joinToString(", ")
+      defaultConfigDirectories.joinToString(", ") { it.absolutePath }
     )
     logger.info("customConfigDirectory: {}", customConfigDirectory?.absolutePath)
     logger.info("buildDirectory: {}", buildDirectory.absolutePath)
     logger.info("mergedDirectory: {}", mergedDirectory?.absolutePath)
 
     logger.info("Deleting build directory: {}", buildDirectory)
-    project.delete(buildDirectory)
+    buildDirectory.deleteRecursively()
 
     val configDirectories =
       buildList {
@@ -110,7 +114,7 @@ abstract class DataConnectMergeConfigDirectoriesTask : DefaultTask() {
       existingConfigDirectories.joinToString(", ") { it.absolutePath },
       mergedDirectory.absolutePath
     )
-    project.copy {
+    fileSystemOperations.copy {
       it.from(existingConfigDirectories)
       it.into(mergedDirectory)
       it.duplicatesStrategy = DuplicatesStrategy.FAIL

firebase-dataconnect/gradleplugin/plugin/src/main/kotlin/com/google/firebase/dataconnect/gradle/plugin/DataConnectRunEmulatorTask.kt

@@ -26,6 +26,8 @@ import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecOperations
+import javax.inject.Inject
 
 abstract class DataConnectRunEmulatorTask : DefaultTask() {
 
@@ -39,6 +41,8 @@ abstract class DataConnectRunEmulatorTask : DefaultTask() {
 
   @get:Internal abstract val buildDirectory: DirectoryProperty
 
+  @get:Inject abstract val execOperations: ExecOperations
+
   @TaskAction
   fun run() {
     val dataConnectExecutable: File = dataConnectExecutable.get().asFile
@@ -57,6 +61,7 @@ abstract class DataConnectRunEmulatorTask : DefaultTask() {
       dataConnectExecutable = dataConnectExecutable,
       subCommand = listOf("dev"),
       configDirectory = configDirectory,
+      execOperations=execOperations,
     ) {
       this.listen = "127.0.0.1:9399"
       this.localConnectionString = postgresConnectionUrl