Skip to content

Commit 976ce56

Browse files
committed
v3.1
1 parent d925fb7 commit 976ce56

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
group 'com.stringcare'
9-
version '3.0'
9+
version '3.1'
1010

1111
def siteUrl = 'https://github.com/StringCare/KotlinGradlePlugin'
1212
def gitUrl = 'https://github.com/StringCare/KotlinGradlePlugin.git'

src/main/kotlin/components/Extensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fun File.validForConfiguration(configuration: Configuration): Boolean {
104104
}
105105
}
106106
if (configuration.debug && excluded().not()) {
107-
println("${if (valid) "" else "❌ not"} valid file ${this.absolutePath}")
107+
println("${if (valid) "" else " not"} valid file ${this.absolutePath}")
108108
}
109109
return valid
110110
}

src/main/kotlin/components/Tasks.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ internal fun pluginBuildTask(): String = "${when (getOs()) {
1919

2020
internal val librarySetupTask = """
2121
${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$osxLib out${File.separator}production${File.separator}classes${File.separator}$osxLib &&
22-
${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$winLib out${File.separator}production${File.separator}classes${File.separator}$winLib
22+
${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$winLib out${File.separator}production${File.separator}classes${File.separator}$winLib &&
23+
${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$osxLib build${File.separator}classes${File.separator}kotlin${File.separator}main${File.separator}$osxLib &&
24+
${copyCommand()} src${File.separator}main${File.separator}kotlin${File.separator}components${File.separator}jni${File.separator}$winLib build${File.separator}classes${File.separator}kotlin${File.separator}main${File.separator}$winLib
2325
""".trimIndent()
2426

2527
internal fun prepareTask(directory: String): String {

src/main/kotlin/components/Vars.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package components
22

33
import java.io.File
44

5-
internal const val version = "3.0"
5+
internal const val version = "3.1"
66
internal const val testProjectName = "KotlinSample"
77
internal const val defaultDebug = false
88
internal const val defaultMainModule = "app"

src/main/kotlin/components/XParser.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ import models.SAttribute
66
import models.StringEntity
77
import java.io.File
88

9-
fun locateFiles(projectPath: String, configuration: Configuration): List<ResourceFile> = File(projectPath).walkTopDown()
10-
.filterIndexed { _, file ->
11-
file.validForConfiguration(configuration.normalize())
12-
}.map {
13-
it.resourceFile(configuration.normalize())!!
14-
}.toList()
9+
fun locateFiles(projectPath: String, configuration: Configuration): List<ResourceFile> {
10+
if (configuration.debug) {
11+
println("== FILES FOUND ======================================")
12+
}
13+
return File(projectPath).walkTopDown()
14+
.filterIndexed { _, file ->
15+
file.validForConfiguration(configuration.normalize())
16+
}.map {
17+
it.resourceFile(configuration.normalize())!!
18+
}.toList()
19+
}
1520

1621
fun backupFiles(projectPath: String, configuration: Configuration): List<ResourceFile> {
1722
val files = locateFiles(projectPath, configuration.normalize())

0 commit comments

Comments
 (0)