azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: fix invalid android package name

Browse Source 
#KT-36169 fixed
This commit is contained in:
Ilya Kirillov
2020-02-18 13:13:41 +03:00
parent 2600ebb961
commit 7448b8beb0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt
+3 -2
View File
@@ -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.ir.buildsystem.FreeIR
import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter
import org.jetbrains.kotlin.tools.projectWizard.settings.JavaPackage
interface AndroidIR : GradleIR interface AndroidIR : GradleIR
//TODO parematrize //TODO parematrize
data class AndroidConfigIR(val artifactId: String) : AndroidIR, FreeIR { data class AndroidConfigIR(val javaPackage: JavaPackage) : AndroidIR, FreeIR {
override fun GradlePrinter.renderGradle() { override fun GradlePrinter.renderGradle() {
sectionCall("android", needIndent = true) { sectionCall("android", needIndent = true) {
call("compileSdkVersion") { +"29" }; nlIndented() // TODO dehardcode call("compileSdkVersion") { +"29" }; nlIndented() // TODO dehardcode
sectionCall("defaultConfig", needIndent = true) { sectionCall("defaultConfig", needIndent = true) {
assignmentOrCall("applicationId") { +artifactId.quotified }; nlIndented() assignmentOrCall("applicationId") { +javaPackage.asCodePackage().quotified }; nlIndented()
call("minSdkVersion") { +"24" }; nlIndented() // TODO dehardcode call("minSdkVersion") { +"24" }; nlIndented() // TODO dehardcode
call("targetSdkVersion") { +"29" }; nlIndented() // TODO dehardcode call("targetSdkVersion") { +"29" }; nlIndented() // TODO dehardcode
assignmentOrCall("versionCode") { +"1" }; nlIndented() assignmentOrCall("versionCode") { +"1" }; nlIndented()
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt
+1 -1
View File
@@ -59,7 +59,7 @@ object AndroidSinglePlatformModuleConfigurator : ModuleConfiguratorWithSettings(
version = null // Version is already present in the parent buildfile version = null // Version is already present in the parent buildfile
) )
+GradleOnlyPluginByNameIR("kotlin-android-extensions") +GradleOnlyPluginByNameIR("kotlin-android-extensions")
+AndroidConfigIR(configurationData.pomIr.artifactId) +AndroidConfigIR(module.javaPackage(configurationData.pomIr))
+createRepositories(configurationData).map(::RepositoryIR) +createRepositories(configurationData).map(::RepositoryIR)
} }