Remove obsolete native libraries and enhance obfuscation functionality: delete libsignKey.dll and libsignKey.dylib, and refactor ObfuscateStringsUseCase and ObfuscateAssetsTask to utilize new use case classes for improved resource management. Update file handling in AParser.kt, XParser.kt, and related tasks to support project context and streamline file operations.

efraespada · efraespada · commit 865eb51df1be · 2026-03-19T18:31:39.000+01:00
diff --git a/plugin/src/main/kotlin/components/jni/libsignKey.dll b/plugin/src/main/kotlin/components/jni/libsignKey.dll
diff --git a/plugin/src/main/kotlin/components/jni/libsignKey.dylib b/plugin/src/main/kotlin/components/jni/libsignKey.dylib
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/ObfuscateAssetsUseCase.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/ObfuscateAssetsUseCase.kt
@@ -0,0 +1,24 @@
+package dev.vyp.stringcare.plugin.domain.usecases
+
+import dev.vyp.stringcare.plugin.StringCareConfiguration
+import dev.vyp.stringcare.plugin.domain.models.forEachWithBackup
+import dev.vyp.stringcare.plugin.internal.locateAssetsFiles
+import dev.vyp.stringcare.plugin.internal.obfuscateFile
+import org.gradle.api.Project
+
+/** Backs up and obfuscates configured asset files. */
+class ObfuscateAssetsUseCase {
+    fun obfuscate(
+        projectPath: String,
+        configuration: StringCareConfiguration,
+        tempRoot: String,
+        key: String,
+        project: Project? = null,
+    ): Int {
+        val files = locateAssetsFiles(projectPath, configuration, project)
+        forEachWithBackup(files, tempRoot) { asset ->
+            obfuscateFile(key, asset.file, configuration.applicationId)
+        }
+        return files.size
+    }
+}
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/ObfuscateStringsUseCase.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/ObfuscateStringsUseCase.kt
@@ -2,7 +2,11 @@ package dev.vyp.stringcare.plugin.domain.usecases
 
 import dev.vyp.stringcare.plugin.StringCareConfiguration
 import dev.vyp.stringcare.plugin.domain.models.ResourceFile
+import dev.vyp.stringcare.plugin.domain.models.forEachWithBackup
 import dev.vyp.stringcare.plugin.domain.repositories.ResourceRepository
+import dev.vyp.stringcare.plugin.internal.locateResourceFiles
+import dev.vyp.stringcare.plugin.internal.modifyXML
+import org.gradle.api.Project
 
 /** Locates string resource files that the plugin may obfuscate. */
 class ObfuscateStringsUseCase(
@@ -12,4 +16,18 @@ class ObfuscateStringsUseCase(
         projectPath: String,
         configuration: StringCareConfiguration,
     ): List<ResourceFile> = resources.locateResourceFiles(projectPath, configuration)
+
+    fun obfuscate(
+        projectPath: String,
+        configuration: StringCareConfiguration,
+        tempRoot: String,
+        key: String,
+        project: Project? = null,
+    ): Int {
+        val files = locateResourceFiles(projectPath, configuration, project)
+        forEachWithBackup(files, tempRoot) { resource ->
+            modifyXML(resource.file, key, configuration)
+        }
+        return files.size
+    }
 }
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/RestoreFilesUseCase.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/domain/usecases/RestoreFilesUseCase.kt
@@ -0,0 +1,20 @@
+package dev.vyp.stringcare.plugin.domain.usecases
+
+import dev.vyp.stringcare.plugin.internal.restoreAssetsFiles
+import dev.vyp.stringcare.plugin.internal.restoreResourceFiles
+import java.io.File
+
+/** Restores StringCare backups for resources/assets into the source tree. */
+class RestoreFilesUseCase {
+    fun restoreResources(
+        projectPath: String,
+        module: String,
+        tempRoot: String,
+    ): List<File> = restoreResourceFiles(projectPath, module, tempRoot)
+
+    fun restoreAssets(
+        projectPath: String,
+        module: String,
+        tempRoot: String,
+    ): List<File> = restoreAssetsFiles(projectPath, module, tempRoot)
+}
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/AParser.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/AParser.kt
@@ -3,16 +3,20 @@ package dev.vyp.stringcare.plugin.internal
 import dev.vyp.stringcare.plugin.StringCareConfiguration
 import dev.vyp.stringcare.plugin.StringCarePlugin
 import dev.vyp.stringcare.plugin.domain.models.AssetsFile
