Enhance file restoration logic and improve task output tracking: refactor restore method to ensure backup file validation, synchronize temporary folder deletion, and enforce task outputs to be always considered out-of-date for accurate rebuilds.

Author: efraespada

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/Extensions.kt

@@ -273,15 +273,19 @@ fun File.restore(
     projectPath: String,
     tempRoot: String,
 ): File {
-    val baseTemp = Path.of(tempRoot).toAbsolutePath().normalize()
-    val current = this.toPath().toAbsolutePath().normalize()
-    val relative = baseTemp.relativize(current)
-    val restore = Path.of(projectPath).resolve(relative).normalize().toFile()
+    val baseDir = File(tempRoot).canonicalFile
+    val backupFile = this.canonicalFile
+    val prefix = baseDir.absolutePath.let { if (it.endsWith(File.separator)) it else it + File.separator }
+    require(backupFile.absolutePath.startsWith(prefix)) {
+        "Backup ${backupFile.absolutePath} is not under temp root ${baseDir.absolutePath}"
+    }
+    val relative = backupFile.absolutePath.substring(prefix.length)
+    val restore = File(projectPath, relative).normalize()
     withFileLock(restore) {
         if (restore.exists()) {
             restore.delete()
         }
-        File(restore.absolutePath).writeText(this.getContent())
+        File(restore.absolutePath).writeText(backupFile.getContent())
     }
     return restore
 }

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/services/StringCareBuildService.kt

@@ -4,6 +4,7 @@ import dev.vyp.stringcare.plugin.StringCareConfiguration
 import org.gradle.api.provider.Property
 import org.gradle.api.services.BuildService
 import org.gradle.api.services.BuildServiceParameters
+import java.io.File
 import java.util.UUID
 import java.util.concurrent.ConcurrentHashMap
 
@@ -37,7 +38,11 @@ abstract class StringCareBuildService : BuildService<StringCareBuildService.Para
     }
 
     fun resetTempFolder() {
-        tempDir = null
+        synchronized(this) {
+            val path = tempDir ?: return
+            tempDir = null
+            runCatching { File(path).deleteRecursively() }
+        }
     }
 
     fun putVariantApplicationId(

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreAssetsTask.kt

@@ -37,6 +37,7 @@ abstract class RestoreAssetsTask : DefaultTask() {
 
     init {
         skip.convention(false)
+        outputs.upToDateWhen { false }
     }
 
     @TaskAction

plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreStringsTask.kt

@@ -37,6 +37,10 @@ abstract class RestoreStringsTask : DefaultTask() {
 
     init {
         skip.convention(false)
+        // Restore rewrites sources under projectPath; Gradle has no tracked outputs here. Without this,
+        // inputs (projectPath, moduleName) never change between builds so the task can be UP-TO-DATE
+        // while sources remain obfuscated from the last ObfuscateStringsTask run.
+        outputs.upToDateWhen { false }
     }
 
     @TaskAction