From be5a02eef1b462a8f354dad2ec158a1b4922649a Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Tue, 24 Nov 2015 22:25:23 -0800 Subject: [PATCH] Simplify. --- .../com/beust/kobalt/plugin/java/JavaProjectInfo.kt | 8 ++------ .../com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt index d1e22d06..f4c8ee07 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/java/JavaProjectInfo.kt @@ -20,12 +20,8 @@ class JavaProjectInfo : IProjectInfo { add("package $packageName;") add("") add("public class BuildConfig {") - if (variant.productFlavor != null) { - add(generate("String", "PRODUCT_FLAVOR", "\"" + variant.productFlavor.name + "\"")) - } - if (variant.buildType != null) { - add(generate("String", "BUILD_TYPE", "\"" + variant.buildType.name + "\"")) - } + add(generate("String", "PRODUCT_FLAVOR", "\"" + variant.productFlavor.name + "\"")) + add(generate("String", "BUILD_TYPE", "\"" + variant.buildType.name + "\"")) buildConfigs.forEach { it.fields.forEach { field -> add(generate(field.type, field.name, field.value)) diff --git a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt index e466a712..05389ab4 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/kotlin/KotlinProjectInfo.kt @@ -21,12 +21,8 @@ class KotlinProjectInfo : IProjectInfo { add("") add("class BuildConfig {") add(" companion object {") - if (variant.productFlavor != null) { - add(generate("String", "PRODUCT_FLAVOR", "\"" + variant.productFlavor.name + "\"")) - } - if (variant.buildType != null) { - add(generate("String", "BUILD_TYPE", "\"" + variant.buildType.name + "\"")) - } + add(generate("String", "PRODUCT_FLAVOR", "\"" + variant.productFlavor.name + "\"")) + add(generate("String", "BUILD_TYPE", "\"" + variant.buildType.name + "\"")) buildConfigs.forEach { it.fields.forEach { field -> add(generate(field.type, field.name, field.value))