erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 16:28:12 -07:00
Code Releases Activity

Variables in buildScript().

Browse source
This commit is contained in:
Cedric Beust 2017-03-07 18:27:45 -08:00
parent bdd80bdedd
commit eaf0b96d6c
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt
View file

@ -60,7 +60,9 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char)
result.append(topLines.joinToString("\n")) result.append(topLines.joinToString("\n"))
result.append(line).append("\n") result.append(line).append("\n")
} else { } else {
if (! line.startsWith("import") || (line.startsWith("import") && line.contains("com.beust"))) {
topLines.add(line) topLines.add(line)
}
updateCount(line) updateCount(line)
} }

1
src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt
View file

@ -73,6 +73,7 @@ class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val
.extractBlock(buildWithCorrectProfiles) .extractBlock(buildWithCorrectProfiles)
if (buildScriptInfo != null) { if (buildScriptInfo != null) {
kobaltLog(2, "About to compile build file\n" + buildScriptInfo.content)
preBuildScript.add(buildScriptInfo.content) preBuildScript.add(buildScriptInfo.content)
} else { } else {
repos.forEach { preBuildScript.add(it) } repos.forEach { preBuildScript.add(it) }