Skip to content

Commit d329786

Browse files
efraespadaefraespada
committed
osx shared lib updated, using temp folder
1 parent 9719d0d commit d329786

File tree

9 files changed

+102
-73
lines changed

9 files changed

+102
-73
lines changed

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repositories {
2020
dependencies {
2121
implementation gradleApi()
2222
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
23-
testImplementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
23+
implementation group: 'com.google.guava', name: 'guava', version: '28.0-jre'
2424
testCompile group: 'junit', name: 'junit', version: '4.12'
2525
testCompile group: 'org.mockito', name: 'mockito-core', version: '2.1.0'
2626
}

‎src/main/kotlin/StringCare.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ open class StringCare : Plugin<Project> {
99
companion object {
1010
@JvmStatic
1111
private lateinit var absoluteProjectPath: String
12+
13+
internal var internalTempDir: String? = null
14+
@JvmStatic
15+
var tempFolder: String
16+
get() = internalTempDir?: tempPath()
17+
set(value) {
18+
internalTempDir = value
19+
}
20+
21+
fun resetFolder() {
22+
internalTempDir = null
23+
}
1224
}
1325

1426
private lateinit var project: Project

‎src/main/kotlin/components/Execution.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package components
22

3+
import com.google.common.io.Files
34
import models.ExecutionResult
4-
import org.slf4j.Logger
5-
import org.slf4j.LoggerFactory
5+
import java.io.File
66
import java.io.IOException
77

88
fun executeWith(runtime: Runtime, command: String): ExecutionResult = execute(runtime, command)
@@ -43,7 +43,9 @@ private fun execute(runtime: Runtime, command: String): ExecutionResult {
4343
}
4444
}
4545

46-
fun <R : Any> R.logger(): Lazy<Logger> {
47-
return lazy { LoggerFactory.getLogger(this.javaClass) }
46+
fun tempPath(): String {
47+
StringCare.tempFolder = Files.createTempDir().absolutePath
48+
return StringCare.tempFolder
49+
4850
}
4951

‎src/main/kotlin/components/Extensions.kt

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import groovy.json.StringEscapeUtils
66
import models.ResourceFile
77
import org.gradle.api.Project
88
import org.gradle.api.Task
9+
import org.slf4j.Logger
10+
import org.slf4j.LoggerFactory
911
import org.w3c.dom.Document
1012
import org.w3c.dom.Node
1113
import org.xml.sax.InputSource
@@ -47,17 +49,16 @@ fun String.androidTreatment(): String {
4749

4850
fun File.validForConfiguration(configuration: Configuration): Boolean {
4951
var valid = this.absolutePath.contains("${File.separator}${configuration.name}${File.separator}")
50-
&& !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
52+
5153
if (valid) {
5254
valid = false
5355
configuration.srcFolders.forEach { folder ->
5456
if (this.absolutePath.contains(
5557
"${File.separator}$folder${File.separator}".replace(
5658
"${File.separator}${File.separator}",
57-
"${File.separator}"
59+
File.separator
5860
)
5961
)
60-
&& !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
6162
) {
6263
valid = true
6364
}
@@ -69,7 +70,7 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
6970
if (this.absolutePath.contains(
7071
"${File.separator}$file".replace(
7172
"${File.separator}${File.separator}",
72-
"${File.separator}"
73+
File.separator
7374
)
7475
)
7576
) {
@@ -88,10 +89,9 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
8889
if (this.absolutePath.contains(
8990
"${File.separator}$folder${File.separator}".replace(
9091
"${File.separator}${File.separator}",
91-
"${File.separator}"
92+
File.separator
9293
)
9394
)
94-
&& !this.absolutePath.contains("${File.separator}$resourceBackup${File.separator}")
9595
) {
9696
sourceFolder = folder
9797
valid = true
@@ -103,7 +103,7 @@ fun File.resourceFile(configuration: Configuration): ResourceFile? {
103103
if (this.absolutePath.contains(
104104
"${File.separator}$file".replace(
105105
"${File.separator}${File.separator}",
106-
"${File.separator}"
106+
File.separator
107107
)
108108
)
109109
) {
@@ -140,8 +140,7 @@ fun defaultConfig(): Configuration {
140140
}
141141

142142
fun ResourceFile.backup(projectPath: String): File {
143-
val cleanPath = "$projectPath${File.separator}$resourceBackup${File.separator}${this.module}" +
144-
"${File.separator}${this.sourceFolder}${this.file.absolutePath.split(this.sourceFolder)[1]}"
143+
val cleanPath = "${StringCare.tempFolder}${File.separator}${this.module}${File.separator}${this.sourceFolder}${this.file.absolutePath.split(this.sourceFolder)[1]}"
145144
.replace("${File.separator}${File.separator}", File.separator)
146145

147146
val backupFile = File(cleanPath)
@@ -150,7 +149,7 @@ fun ResourceFile.backup(projectPath: String): File {
150149
}
151150

152151
fun File.restore(projectPath: String): File {
153-
val cleanPath = "$projectPath${File.separator}${this.absolutePath.split(resourceBackup)[1]}"
152+
val cleanPath = "$projectPath${File.separator}${this.absolutePath.split(StringCare.tempFolder)[1]}"
154153
.replace("${File.separator}${File.separator}", File.separator)
155154

156155
val restore = File(cleanPath)
@@ -235,6 +234,10 @@ fun Task.onMergeResourcesStartsVariant(): String = this.name.substring(merge.len
235234
fun Task.onMergeResourcesFinishVariant(): String = this.name.substring(merge.length)
236235
.substring(0, this.name.substring(merge.length).length - resources.length)
237236

237+
fun <R : Any> R.logger(): Lazy<Logger> {
238+
return lazy { LoggerFactory.getLogger(this.javaClass) }
239+
}
240+
238241
fun Node.extractHtml(): String {
239242
val stringBuilder = StringBuilder()
240243
for (i in 0 until this.childNodes.length) {

‎src/main/kotlin/components/Stark.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ open class Stark {
4646
zip.getInputStream(entry).use { input ->
4747
if (entry.name == fileName) {
4848

49-
lib = File("$resourceBackup${File.separator}${entry.name}").apply {
49+
lib = File("${StringCare.tempFolder}${File.separator}${entry.name}").apply {
5050
this.outputStream().use { output ->
5151
input.copyTo(output)
5252
}

‎src/main/kotlin/components/Vars.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ internal const val winLib = "libsignKey.dll"
1212
internal const val osxLib = "libsignKey.dylib"
1313
internal const val wrapperOsX = "./gradlew"
1414
internal const val wrapperWindows = "gradlew.bat"
15-
internal const val deleteCommandOsX = "rm -rf"
16-
internal const val deleteCommandWindows = "RD /S /Q"
1715
internal const val copyCommandOsX = "cp"
1816
internal const val copyCommandWindows = "copy"
1917
internal const val emptyChar = ""

‎src/main/kotlin/components/XParser.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import java.io.File
99
fun locateFiles(projectPath: String, configuration: Configuration): List<ResourceFile> = File(projectPath).walkTopDown()
1010
.filterIndexed { _, file ->
1111
file.validForConfiguration(configuration)
12-
}.map { it.resourceFile(configuration)!! }.toList()
12+
}.map {
13+
it.resourceFile(configuration)!!
14+
}.toList()
1315

1416
fun backupFiles(projectPath: String, configuration: Configuration): List<File> {
1517
val resourceFiles = mutableListOf<File>()
@@ -21,13 +23,13 @@ fun backupFiles(projectPath: String, configuration: Configuration): List<File> {
2123
}
2224

2325
fun restoreFiles(projectPath: String, module: String): List<File> {
24-
val resourceFiles = File("$projectPath${File.separator}$resourceBackup${File.separator}$module").walkTopDown().toList()
26+
val resourceFiles = File("${StringCare.tempFolder}${File.separator}$module").walkTopDown().toList()
2527
resourceFiles.filter { file ->
2628
!file.isDirectory
2729
}.map {
2830
it.restore(projectPath)
2931
}
30-
File("$projectPath${File.separator}$resourceBackup").deleteRecursively()
32+
StringCare.resetFolder()
3133
return resourceFiles
3234
}
3335

‎src/main/kotlin/components/jni/libsignKey.dylib

-216 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)