+import org.gradle.api.Project
 import java.io.File
 
 fun locateAssetsFiles(
     projectPath: String,
     configuration: StringCareConfiguration,
+    project: Project? = null,
 ): List<AssetsFile> =
     locateConfiguredFiles(
         projectPath = projectPath,
         configuration = configuration,
         debugHeader = "== ASSETS FILES FOUND ======================================",
+        project = project,
+        includeNames = configuration.normalize().assetsFiles,
         isValid = { file, normalized -> file.validForAssetsConfiguration(normalized) },
         mapFile = { file, normalized -> file.assetsFile(normalized) },
     )
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/ParserFileOps.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/ParserFileOps.kt
@@ -2,6 +2,7 @@ package dev.vyp.stringcare.plugin.internal
 
 import dev.vyp.stringcare.plugin.StringCareConfiguration
 import dev.vyp.stringcare.plugin.domain.models.Backupable
+import org.gradle.api.Project
 import java.io.File
 
 private fun shouldTraverse(dir: File): Boolean {
@@ -16,19 +17,37 @@ internal fun <T> locateConfiguredFiles(
     projectPath: String,
     configuration: StringCareConfiguration,
     debugHeader: String,
+    project: Project? = null,
+    includeNames: List<String>,
     isValid: (File, StringCareConfiguration) -> Boolean,
     mapFile: (File, StringCareConfiguration) -> T?,
 ): List<T> {
     if (configuration.debug) {
         println(debugHeader)
     }
     val normalized = configuration.normalize()
-    return File(projectPath)
-        .walkTopDown()
-        .onEnter(::shouldTraverse)
+    val candidateFiles =
+        when (project) {
+            null ->
+                File(projectPath)
+                    .walkTopDown()
+                    .onEnter(::shouldTraverse)
+                    .toList()
+            else ->
+                project
+                    .fileTree(projectPath) { tree ->
+                        normalized.srcFolders.ifEmpty { listOf("src/main") }.forEach { src ->
+                            includeNames.forEach { name ->
+                                tree.include("$src/**/$name")
+                            }
+                        }
+                        tree.exclude("**/build/**", "**/.gradle/**", "**/.git/**", "**/node_modules/**")
+                    }.files
+                    .toList()
+        }
+    return candidateFiles
         .filter { file -> !file.isDirectory && isValid(file, normalized) }
         .mapNotNull { file -> mapFile(file, normalized) }
-        .toList()
 }
 
 internal fun <T : Backupable> backupLocatedFiles(
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/VariantApi.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/VariantApi.kt
@@ -51,6 +51,21 @@ fun Project.registerVariantObfuscationTasks(
             t.srcFoldersJson.set(srcJson)
             t.stringFilesJson.set(strJson)
             t.assetsFilesJson.set(assetsJson)
+            val includes =
+                config.srcFolders
+                    .ifEmpty { listOf("src/main/res") }
+                    .flatMap { src ->
+                        config.stringFiles
+                            .ifEmpty { listOf("strings.xml") }
+                            .map { name -> "$src/**/$name" }
+                    }
+            t.xmlInputFiles.from(
+                fileTree(absoluteProjectPath).matching { pattern ->
+                    pattern.include(includes)
+                    pattern.exclude("**/build/**", "**/.git/**", "**/.gradle/**", "**/node_modules/**")
+                },
+            )
+            t.outputDirectory.set(layout.buildDirectory.dir("stringcare/obfuscate-strings/$variantName"))
         }
         tasks.register(
             "stringcareAfterMergeResources$variantCapitalized",
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/XParser.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/internal/XParser.kt
@@ -7,17 +7,21 @@ import dev.vyp.stringcare.plugin.domain.models.SAttribute
 import dev.vyp.stringcare.plugin.domain.models.StringEntity
 import dev.vyp.stringcare.plugin.infrastructure.parsers.XmlAttributes
 import dev.vyp.stringcare.plugin.infrastructure.parsers.XmlParser
+import org.gradle.api.Project
 import org.w3c.dom.Element
 import java.io.File
 
 fun locateResourceFiles(
     projectPath: String,
     configuration: StringCareConfiguration,
+    project: Project? = null,
 ): List<ResourceFile> =
     locateConfiguredFiles(
         projectPath = projectPath,
         configuration = configuration,
         debugHeader = "== RESOURCE FILES FOUND ======================================",
+        project = project,
+        includeNames = configuration.normalize().stringFiles.ifEmpty { listOf("strings.xml") },
         isValid = { file, normalized -> file.validForXMLConfiguration(normalized) },
         mapFile = { file, normalized -> file.resourceFile(normalized) },
     )
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/ObfuscateAssetsTask.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/ObfuscateAssetsTask.kt
@@ -1,17 +1,14 @@
 package dev.vyp.stringcare.plugin.tasks
 
 import dev.vyp.stringcare.plugin.StringCareConfiguration
+import dev.vyp.stringcare.plugin.domain.usecases.ObfuscateAssetsUseCase
 import dev.vyp.stringcare.plugin.internal.PrintUtils
 import dev.vyp.stringcare.plugin.internal.LoadResult
 import dev.vyp.stringcare.plugin.internal.Stark
 import dev.vyp.stringcare.plugin.internal.backupAssets
 import dev.vyp.stringcare.plugin.internal.fingerPrint
-import dev.vyp.stringcare.plugin.internal.getContent
-import dev.vyp.stringcare.plugin.internal.locateAssetsFiles
 import dev.vyp.stringcare.plugin.internal.obfuscateAssets
-import dev.vyp.stringcare.plugin.internal.obfuscateFile
 import dev.vyp.stringcare.plugin.internal.parseJsonStringList
-import dev.vyp.stringcare.plugin.domain.models.forEachWithBackup
 import dev.vyp.stringcare.plugin.services.StringCareBuildService
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
@@ -37,6 +34,8 @@ import org.gradle.work.DisableCachingByDefault
  * @property assetsFilesJson JSON array of asset file names/patterns to process.
  */
 abstract class ObfuscateAssetsTask : DefaultTask() {
+    private val obfuscateAssetsUseCase = ObfuscateAssetsUseCase()
+
     @get:ServiceReference("stringCareBuildService")
     abstract val stringCareService: Property<StringCareBuildService>
 
@@ -117,12 +116,7 @@ abstract class ObfuscateAssetsTask : DefaultTask() {
             }
             PrintUtils.print(moduleName.get(), "${variantName.get()}:$key")
             PrintUtils.print(moduleName.get(), backupAssets)
-            val files = locateAssetsFiles(projectPath.get(), config)
-            forEachWithBackup(files, tempRoot) { asset ->
-                if (debug.get()) PrintUtils.print(null, asset.file.getContent())
-                obfuscateFile(key, asset.file, config.applicationId)
-                if (debug.get()) PrintUtils.print(null, asset.file.getContent())
-            }
+            obfuscateAssetsUseCase.obfuscate(projectPath.get(), config, tempRoot, key, project)
             PrintUtils.print(moduleName.get(), obfuscateAssets)
         }
     }
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/ObfuscateStringsTask.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/ObfuscateStringsTask.kt
@@ -5,17 +5,22 @@ import dev.vyp.stringcare.plugin.internal.PrintUtils
 import dev.vyp.stringcare.plugin.internal.LoadResult
 import dev.vyp.stringcare.plugin.internal.Stark
 import dev.vyp.stringcare.plugin.internal.backupStringRes
+import dev.vyp.stringcare.plugin.domain.usecases.ObfuscateStringsUseCase
+import dev.vyp.stringcare.plugin.infrastructure.gradle.FileSystemResourceRepository
 import dev.vyp.stringcare.plugin.internal.fingerPrint
-import dev.vyp.stringcare.plugin.internal.locateResourceFiles
-import dev.vyp.stringcare.plugin.internal.modifyXML
 import dev.vyp.stringcare.plugin.internal.obfuscateStringRes
 import dev.vyp.stringcare.plugin.internal.parseJsonStringList
-import dev.vyp.stringcare.plugin.domain.models.forEachWithBackup
 import dev.vyp.stringcare.plugin.services.StringCareBuildService
 import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.services.ServiceReference
 import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+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.gradle.work.DisableCachingByDefault
 
@@ -36,6 +41,8 @@ import org.gradle.work.DisableCachingByDefault
  * @property assetsFilesJson JSON array of asset patterns (kept for config parity).
  */
 abstract class ObfuscateStringsTask : DefaultTask() {
+    private val obfuscateStringsUseCase = ObfuscateStringsUseCase(FileSystemResourceRepository())
+
     @get:ServiceReference("stringCareBuildService")
     abstract val stringCareService: Property<StringCareBuildService>
 
@@ -69,13 +76,23 @@ abstract class ObfuscateStringsTask : DefaultTask() {
     @get:Input
     abstract val assetsFilesJson: Property<String>
 
+    @get:InputFiles
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val xmlInputFiles: ConfigurableFileCollection
+
+    @get:OutputDirectory
+    abstract val outputDirectory: DirectoryProperty
+
     init {
         skip.convention(false)
         debug.convention(false)
         mockedFingerprint.convention("")
         srcFoldersJson.convention("[]")
         stringFilesJson.convention("[]")
         assetsFilesJson.convention("[]")
+        outputDirectory.convention(
+            project.layout.buildDirectory.dir("stringcare/obfuscate-strings/${name}"),
+        )
     }
 
     private fun configuration(): StringCareConfiguration {
@@ -95,6 +112,7 @@ abstract class ObfuscateStringsTask : DefaultTask() {
     /** Executes backup + obfuscation flow for selected string resources. */
     fun run() {
         val config = configuration()
+        outputDirectory.get().asFile.mkdirs()
         Stark.setVerboseNativeLogging(config.debug)
         if (skip.get()) {
             PrintUtils.print(moduleName.get(), "Skipping ${variantName.get()}")
@@ -116,10 +134,7 @@ abstract class ObfuscateStringsTask : DefaultTask() {
             }
             PrintUtils.print(moduleName.get(), "${variantName.get()}:$key")
             PrintUtils.print(moduleName.get(), backupStringRes)
-            val files = locateResourceFiles(projectPath.get(), config)
-            forEachWithBackup(files, tempRoot) { resource ->
-                modifyXML(resource.file, key, config)
-            }
+            obfuscateStringsUseCase.obfuscate(projectPath.get(), config, tempRoot, key, project)
         }
         PrintUtils.print(moduleName.get(), obfuscateStringRes)
     }
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreAssetsTask.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreAssetsTask.kt
@@ -1,8 +1,8 @@
 package dev.vyp.stringcare.plugin.tasks
 
+import dev.vyp.stringcare.plugin.domain.usecases.RestoreFilesUseCase
 import dev.vyp.stringcare.plugin.internal.PrintUtils
 import dev.vyp.stringcare.plugin.internal.restoreAssets
-import dev.vyp.stringcare.plugin.internal.restoreAssetsFiles
 import dev.vyp.stringcare.plugin.services.StringCareBuildService
 import org.gradle.api.DefaultTask
 import org.gradle.api.provider.Property
@@ -21,6 +21,8 @@ import org.gradle.work.DisableCachingByDefault
  * @property skip If true, task exits without side effects.
  */
 abstract class RestoreAssetsTask : DefaultTask() {
+    private val restoreFilesUseCase = RestoreFilesUseCase()
+
     @get:ServiceReference("stringCareBuildService")
     abstract val stringCareService: Property<StringCareBuildService>
 
@@ -44,7 +46,7 @@ abstract class RestoreAssetsTask : DefaultTask() {
         PrintUtils.print(moduleName.get(), restoreAssets)
         val service = stringCareService.get()
         val tempRoot = service.getOrCreateTempFolder()
-        restoreAssetsFiles(projectPath.get(), moduleName.get(), tempRoot)
+        restoreFilesUseCase.restoreAssets(projectPath.get(), moduleName.get(), tempRoot)
         service.resetTempFolder()
     }
 }
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreStringsTask.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/RestoreStringsTask.kt
@@ -1,7 +1,7 @@
 package dev.vyp.stringcare.plugin.tasks
 
+import dev.vyp.stringcare.plugin.domain.usecases.RestoreFilesUseCase
 import dev.vyp.stringcare.plugin.internal.PrintUtils
-import dev.vyp.stringcare.plugin.internal.restoreResourceFiles
 import dev.vyp.stringcare.plugin.internal.restoreStringRes
 import dev.vyp.stringcare.plugin.services.StringCareBuildService
 import org.gradle.api.DefaultTask
@@ -21,6 +21,8 @@ import org.gradle.work.DisableCachingByDefault
  * @property skip If true, task exits without side effects.
  */
 abstract class RestoreStringsTask : DefaultTask() {
+    private val restoreFilesUseCase = RestoreFilesUseCase()
+
     @get:ServiceReference("stringCareBuildService")
     abstract val stringCareService: Property<StringCareBuildService>
 
@@ -44,7 +46,7 @@ abstract class RestoreStringsTask : DefaultTask() {
         PrintUtils.print(moduleName.get(), restoreStringRes)
         val service = stringCareService.get()
         val tempRoot = service.getOrCreateTempFolder()
-        restoreResourceFiles(projectPath.get(), moduleName.get(), tempRoot)
+        restoreFilesUseCase.restoreResources(projectPath.get(), moduleName.get(), tempRoot)
         service.resetTempFolder()
     }
 }
diff --git a/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/SCPreview.kt b/plugin/src/main/kotlin/dev/vyp/stringcare/plugin/tasks/SCPreview.kt
@@ -88,7 +88,7 @@ abstract class SCPreview : DefaultTask() {
                 debug = task.debug.get()
             }
         val projectRoot = stringCareService.get().absoluteProjectPath()
-        val files = locateResourceFiles(projectRoot, configuration)
+        val files = locateResourceFiles(projectRoot, configuration, project)
         println("\tLocated files(${files.size}) for obfuscating")
         println("\tConfig (module=${configuration.name}, debug=${configuration.debug})")
         files.forEach { file ->
