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 bc1f41cc..3c48025f 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 @@ -60,7 +60,9 @@ class BlockExtractor(val regexp: Pattern, val opening: Char, val closing: Char) result.append(topLines.joinToString("\n")) result.append(line).append("\n") } else { - topLines.add(line) + if (! line.startsWith("import") || (line.startsWith("import") && line.contains("com.beust"))) { + topLines.add(line) + } updateCount(line) } diff --git a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt index 50ea72b0..bf829f40 100644 --- a/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt +++ b/src/main/kotlin/com/beust/kobalt/app/ParsedBuildFile.kt @@ -73,6 +73,7 @@ class ParsedBuildFile(val buildFile: BuildFile, val context: KobaltContext, val .extractBlock(buildWithCorrectProfiles) if (buildScriptInfo != null) { + kobaltLog(2, "About to compile build file\n" + buildScriptInfo.content) preBuildScript.add(buildScriptInfo.content) } else { repos.forEach { preBuildScript.add(it) }