diff --git a/src/main/kotlin/com/beust/kobalt/Plugins.kt b/src/main/kotlin/com/beust/kobalt/Plugins.kt index f00beab7..fdfe11e4 100644 --- a/src/main/kotlin/com/beust/kobalt/Plugins.kt +++ b/src/main/kotlin/com/beust/kobalt/Plugins.kt @@ -10,7 +10,7 @@ import com.beust.kobalt.maven.LocalRepo import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KobaltExecutors import com.beust.kobalt.misc.log -import com.beust.kobalt.plugin.KobaltDefaultPlugin +import com.beust.kobalt.plugin.KobaltPlugin import com.beust.kobalt.plugin.packaging.JarUtils import com.google.inject.Provider import java.lang.reflect.Method @@ -43,7 +43,7 @@ public class Plugins @Inject constructor (val taskManagerProvider : Provider = arrayListOf() - val defaultPlugin : IPlugin get() = findPlugin(KobaltDefaultPlugin.NAME)!! + val defaultPlugin : IPlugin get() = findPlugin(KobaltPlugin.PLUGIN_NAME)!! fun findPlugin(name: String) : IPlugin? = pluginMap[name] } diff --git a/src/main/kotlin/com/beust/kobalt/Variant.kt b/src/main/kotlin/com/beust/kobalt/Variant.kt index a315c7db..9adf5776 100644 --- a/src/main/kotlin/com/beust/kobalt/Variant.kt +++ b/src/main/kotlin/com/beust/kobalt/Variant.kt @@ -106,7 +106,8 @@ class Variant(val initialProductFlavor: ProductFlavorConfig? = null, val buildConfigs = findBuildConfigs(project, context.variant) if (buildConfigs.size > 0) { - val androidConfig = (Kobalt.findPlugin("android") as AndroidPlugin).configurationFor(project) + val androidConfig = (Kobalt.findPlugin(AndroidPlugin.PLUGIN_NAME) as AndroidPlugin) + .configurationFor(project) val pkg = androidConfig?.applicationId ?: project.packageName ?: project.group ?: throw KobaltException( "packageName needs to be defined on the project in order to generate BuildConfig") diff --git a/src/main/kotlin/com/beust/kobalt/plugin/KobaltDefaultPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/KobaltPlugin.kt similarity index 66% rename from src/main/kotlin/com/beust/kobalt/plugin/KobaltDefaultPlugin.kt rename to src/main/kotlin/com/beust/kobalt/plugin/KobaltPlugin.kt index 17ea3c87..f6c281a0 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/KobaltDefaultPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/KobaltPlugin.kt @@ -7,10 +7,10 @@ import javax.inject.Singleton * This plugin is used to gather tasks defined in build files, since these tasks don't really belong to any plugin. */ @Singleton -public class KobaltDefaultPlugin : BasePlugin() { +public class KobaltPlugin : BasePlugin() { companion object { - public val NAME = "Kobalt default" + public val PLUGIN_NAME = "Kobalt" } - override val name: String get() = NAME + override val name: String get() = PLUGIN_NAME } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index cb1ba00d..849a2da6 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -31,7 +31,7 @@ class AndroidConfig(var compileSdkVersion : String = "23", fun Project.android(init: AndroidConfig.() -> Unit) : AndroidConfig { val pd = AndroidConfig() pd.init() - (Kobalt.findPlugin("android") as AndroidPlugin).addConfiguration(this, pd) + (Kobalt.findPlugin(AndroidPlugin.PLUGIN_NAME) as AndroidPlugin).addConfiguration(this, pd) return pd } @@ -42,7 +42,13 @@ fun Project.android(init: AndroidConfig.() -> Unit) : AndroidConfig { public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, val merger: Merger) : ConfigPlugin(), IClasspathContributor, IRepoContributor, ICompilerFlagContributor, ICompilerInterceptor, IBuildDirectoryIncerceptor, IRunContributor { - override val name = "android" + + companion object { + const val PLUGIN_NAME = "Android" + const val TASK_GENERATE_DEX = "generateDex" + } + + override val name = PLUGIN_NAME fun isAndroid(project: Project) = configurationFor(project) != null @@ -237,10 +243,6 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v } } - companion object { - const val TASK_GENERATE_DEX = "generateDex" - } - @Task(name = TASK_GENERATE_DEX, description = "Generate the dex file", runBefore = arrayOf("assemble"), runAfter = arrayOf("compile")) fun taskGenerateDex(project: Project): TaskResult { diff --git a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt index 7b3e6de8..40a778a2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/application/ApplicationPlugin.kt @@ -27,7 +27,7 @@ class ApplicationConfig { fun Project.application(init: ApplicationConfig.() -> Unit) { ApplicationConfig().let { config -> config.init() - (Plugins.findPlugin(ApplicationPlugin.NAME) as ApplicationPlugin).addConfiguration(this, config) + (Plugins.findPlugin(ApplicationPlugin.PLUGIN_NAME) as ApplicationPlugin).addConfiguration(this, config) } } @@ -36,10 +36,10 @@ class ApplicationPlugin @Inject constructor(val executors: KobaltExecutors, val dependencyManager: DependencyManager) : ConfigPlugin(), IRunContributor { companion object { - const val NAME = "application" + const val PLUGIN_NAME = "Application" } - override val name = NAME + override val name = PLUGIN_NAME override fun apply(project: Project, context: KobaltContext) { super.apply(project, context) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt index d8b2566b..b075032a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/apt/AptPlugin.kt @@ -20,11 +20,10 @@ import javax.inject.Singleton public class AptPlugin @Inject constructor(val depFactory: DepFactory, val executors: KobaltExecutors) : ConfigPlugin(), ICompilerFlagContributor { companion object { - const val TASK_APT: String = "runApt" - const val NAME = "apt" + const val PLUGIN_NAME = "Apt" } - override val name = NAME + override val name = PLUGIN_NAME // ICompilerFlagContributor override fun flagsFor(project: Project, currentFlags: List) : List { @@ -56,13 +55,13 @@ class AptConfig(var outputDir: String = "generated/sources/apt") public fun Project.apt(init: AptConfig.() -> Unit) { AptConfig().let { it.init() - (Kobalt.findPlugin(AptPlugin.NAME) as AptPlugin).addConfiguration(this, it) + (Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addConfiguration(this, it) } } @Directive fun Dependencies.apt(vararg dep: String) { dep.forEach { - (Kobalt.findPlugin(AptPlugin.NAME) as AptPlugin).addAptDependency(this, it) + (Kobalt.findPlugin(AptPlugin.PLUGIN_NAME) as AptPlugin).addAptDependency(this, it) } } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/dokka/DokkaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/dokka/DokkaPlugin.kt index 14c8fdf8..1c107247 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/dokka/DokkaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/dokka/DokkaPlugin.kt @@ -20,7 +20,7 @@ class DokkaPlugin : ConfigsPlugin() { override val name = PLUGIN_NAME companion object { - const val PLUGIN_NAME = "dokka" + const val PLUGIN_NAME = "Dokka" } /** diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt index 930b740e..662f822d 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -22,7 +22,7 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -public class JavaPlugin @Inject constructor( +class JavaPlugin @Inject constructor( override val localRepo: LocalRepo, override val files: KFiles, override val depFactory: DepFactory, @@ -32,12 +32,13 @@ public class JavaPlugin @Inject constructor( override val jvmCompiler: JvmCompiler) : JvmCompilerPlugin(localRepo, files, depFactory, dependencyManager, executors, jvmCompiler) { companion object { - public const val TASK_COMPILE : String = "compile" - public const val TASK_JAVADOC : String = "javadoc" - public const val TASK_COMPILE_TEST: String = "compileTest" + const val PLUGIN_NAME = "Java" + const val TASK_COMPILE = "compile" + const val TASK_JAVADOC = "javadoc" + const val TASK_COMPILE_TEST = "compileTest" } - override val name = "java" + override val name = PLUGIN_NAME override fun accept(project: Project) = project is JavaProject @@ -95,13 +96,13 @@ public class JavaPlugin @Inject constructor( public fun javaProject(vararg project: Project, init: JavaProject.() -> Unit): JavaProject { return JavaProject().apply { init() - (Kobalt.findPlugin("java") as BasePlugin).addProject(this, project) + (Kobalt.findPlugin(JavaPlugin.PLUGIN_NAME) as BasePlugin).addProject(this, project) } } class JavaCompilerConfig(val project: Project) { fun args(vararg options: String) { - (Kobalt.findPlugin("java") as JvmCompilerPlugin).addCompilerArgs(project, *options) + (Kobalt.findPlugin(JavaPlugin.PLUGIN_NAME) as JvmCompilerPlugin).addCompilerArgs(project, *options) } } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt index 5a9aa9ac..0fbcc7dc 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -30,11 +30,12 @@ class KotlinPlugin @Inject constructor( IClasspathContributor { companion object { - public const val TASK_COMPILE: String = "compile" - public const val TASK_COMPILE_TEST: String = "compileTest" + const val PLUGIN_NAME = "Kotlin" + const val TASK_COMPILE: String = "compile" + const val TASK_COMPILE_TEST: String = "compileTest" } - override val name = "kotlin" + override val name = PLUGIN_NAME override fun accept(project: Project) = project is KotlinProject @@ -116,13 +117,13 @@ class KotlinPlugin @Inject constructor( fun kotlinProject(vararg project: Project, init: KotlinProject.() -> Unit): KotlinProject { return KotlinProject().apply { init() - (Kobalt.findPlugin("kotlin") as BasePlugin).addProject(this, project) + (Kobalt.findPlugin(KotlinPlugin.PLUGIN_NAME) as BasePlugin).addProject(this, project) } } class KotlinCompilerConfig(val project: Project) { fun args(vararg options: String) { - (Kobalt.findPlugin("kotlin") as JvmCompilerPlugin).addCompilerArgs(project, *options) + (Kobalt.findPlugin(KotlinPlugin.PLUGIN_NAME) as JvmCompilerPlugin).addCompilerArgs(project, *options) } } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index 16424817..e3b4cb9f 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -34,7 +34,7 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana val executors: KobaltExecutors, val localRepo: LocalRepo) : ConfigPlugin() { companion object { - const val PLUGIN_NAME = "packaging" + const val PLUGIN_NAME = "Packaging" @ExportedProjectProperty(doc = "Where the libraries are saved", type = "String") const val LIBS_DIR = "libsDir" diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt index 3a9c1987..57f8333b 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt @@ -18,9 +18,10 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P val jcenterFactory: JCenterApi.IFactory, val github: GithubApi, val localProperties: LocalProperties) : BasePlugin() { - override val name = "publish" + override val name = PLUGIN_NAME companion object { + const val PLUGIN_NAME = "Publish" private const val TASK_UPLOAD_JCENTER = "uploadJcenter" private const val TASK_UPLOAD_GITHUB = "uploadGithub" private const val TASK_GENERATE_POM = "generatePom" @@ -152,7 +153,7 @@ data class GithubConfig(val project: Project) { public fun Project.github(init: GithubConfig.() -> Unit) { with(GithubConfig(this)) { init() - (Kobalt.findPlugin("publish") as PublishPlugin).addGithubConfiguration(name, this) + (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addGithubConfiguration(name, this) } } @@ -170,6 +171,6 @@ data class JCenterConfig(val project: Project) { public fun Project.jcenter(init: JCenterConfig.() -> Unit) { with(JCenterConfig(this)) { init() - (Kobalt.findPlugin("publish") as PublishPlugin).addJCenterConfiguration(name, this) + (Kobalt.findPlugin(PublishPlugin.PLUGIN_NAME) as PublishPlugin).addJCenterConfiguration(name, this) } }