From ee7b583a8266b40928f0505da38b338de08e8b1e Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Tue, 24 Sep 2019 21:25:53 +0300 Subject: [PATCH] Bump Gradle and Android build tools version in New Kotlin Project Templates #KT-27587 Fixed --- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt | 2 +- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 | 2 +- .../KotlinGradleMobileMultiplatformModuleBuilder.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt index 28f9591bf69..409285ed1ac 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt @@ -111,7 +111,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( } createProjectSkeleton(rootDir) if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { - setGradleWrapperToUseVersion(rootDir, "4.10") + setGradleWrapperToUseVersion(rootDir, "5.5") } if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty() diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 index 1ce22284b6c..f87d3ea8063 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193 @@ -98,7 +98,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( } createProjectSkeleton(rootDir) if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { - setGradleWrapperToUseVersion(rootDir, "4.10") + setGradleWrapperToUseVersion(rootDir, "5.5") } if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty() diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt index 52301d0bc36..79f3e3e662f 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt @@ -35,7 +35,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder : "Multiplatform Gradle project allowing reuse of the same Kotlin code between Android and iOS mobile platforms" override fun BuildScriptDataBuilder.setupAdditionalDependencies() { - addBuildscriptDependencyNotation("classpath 'com.android.tools.build:gradle:3.2.0'") + addBuildscriptDependencyNotation("classpath 'com.android.tools.build:gradle:3.5.0'") addBuildscriptRepositoriesDefinition("google()") addBuildscriptRepositoriesDefinition("jcenter()") addRepositoriesDefinition("google()")