From e824199169e3b3fdf8643b3555358495c380ae18 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 9 Oct 2020 22:25:57 +0300 Subject: [PATCH] Wizard: remove resolutionStrategy from settings.gradle --- .../android/expected/settings.gradle | 8 +------ .../android/expected/settings.gradle.kts | 8 +------ .../expected/settings.gradle | 8 +------ .../expected/settings.gradle.kts | 8 +------ .../expected/settings.gradle | 8 +------ .../expected/settings.gradle.kts | 8 +------ .../ir/buildsystem/PluginManagementIR.kt | 24 ------------------- .../AndroidModuleConfigurator.kt | 1 - 8 files changed, 6 insertions(+), 67 deletions(-) diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle index caa7f862278..c2ba34b285f 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle @@ -8,13 +8,7 @@ pluginManagement { url 'KOTLIN_REPO' } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == 'com.android' || requested.id.name == 'kotlin-android-extensions') { - useModule('com.android.tools.build:gradle:4.0.1') - } - } - } + } rootProject.name = 'generatedProject' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts index 4c9603298cf..79987897a9e 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/buildFileGeneration/android/expected/settings.gradle.kts @@ -8,13 +8,7 @@ pluginManagement { url = uri("KOTLIN_REPO") } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") { - useModule("com.android.tools.build:gradle:4.0.1") - } - } - } + } rootProject.name = "generatedProject" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle index 7dfaaaf8b1c..95f8b4fa050 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle @@ -8,13 +8,7 @@ pluginManagement { url 'KOTLIN_REPO' } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == 'com.android' || requested.id.name == 'kotlin-android-extensions') { - useModule('com.android.tools.build:gradle:4.0.1') - } - } - } + } rootProject.name = 'multiplatformMobileApplication' diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts index f89c1e855e3..d7a4062d2e6 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileApplication/expected/settings.gradle.kts @@ -8,13 +8,7 @@ pluginManagement { url = uri("KOTLIN_REPO") } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") { - useModule("com.android.tools.build:gradle:4.0.1") - } - } - } + } rootProject.name = "multiplatformMobileApplication" diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle index de211a61033..9a9255fb3c0 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle @@ -8,12 +8,6 @@ pluginManagement { url 'KOTLIN_REPO' } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == 'com.android' || requested.id.name == 'kotlin-android-extensions') { - useModule('com.android.tools.build:gradle:4.0.1') - } - } - } + } rootProject.name = 'multiplatformMobileLibrary' \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts index 7faa28b42a4..de596824f70 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/multiplatformMobileLibrary/expected/settings.gradle.kts @@ -8,12 +8,6 @@ pluginManagement { url = uri("KOTLIN_REPO") } } - resolutionStrategy { - eachPlugin { - if (requested.id.namespace == "com.android" || requested.id.name == "kotlin-android-extensions") { - useModule("com.android.tools.build:gradle:4.0.1") - } - } - } + } rootProject.name = "multiplatformMobileLibrary" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/PluginManagementIR.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/PluginManagementIR.kt index c4ccc99f3f6..98d3f0def70 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/PluginManagementIR.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/PluginManagementIR.kt @@ -12,30 +12,6 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version interface PluginManagementIR : GradleIR -data class AndroidResolutionStrategyIR( - val androidGradlePluginVersion: Version -) : PluginManagementIR, FreeIR, SingleIR { - override fun GradlePrinter.renderGradle() { - sectionCall("resolutionStrategy", needIndent = true) { - sectionCall("eachPlugin", needIndent = true) { - sectionCall( - "if (requested.id.namespace == ${"com.android".quotified} || requested.id.name == ${"kotlin-android-extensions".quotified})", - needIndent = true - ) { - call("useModule", forceBrackets = true) { - when (dsl) { - GradlePrinter.GradleDsl.KOTLIN -> - +"com.android.tools.build:gradle:${androidGradlePluginVersion}".quotified - GradlePrinter.GradleDsl.GROOVY -> - +"com.android.tools.build:gradle:$androidGradlePluginVersion".quotified - } - } - } - } - } - } -} - data class PluginManagementRepositoryIR(val repositoryIR: RepositoryIR) : PluginManagementIR, RepositoryWrapper { override fun GradlePrinter.renderGradle() { repositoryIR.render(this) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index 32ddd9f8e81..b59de11a3e7 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -77,7 +77,6 @@ interface AndroidModuleConfigurator : ModuleConfigurator, override fun Reader.createSettingsGradleIRs(module: Module) = buildList { +createRepositories(KotlinPlugin.version.propertyValue).map { PluginManagementRepositoryIR(RepositoryIR(it)) } - +AndroidResolutionStrategyIR(Versions.GRADLE_PLUGINS.ANDROID) } override fun createModuleIRs(