1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00

Renaming.

This commit is contained in:
Cedric Beust 2016-02-27 19:25:15 -08:00
parent f47c2bc8b3
commit f3a352cf74
5 changed files with 14 additions and 11 deletions

View file

@ -13,9 +13,9 @@ import java.io.*
import java.util.* import java.util.*
/** /**
* Abstract base class for the build generators that use build.mustache. * Abstract base class for the "java" and "kotlin" templates.
*/ */
abstract class BuildGenerator : ITemplate { abstract class LanguageTemplateGenerator : ITemplate {
override val pluginName = KobaltPlugin.PLUGIN_NAME override val pluginName = KobaltPlugin.PLUGIN_NAME
abstract val defaultSourceDirectories : HashSet<String> abstract val defaultSourceDirectories : HashSet<String>

View file

@ -2,15 +2,15 @@ package com.beust.kobalt.app
import com.beust.kobalt.api.ITemplate import com.beust.kobalt.api.ITemplate
import com.beust.kobalt.api.ITemplateContributor import com.beust.kobalt.api.ITemplateContributor
import com.beust.kobalt.app.java.JavaBuildGenerator import com.beust.kobalt.app.java.JavaTemplateGenerator
import com.beust.kobalt.app.kotlin.KotlinBuildGenerator import com.beust.kobalt.app.kotlin.KotlinTemplateGenerator
import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.PluginInfo
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.common.collect.ArrayListMultimap import com.google.common.collect.ArrayListMultimap
import com.google.inject.Inject import com.google.inject.Inject
class Templates @Inject constructor() : ITemplateContributor { class Templates @Inject constructor() : ITemplateContributor {
override val templates = listOf(JavaBuildGenerator(), KotlinBuildGenerator(), IdeaFilesTemplate()) override val templates = listOf(JavaTemplateGenerator(), KotlinTemplateGenerator(), IdeaFilesTemplate())
fun list(pluginInfo: PluginInfo) { fun list(pluginInfo: PluginInfo) {
val map = ArrayListMultimap.create<String, ITemplate>() val map = ArrayListMultimap.create<String, ITemplate>()

View file

@ -1,8 +1,11 @@
package com.beust.kobalt.app.java package com.beust.kobalt.app.java
import com.beust.kobalt.app.BuildGenerator import com.beust.kobalt.app.LanguageTemplateGenerator
class JavaBuildGenerator: BuildGenerator() { /**
* Template for the "java" generator.
*/
class JavaTemplateGenerator : LanguageTemplateGenerator() {
override val defaultSourceDirectories = hashSetOf("src/main/java") override val defaultSourceDirectories = hashSetOf("src/main/java")
override val defaultTestDirectories = hashSetOf("src/test/java") override val defaultTestDirectories = hashSetOf("src/test/java")
override val directive = "project" override val directive = "project"

View file

@ -1,8 +1,8 @@
package com.beust.kobalt.app.kotlin package com.beust.kobalt.app.kotlin
import com.beust.kobalt.app.BuildGenerator import com.beust.kobalt.app.LanguageTemplateGenerator
class KotlinBuildGenerator : BuildGenerator() { class KotlinTemplateGenerator : LanguageTemplateGenerator() {
override val defaultSourceDirectories = hashSetOf("src/main/kotlin") override val defaultSourceDirectories = hashSetOf("src/main/kotlin")
override val defaultTestDirectories = hashSetOf("src/test/kotlin") override val defaultTestDirectories = hashSetOf("src/test/kotlin")
override val directive = "project" override val directive = "project"

View file

@ -3,7 +3,7 @@ package com.beust.kobalt.maven
import com.beust.kobalt.Args import com.beust.kobalt.Args
import com.beust.kobalt.KobaltTest import com.beust.kobalt.KobaltTest
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.app.BuildGenerator import com.beust.kobalt.app.LanguageTemplateGenerator
import com.beust.kobalt.app.ProjectGenerator import com.beust.kobalt.app.ProjectGenerator
import com.beust.kobalt.internal.PluginInfo import com.beust.kobalt.internal.PluginInfo
import com.google.inject.Inject import com.google.inject.Inject
@ -66,7 +66,7 @@ class PomTest @Inject constructor() : KobaltTest() {
Assert.assertTrue(contents.contains("version = \"${pom.version}\""), "Should find the version defined") Assert.assertTrue(contents.contains("version = \"${pom.version}\""), "Should find the version defined")
pom.properties.forEach { pom.properties.forEach {
Assert.assertTrue(contents.contains( Assert.assertTrue(contents.contains(
"val ${BuildGenerator.toIdentifier(it.key)} = \"${it.value}\""), "Should find the " + "val ${LanguageTemplateGenerator.toIdentifier(it.key)} = \"${it.value}\""), "Should find the " +
"property defined") "property defined")
} }
pom.repositories.forEach { pom.repositories.forEach {