diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IInitContributor.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IInitContributor.kt index f5dcf9ab..7cbab7ec 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IInitContributor.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/IInitContributor.kt @@ -11,7 +11,7 @@ interface IInitContributor { * The name of this archetype. This is the name that will be looked up when passed to the --init * argument. */ - val name: String + val archetypeName: String /** * Generate the files for this archetype. The parameter is the arguments that were passed to the kobaltw diff --git a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt index cc06e35f..9572f478 100644 --- a/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/app/BuildGenerator.kt @@ -15,7 +15,7 @@ abstract class BuildGenerator : IInitContributor { abstract val defaultSourceDirectories : HashSet abstract val defaultTestDirectories : HashSet abstract val directive : String - override abstract val name : String + override abstract val archetypeName: String abstract val fileMatch : (String) -> Boolean companion object { @@ -88,8 +88,8 @@ abstract class BuildGenerator : IInitContributor { put("directory", currentDir.absolutePath) put("sourceDirectories", defaultSourceDirectories) put("sourceDirectoriesTest", defaultTestDirectories) - put("imports", "import com.beust.kobalt.plugin.$name.*") - put("directive", name + "Project") + put("imports", "import com.beust.kobalt.plugin.$archetypeName.*") + put("directive", "project") } var mainDeps = arrayListOf() diff --git a/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt index 62093715..945e19e8 100644 --- a/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/app/ProjectGenerator.kt @@ -13,9 +13,9 @@ public class ProjectGenerator @Inject constructor(val pluginInfo: PluginInfo){ fun run(args: Args) { File(args.buildFile).parentFile.mkdirs() args.archetypes?.let { archetypes -> - val contributors = pluginInfo.initContributors.filter { archetypes.contains(it.name) } + val contributors = pluginInfo.initContributors.filter { archetypes.contains(it.archetypeName) } contributors.forEach { - log(2, "Running archetype ${it.name}") + log(2, "Running archetype ${it.archetypeName}") it.generateArchetype(args) } } diff --git a/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt index e2fa17fa..7fdd30be 100644 --- a/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/app/java/JavaBuildGenerator.kt @@ -6,6 +6,6 @@ public class JavaBuildGenerator: BuildGenerator() { override val defaultSourceDirectories = hashSetOf("src/main/java") override val defaultTestDirectories = hashSetOf("src/test/java") override val directive = "javaProject" - override val name = "java" + override val archetypeName = "java" override val fileMatch = { f: String -> f.endsWith(".java") } } diff --git a/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt index 4f511bba..e7e2d59c 100644 --- a/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt +++ b/src/main/kotlin/com/beust/kobalt/app/kotlin/KotlinBuildGenerator.kt @@ -6,7 +6,7 @@ public class KotlinBuildGenerator : BuildGenerator() { override val defaultSourceDirectories = hashSetOf("src/main/kotlin") override val defaultTestDirectories = hashSetOf("src/test/kotlin") override val directive = "kotlinProject" - override val name = "kotlin" + override val archetypeName = "kotlin" override val fileMatch = { f: String -> f.endsWith(".kt") } }