From 7448b8beb01cf4c8ba23184d27f583760b8f302c Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 18 Feb 2020 13:13:41 +0300 Subject: [PATCH] Wizard: fix invalid android package name #KT-36169 fixed --- .../tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt | 5 +++-- .../AndroidSinglePlatformModuleConfigurator.kt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt index 3fdbf4f2242..54028690fb6 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt @@ -2,16 +2,17 @@ package org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.FreeIR import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter +import org.jetbrains.kotlin.tools.projectWizard.settings.JavaPackage interface AndroidIR : GradleIR //TODO parematrize -data class AndroidConfigIR(val artifactId: String) : AndroidIR, FreeIR { +data class AndroidConfigIR(val javaPackage: JavaPackage) : AndroidIR, FreeIR { override fun GradlePrinter.renderGradle() { sectionCall("android", needIndent = true) { call("compileSdkVersion") { +"29" }; nlIndented() // TODO dehardcode sectionCall("defaultConfig", needIndent = true) { - assignmentOrCall("applicationId") { +artifactId.quotified }; nlIndented() + assignmentOrCall("applicationId") { +javaPackage.asCodePackage().quotified }; nlIndented() call("minSdkVersion") { +"24" }; nlIndented() // TODO dehardcode call("targetSdkVersion") { +"29" }; nlIndented() // TODO dehardcode assignmentOrCall("versionCode") { +"1" }; nlIndented() diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt index 5b22f26fb26..15c71fd24c4 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt @@ -59,7 +59,7 @@ object AndroidSinglePlatformModuleConfigurator : ModuleConfiguratorWithSettings( version = null // Version is already present in the parent buildfile ) +GradleOnlyPluginByNameIR("kotlin-android-extensions") - +AndroidConfigIR(configurationData.pomIr.artifactId) + +AndroidConfigIR(module.javaPackage(configurationData.pomIr)) +createRepositories(configurationData).map(::RepositoryIR) }