Wizard: simplify android configuration

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle

@@ -64,13 +64,6 @@ android {
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
-    }
-    buildTypes {
-        'release' {
-            minifyEnabled false
-        }
     }
 }
 

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/shared/build.gradle.kts

@@ -58,13 +58,6 @@ android {
     defaultConfig {
         minSdkVersion(24)
         targetSdkVersion(29)
-        versionCode = 1
-        versionName = "1.0"
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
     }
 }
 

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle

@@ -62,12 +62,5 @@ android {
     defaultConfig {
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
-    }
-    buildTypes {
-        'release' {
-            minifyEnabled false
-        }
     }
 }

libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/build.gradle.kts

@@ -56,12 +56,5 @@ android {
     defaultConfig {
         minSdkVersion(24)
         targetSdkVersion(29)
-        versionCode = 1
-        versionName = "1.0"
-    }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-        }
     }
 }

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt

@@ -9,7 +9,12 @@ import java.nio.file.Path
 interface AndroidIR : GradleIR
 
 //TODO parematrize
-data class AndroidConfigIR(val javaPackage: JavaPackage?, val newManifestPath: Path?) : AndroidIR, FreeIR {
+data class AndroidConfigIR(
+    val javaPackage: JavaPackage?,
+    val newManifestPath: Path?,
+    val printVersionCode: Boolean,
+    val printBuildTypes: Boolean,
+) : AndroidIR, FreeIR {
     override fun GradlePrinter.renderGradle() {
         sectionCall("android", needIndent = true) {
             call("compileSdkVersion") { +"29" }; nlIndented() // TODO dehardcode
@@ -29,23 +34,28 @@ data class AndroidConfigIR(val javaPackage: JavaPackage?, val newManifestPath: P
                     assignmentOrCall("applicationId") { +javaPackage.asCodePackage().quotified }; nlIndented()
                 }
                 call("minSdkVersion") { +"24" }; nlIndented()  // TODO dehardcode
-                call("targetSdkVersion") { +"29" }; nlIndented() // TODO dehardcode
+                call("targetSdkVersion") { +"29" };// TODO dehardcode
-                assignmentOrCall("versionCode") { +"1" }; nlIndented()
+                if (printVersionCode) {
-                assignmentOrCall("versionName") { +"1.0".quotified }
+                    nlIndented()
-            }
+                    assignmentOrCall("versionCode") { +"1" }; nlIndented()
-            nlIndented()
+                    assignmentOrCall("versionName") { +"1.0".quotified }
-            sectionCall("buildTypes", needIndent = true) {
-                val sectionIdentifier = when (dsl) {
-                    GradlePrinter.GradleDsl.KOTLIN -> """getByName("release")"""
-                    GradlePrinter.GradleDsl.GROOVY -> "release".quotified
                 }
-                sectionCall(sectionIdentifier, needIndent = true) {
+            }
-                    val minifyCallName = when (dsl) {
+            if (printBuildTypes) {
-                        GradlePrinter.GradleDsl.KOTLIN -> "isMinifyEnabled"
+                nlIndented()
-                        GradlePrinter.GradleDsl.GROOVY -> "minifyEnabled"
+                sectionCall("buildTypes", needIndent = true) {
+                    val sectionIdentifier = when (dsl) {
+                        GradlePrinter.GradleDsl.KOTLIN -> """getByName("release")"""
+                        GradlePrinter.GradleDsl.GROOVY -> "release".quotified
                     }
+                    sectionCall(sectionIdentifier, needIndent = true) {
+                        val minifyCallName = when (dsl) {
+                            GradlePrinter.GradleDsl.KOTLIN -> "isMinifyEnabled"
+                            GradlePrinter.GradleDsl.GROOVY -> "minifyEnabled"
+                        }
 
-                    assignmentOrCall(minifyCallName) { +"false" }
+                        assignmentOrCall(minifyCallName) { +"false" }
+                    }
                 }
             }
         }

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt

@@ -70,13 +70,6 @@ interface AndroidModuleConfigurator : ModuleConfigurator,
         +GradleOnlyPluginByNameIR(reader.createAndroidPlugin(module).pluginName, priority = 1)
 
         +GradleOnlyPluginByNameIR("kotlin-android-extensions", priority = 3)
-        +AndroidConfigIR(
-            javaPackage = when (reader.createAndroidPlugin(module)) {
-                AndroidGradlePlugin.APPLICATION -> module.javaPackage(configurationData.pomIr)
-                AndroidGradlePlugin.LIBRARY -> null
-            },
-            newManifestPath = getNewAndroidManifestPath(module)
-        )
         +createRepositories(configurationData.kotlinVersion).map(::RepositoryIR)
     }
 
@@ -203,6 +196,15 @@ object AndroidTargetConfigurator : TargetConfigurator,
         buildList {
             +super<AndroidModuleConfigurator>.createBuildFileIRs(reader, configurationData, module)
             +super<ModuleConfiguratorWithTests>.createBuildFileIRs(reader, configurationData, module)
+            +AndroidConfigIR(
+                javaPackage = when (reader.createAndroidPlugin(module)) {
+                    AndroidGradlePlugin.APPLICATION -> module.javaPackage(configurationData.pomIr)
+                    AndroidGradlePlugin.LIBRARY -> null
+                },
+                newManifestPath = getNewAndroidManifestPath(module),
+                printVersionCode = false,
+                printBuildTypes = false,
+            )
         }
 
     val androidPlugin by enumSetting<AndroidGradlePlugin>(

libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt

@@ -11,10 +11,12 @@ import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
 import org.jetbrains.kotlin.tools.projectWizard.Versions
 import org.jetbrains.kotlin.tools.projectWizard.core.*
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
+import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.AndroidConfigIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.BuildScriptDependencyIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.BuildScriptRepositoryIR
 import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.irsList
 import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact
+import org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators.AndroidTargetConfigurator.createAndroidPlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle.GradlePlugin
 import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModulesToIrConversionData
 import org.jetbrains.kotlin.tools.projectWizard.plugins.templates.TemplatesPlugin
@@ -62,6 +64,19 @@ object AndroidSinglePlatformModuleConfigurator :
         }
     }
 
+    override fun createBuildFileIRs(reader: Reader, configurationData: ModulesToIrConversionData, module: Module) = irsList {
+        +super<AndroidModuleConfigurator>.createBuildFileIRs(reader, configurationData, module)
+        +AndroidConfigIR(
+            javaPackage = when (reader.createAndroidPlugin(module)) {
+                AndroidGradlePlugin.APPLICATION -> module.javaPackage(configurationData.pomIr)
+                AndroidGradlePlugin.LIBRARY -> null
+            },
+            newManifestPath = getNewAndroidManifestPath(module),
+            printVersionCode = true,
+            printBuildTypes = true,
+        )
+    }
+
     override fun createKotlinPluginIR(configurationData: ModulesToIrConversionData, module: Module): KotlinBuildSystemPluginIR? =
         KotlinBuildSystemPluginIR(
             KotlinBuildSystemPluginIR.Type.android,