Wizard: upgrade Gradle version to 6.3
#KT-37932 fixed
This commit is contained in:
+2
-4
@@ -71,16 +71,14 @@ enum class BuildSystem(
|
|||||||
additionalFileNames = listOf("settings.gradle.kts"),
|
additionalFileNames = listOf("settings.gradle.kts"),
|
||||||
yaml = """buildSystem:
|
yaml = """buildSystem:
|
||||||
type: GradleKotlinDsl
|
type: GradleKotlinDsl
|
||||||
gradle:
|
""".trimIndent()
|
||||||
version: 5.4.1""".trimIndent()
|
|
||||||
),
|
),
|
||||||
GRADLE_GROOVY_DSL(
|
GRADLE_GROOVY_DSL(
|
||||||
buildFileName = "build.gradle",
|
buildFileName = "build.gradle",
|
||||||
additionalFileNames = listOf("settings.gradle"),
|
additionalFileNames = listOf("settings.gradle"),
|
||||||
yaml = """buildSystem:
|
yaml = """buildSystem:
|
||||||
type: GradleGroovyDsl
|
type: GradleGroovyDsl
|
||||||
gradle:
|
""".trimIndent()
|
||||||
version: 5.4.1""".trimIndent()
|
|
||||||
),
|
),
|
||||||
MAVEN(
|
MAVEN(
|
||||||
buildFileName = "pom.xml",
|
buildFileName = "pom.xml",
|
||||||
|
|||||||
+1
@@ -9,6 +9,7 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version
|
|||||||
|
|
||||||
object Versions {
|
object Versions {
|
||||||
val KOTLIN = version("1.3.70")
|
val KOTLIN = version("1.3.70")
|
||||||
|
val GRADLE = version("6.3")
|
||||||
|
|
||||||
object GradlePlugins {
|
object GradlePlugins {
|
||||||
val ANDROID = version("3.5.2")
|
val ANDROID = version("3.5.2")
|
||||||
|
|||||||
+2
-13
@@ -1,6 +1,7 @@
|
|||||||
package org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle
|
package org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle
|
||||||
|
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.Versions
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.*
|
import org.jetbrains.kotlin.tools.projectWizard.core.*
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.reference
|
import org.jetbrains.kotlin.tools.projectWizard.core.entity.settings.reference
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.service.FileSystemWizardService
|
import org.jetbrains.kotlin.tools.projectWizard.core.service.FileSystemWizardService
|
||||||
@@ -24,13 +25,6 @@ import org.jetbrains.kotlin.tools.projectWizard.templates.FileTemplateDescriptor
|
|||||||
|
|
||||||
|
|
||||||
abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
|
abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
|
||||||
val version by versionSetting("Gradle Version", GenerationPhase.FIRST_STEP) {
|
|
||||||
defaultValue = value(defaultVersions.first())
|
|
||||||
isAvailable = isGradle
|
|
||||||
}
|
|
||||||
|
|
||||||
val gradleVersions by property<List<Version>>(emptyList())
|
|
||||||
|
|
||||||
val gradleProperties by listProperty(
|
val gradleProperties by listProperty(
|
||||||
"kotlin.code.style" to "official"
|
"kotlin.code.style" to "official"
|
||||||
)
|
)
|
||||||
@@ -94,7 +88,7 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
|
|||||||
),
|
),
|
||||||
StructurePlugin::projectPath.reference.settingValue,
|
StructurePlugin::projectPath.reference.settingValue,
|
||||||
mapOf(
|
mapOf(
|
||||||
"version" to GradlePlugin::version.reference.settingValue.toString()
|
"version" to Versions.GRADLE
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
@@ -131,11 +125,6 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
|
||||||
// TODO update default versions
|
|
||||||
private val defaultVersions = listOf("5.5.1").map(Version.Companion::fromString)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val Reader.settingsGradleBuildFileData
|
val Reader.settingsGradleBuildFileData
|
||||||
|
|||||||
Reference in New Issue
Block a user