azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump Gradle and Android build tools version in New Kotlin Project Templates #KT-27587 Fixed

Browse Source
This commit is contained in:
Anton Yalyshev
2019-09-24 21:25:53 +03:00
parent 626087a46e
commit ee7b583a82
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+1 -1
View File
@@ -111,7 +111,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
} }
createProjectSkeleton(rootDir) createProjectSkeleton(rootDir)
if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) {
setGradleWrapperToUseVersion(rootDir, "4.10") setGradleWrapperToUseVersion(rootDir, "5.5")
} }
if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty() if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty()
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.193
+1 -1
View File
@@ -98,7 +98,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
} }
createProjectSkeleton(rootDir) createProjectSkeleton(rootDir)
if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) { if (externalProjectSettings.distributionType == DistributionType.DEFAULT_WRAPPED) {
setGradleWrapperToUseVersion(rootDir, "4.10") setGradleWrapperToUseVersion(rootDir, "5.5")
} }
if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty() if (notImportedCommonSourceSets) GradlePropertiesFileFacade.forProject(module.project).addNotImportedCommonSourceSetsProperty()
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
+1 -1
View File
@@ -35,7 +35,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
"Multiplatform Gradle project allowing reuse of the same Kotlin code between Android and iOS mobile platforms" "Multiplatform Gradle project allowing reuse of the same Kotlin code between Android and iOS mobile platforms"
override fun BuildScriptDataBuilder.setupAdditionalDependencies() { 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("google()")
addBuildscriptRepositoriesDefinition("jcenter()") addBuildscriptRepositoriesDefinition("jcenter()")
addRepositoriesDefinition("google()") addRepositoriesDefinition("google()")