From 3503405488822446fbfb378da26454d98f9fa442 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Wed, 8 Mar 2017 10:26:30 -0800 Subject: [PATCH] Allow more imports in preBuildScript. --- .../src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt index 3c48025f..922ad515 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/BlockExtractor.kt @@ -7,7 +7,6 @@ import java.util.regex.Pattern fun main(argv: Array) { val lines = File(homeDir("kotlin/kobalt/kobalt/src/Build.kt")).readLines() val result = BlockExtractor(Pattern.compile("val.*buildScript.*\\{"), '{', '}').extractBlock(lines) - // BlockExtractor("plugins", '(', ')').extractBlock(lines) } @@ -60,7 +59,9 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char) result.append(topLines.joinToString("\n")) result.append(line).append("\n") } else { - if (! line.startsWith("import") || (line.startsWith("import") && line.contains("com.beust"))) { + val allowedImports = listOf("com.beust", "java") + if (! line.startsWith("import") || + (line.startsWith("import") && allowedImports.any { line.contains(it) })) { topLines.add(line) } updateCount(line)