From 3967522c0829870d68429f1ecd8d25c49a19cf3c Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 21 Feb 2020 15:30:09 +0300 Subject: [PATCH] Wizard: fix Android minifyEnabled call for groovy --- .../android/expected/android/build.gradle | 2 +- .../tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle index b9d710a4ebb..0a169c6cf8b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/android/build.gradle @@ -29,7 +29,7 @@ android { } buildTypes { 'release' { - isMinifyEnabled false + minifyEnabled false } } } \ No newline at end of file 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 ac2964b290e..a844b21ed77 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 @@ -27,7 +27,12 @@ data class AndroidConfigIR(val javaPackage: JavaPackage?) : AndroidIR, FreeIR { GradlePrinter.GradleDsl.GROOVY -> "release".quotified } sectionCall(sectionIdentifier, needIndent = true) { - assignmentOrCall("isMinifyEnabled") { +"false" } + val minifyCallName = when (dsl) { + GradlePrinter.GradleDsl.KOTLIN -> "isMinifyEnabled" + GradlePrinter.GradleDsl.GROOVY -> "minifyEnabled" + } + + assignmentOrCall(minifyCallName) { +"false" } } } }