From 9badcae692011a36426304df0c0b4006e2845637 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 9 Apr 2020 14:56:53 +0300 Subject: [PATCH] Wizard: move some hardcoded versions to constants --- .../jetbrains/kotlin/tools/projectWizard/Versions.kt | 12 ++++++++++++ .../moduleConfigurators/AndroidModuleConfigurator.kt | 2 +- .../AndroidSinglePlatformModuleConfigurator.kt | 5 +++-- .../projectWizard/templates/KtorServerTemplate.kt | 5 +++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt index 942cd2fb815..e033be748c7 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/Versions.kt @@ -10,6 +10,18 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version object Versions { val KOTLIN = version("1.3.70") val GRADLE = version("6.3") + val KTOR = version("1.2.6") + + object ANDROID { + val ANDROIDX_CORE_CTX = version("1.1.0") + val ANDROIDX_APPCOMPAT = version("1.1.0") + val ANDROIDX_CONSTRAINTLAYOUT = version("1.1.3") + } + + object KOTLINX { + val KOTLINX_HTML = version("0.6.12") + } + object GradlePlugins { val ANDROID = version("3.5.2") 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 e720d30cdfa..cc00a36c897 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 @@ -79,7 +79,7 @@ interface AndroidModuleConfigurator : ModuleConfigurator, buildList { +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.GOOGLE, "androidx.core", "core-ktx"), - version = Version.fromString("1.1.0"), + version = Versions.ANDROID.ANDROIDX_CORE_CTX, dependencyType = DependencyType.MAIN ) } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt index 990241d49be..a7076892077 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidSinglePlatformModuleConfigurator.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact @@ -57,13 +58,13 @@ object AndroidSinglePlatformModuleConfigurator : +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.GOOGLE, "androidx.appcompat", "appcompat"), - version = Version.fromString("1.1.0"), + version = Versions.ANDROID.ANDROIDX_APPCOMPAT, dependencyType = DependencyType.MAIN ) +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.GOOGLE, "androidx.constraintlayout", "constraintlayout"), - version = Version.fromString("1.1.3"), + version = Versions.ANDROID.ANDROIDX_CONSTRAINTLAYOUT, dependencyType = DependencyType.MAIN ) } diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt index bb1cacbc0f4..d862050502b 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetTy import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.InterceptionPoint import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle +import org.jetbrains.kotlin.tools.projectWizard.Versions class KtorServerTemplate : Template() { override val title: String = KotlinNewProjectWizardBundle.message("module.template.ktor.server.title") @@ -40,7 +41,7 @@ class KtorServerTemplate : Template() { +ktorArtifactDependency("ktor-html-builder") +ArtifactBasedLibraryDependencyIR( MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), - Version.fromString("0.6.12"), + Versions.KOTLINX.KOTLINX_HTML, DependencyType.MAIN ) } @@ -74,7 +75,7 @@ class KtorServerTemplate : Template() { private fun ktorArtifactDependency(@NonNls name: String) = ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name), - Version.fromString("1.2.6"), + Versions.KTOR, DependencyType.MAIN )