From 039d2f1bc2ed4ebbcfc046cfe23a27302dee0f35 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 4 Feb 2016 22:24:09 +0400 Subject: [PATCH] Rename. --- .../src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt | 4 ++-- .../plugin/java/{JavaProjectInfo.kt => JavaBuildConfig.kt} | 4 ++-- src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt | 2 +- .../kotlin/{KotlinProjectInfo.kt => KotlinBuildConfig.kt} | 4 ++-- .../kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/main/kotlin/com/beust/kobalt/plugin/java/{JavaProjectInfo.kt => JavaBuildConfig.kt} (94%) rename src/main/kotlin/com/beust/kobalt/plugin/kotlin/{KotlinProjectInfo.kt => KotlinBuildConfig.kt} (94%) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt index e16e8421..550baf34 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/ProjectInfo.kt @@ -9,7 +9,7 @@ import com.beust.kobalt.api.Project /** * Data that is useful for projects to have but should not be specified in the DSL. */ -interface IProjectInfo { +interface IBuildConfig { /** * If at least one build config was found either on the project or the variant, this function * will be used to generate the BuildConfig file with the correct language. @@ -19,7 +19,7 @@ interface IProjectInfo { } -abstract class BaseProjectInfo : IProjectInfo { +abstract class BaseBuildConfig : IBuildConfig { abstract fun generate(field: BuildConfigField) : String fun generate(type: String, name: String, value: Any) = generate(BuildConfigField(type, name, value)) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildConfig.kt similarity index 94% rename from src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt rename to src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildConfig.kt index be58a5d8..263caf88 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaBuildConfig.kt @@ -5,11 +5,11 @@ import com.beust.kobalt.api.BuildConfig import com.beust.kobalt.api.BuildConfigField import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project -import com.beust.kobalt.internal.BaseProjectInfo +import com.beust.kobalt.internal.BaseBuildConfig import com.google.inject.Singleton @Singleton -class JavaProjectInfo : BaseProjectInfo() { +class JavaBuildConfig : BaseBuildConfig() { override fun generate(field: BuildConfigField) = with(field) { " public static final $type $name = $value;" } 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 3f0d3d5b..1d78c418 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaPlugin.kt @@ -66,7 +66,7 @@ class JavaPlugin @Inject constructor(val javaCompiler: JavaCompiler) override fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String, variant: Variant, buildConfigs: List): String { - return JavaProjectInfo().generateBuildConfig(project, context, packageName, variant, buildConfigs) + return JavaBuildConfig().generateBuildConfig(project, context, packageName, variant, buildConfigs) } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildConfig.kt similarity index 94% rename from src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt rename to src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildConfig.kt index 6040796e..786aff2a 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinBuildConfig.kt @@ -5,11 +5,11 @@ import com.beust.kobalt.api.BuildConfig import com.beust.kobalt.api.BuildConfigField import com.beust.kobalt.api.KobaltContext import com.beust.kobalt.api.Project -import com.beust.kobalt.internal.BaseProjectInfo +import com.beust.kobalt.internal.BaseBuildConfig import com.google.inject.Singleton @Singleton -class KotlinProjectInfo : BaseProjectInfo() { +class KotlinBuildConfig : BaseBuildConfig() { override fun generate(field: BuildConfigField) = with(field) { " val $name : $type = $value" } 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 43dea124..3ac0e108 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinPlugin.kt @@ -131,7 +131,7 @@ class KotlinPlugin @Inject constructor(val executors: KobaltExecutors) override fun generateBuildConfig(project: Project, context: KobaltContext, packageName: String, variant: Variant, buildConfigs: List): String { - return KotlinProjectInfo().generateBuildConfig(project, context, packageName, variant, buildConfigs) + return KotlinBuildConfig().generateBuildConfig(project, context, packageName, variant, buildConfigs) } }