From 37e676a4a6cea5b540a0a7672ab28340b5f80fd8 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Thu, 7 May 2020 01:00:51 +0300 Subject: [PATCH] Bump Gradle (6.3) and Android-build-tools (3.6.3) versions in new project wizards --- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt | 2 +- .../KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 | 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 142e97e9071..2bca672b14e 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 @@ -124,7 +124,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( } createProjectSkeleton(rootDir) if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { - setGradleWrapperToUseVersion(rootDir, "5.5.1") + setGradleWrapperToUseVersion(rootDir, "6.3") } if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty() diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 index e0fabd6de2c..8701cefc9a1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192 @@ -110,7 +110,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( } createProjectSkeleton(rootDir) if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { - setGradleWrapperToUseVersion(rootDir, "5.5.1") + setGradleWrapperToUseVersion(rootDir, "6.3") } 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 db5e2d86cd7..ad4283baaaa 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 @@ -37,7 +37,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder : ) override fun BuildScriptDataBuilder.setupAdditionalDependencies() { - addBuildscriptDependencyNotation("classpath 'com.android.tools.build:gradle:3.2.1'") + addBuildscriptDependencyNotation("classpath 'com.android.tools.build:gradle:3.6.3'") addBuildscriptRepositoriesDefinition("google()") addBuildscriptRepositoriesDefinition("jcenter()") addRepositoriesDefinition("google()")