osx shared lib updated, using temp folder

Author: efraespada

build.gradle

@@ -20,7 +20,7 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
-    testImplementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
     testCompile group: 'junit', name: 'junit', version: '4.12'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '2.1.0'
 }

src/main/kotlin/StringCare.kt

@@ -9,6 +9,18 @@ open class StringCare : Plugin<Project> {
     companion object {
         @JvmStatic
         private lateinit var absoluteProjectPath: String
+
+        internal var internalTempDir: String? = null
+        @JvmStatic
+        var tempFolder: String
+            get() = internalTempDir?: tempPath()
+            set(value) {
+                internalTempDir = value
+            }
+
+        fun resetFolder() {
+            internalTempDir = null
+        }
     }
 
     private lateinit var project: Project

src/main/kotlin/components/Execution.kt

@@ -1,8 +1,8 @@
 package components
 
+import com.google.common.io.Files
 import models.ExecutionResult
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
+import java.io.File
 import java.io.IOException
 
 fun executeWith(runtime: Runtime, command: String): ExecutionResult = execute(runtime, command)
@@ -43,7 +43,9 @@ private fun execute(runtime: Runtime, command: String): ExecutionResult {
     }
 }
 
-fun <R : Any> R.logger(): Lazy<Logger> {
-    return lazy { LoggerFactory.getLogger(this.javaClass) }
+fun tempPath(): String {
+    StringCare.tempFolder = Files.createTempDir().absolutePath
+    return StringCare.tempFolder
+
 }
 

src/main/kotlin/components/Extensions.kt

@@ -6,6 +6,8 @@ import groovy.json.StringEscapeUtils
 import models.ResourceFile
 import org.gradle.api.Project
 import org.gradle.api.Task
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 import org.w3c.dom.Document
 import org.w3c.dom.Node
 import org.xml.sax.InputSource
@@ -47,17 +49,16 @@ fun String.androidTreatment(): String {
 
 fun File.validForConfiguration(configuration: Configuration): Boolean {
     var valid = this.absolutePath.contains("${File.separator}${configuration.name}${File.separator}")
-            && !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
+
     if (valid) {
         valid = false
         configuration.srcFolders.forEach { folder ->
             if (this.absolutePath.contains(
                     "${File.separator}$folder${File.separator}".replace(
                         "${File.separator}${File.separator}",
-                        "${File.separator}"
+                        File.separator
                     )
                 )
-                && !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
             ) {
                 valid = true
             }
@@ -69,7 +70,7 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
             if (this.absolutePath.contains(
                     "${File.separator}$file".replace(
                         "${File.separator}${File.separator}",
-                        "${File.separator}"
+                        File.separator
                     )
                 )
             ) {
@@ -88,10 +89,9 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
         if (this.absolutePath.contains(
                 "${File.separator}$folder${File.separator}".replace(
                     "${File.separator}${File.separator}",
-                    "${File.separator}"
+                    File.separator
                 )
             )
-            && !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
         ) {
             sourceFolder = folder
             valid = true
@@ -103,7 +103,7 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
             if (this.absolutePath.contains(
                     "${File.separator}$file".replace(
                         "${File.separator}${File.separator}",
-                        "${File.separator}"
+                        File.separator
                     )
                 )
             ) {
@@ -140,8 +140,7 @@ fun defaultConfig(): Configuration {
 }
 
 fun ResourceFile.backup(projectPath: String): File {
-    val cleanPath = "$projectPath${File.separator}$resourceBackup${File.separator}${this.module}" +
-            "${File.separator}${this.sourceFolder}${this.file.absolutePath.split(this.sourceFolder)[1]}"
+    val cleanPath = "${StringCare.tempFolder}${File.separator}${this.module}${File.separator}${this.sourceFolder}${this.file.absolutePath.split(this.sourceFolder)[1]}"
                 .replace("${File.separator}${File.separator}", File.separator)
 
     val backupFile = File(cleanPath)
@@ -150,7 +149,7 @@ fun ResourceFile.backup(projectPath: String): File {
 }
 
 fun File.restore(projectPath: String): File {
-    val cleanPath = "$projectPath${File.separator}${this.absolutePath.split(resourceBackup)[1]}"
+    val cleanPath = "$projectPath${File.separator}${this.absolutePath.split(StringCare.tempFolder)[1]}"
         .replace("${File.separator}${File.separator}", File.separator)
 
     val restore = File(cleanPath)
@@ -235,6 +234,10 @@ fun Task.onMergeResourcesStartsVariant(): String = this.name.substring(merge.len
 fun Task.onMergeResourcesFinishVariant(): String = this.name.substring(merge.length)
     .substring(0, this.name.substring(merge.length).length - resources.length)
 
+fun <R : Any> R.logger(): Lazy<Logger> {
+    return lazy { LoggerFactory.getLogger(this.javaClass) }
+}
+
 fun Node.extractHtml(): String {
     val stringBuilder = StringBuilder()
     for (i in 0 until this.childNodes.length) {

src/main/kotlin/components/Stark.kt

@@ -46,7 +46,7 @@ open class Stark {
                             zip.getInputStream(entry).use { input ->
                                 if (entry.name == fileName) {
 
-                                    lib = File("$resourceBackup${File.separator}${entry.name}").apply {
+                                    lib = File("${StringCare.tempFolder}${File.separator}${entry.name}").apply {
                                         this.outputStream().use { output ->
                                             input.copyTo(output)
                                         }

src/main/kotlin/components/Vars.kt

@@ -12,8 +12,6 @@ internal const val winLib = "libsignKey.dll"
 internal const val osxLib = "libsignKey.dylib"
 internal const val wrapperOsX = "./gradlew"
 internal const val wrapperWindows = "gradlew.bat"
-internal const val deleteCommandOsX = "rm -rf"
-internal const val deleteCommandWindows = "RD /S /Q"
 internal const val copyCommandOsX = "cp"
 internal const val copyCommandWindows = "copy"
 internal const val emptyChar = ""

src/main/kotlin/components/XParser.kt

@@ -9,7 +9,9 @@ import java.io.File
 fun locateFiles(projectPath: String, configuration: Configuration): List<ResourceFile> = File(projectPath).walkTopDown()
     .filterIndexed { _, file ->
         file.validForConfiguration(configuration)
-    }.map { it.resourceFile(configuration)!! }.toList()
+    }.map {
+        it.resourceFile(configuration)!!
+    }.toList()
 
 fun backupFiles(projectPath: String, configuration: Configuration): List<File> {
     val resourceFiles = mutableListOf<File>()
@@ -21,13 +23,13 @@ fun backupFiles(projectPath: String, configuration: Configuration): List<File> {
 }
 
 fun restoreFiles(projectPath: String, module: String): List<File> {
-    val resourceFiles = File("$projectPath${File.separator}$resourceBackup${File.separator}$module").walkTopDown().toList()
+    val resourceFiles = File("${StringCare.tempFolder}${File.separator}$module").walkTopDown().toList()
     resourceFiles.filter { file ->
         !file.isDirectory
     }.map {
         it.restore(projectPath)
     }
-    File("$projectPath${File.separator}$resourceBackup").deleteRecursively()
+    StringCare.resetFolder()
     return resourceFiles
 }