Wizard: move some hardcoded versions to constants
This commit is contained in:
+12
@@ -10,6 +10,18 @@ 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")
|
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 {
|
object GradlePlugins {
|
||||||
val ANDROID = version("3.5.2")
|
val ANDROID = version("3.5.2")
|
||||||
|
|||||||
+1
-1
@@ -79,7 +79,7 @@ interface AndroidModuleConfigurator : ModuleConfigurator,
|
|||||||
buildList {
|
buildList {
|
||||||
+ArtifactBasedLibraryDependencyIR(
|
+ArtifactBasedLibraryDependencyIR(
|
||||||
MavenArtifact(DefaultRepository.GOOGLE, "androidx.core", "core-ktx"),
|
MavenArtifact(DefaultRepository.GOOGLE, "androidx.core", "core-ktx"),
|
||||||
version = Version.fromString("1.1.0"),
|
version = Versions.ANDROID.ANDROIDX_CORE_CTX,
|
||||||
dependencyType = DependencyType.MAIN
|
dependencyType = DependencyType.MAIN
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.tools.projectWizard.moduleConfigurators
|
|||||||
|
|
||||||
import org.jetbrains.annotations.NonNls
|
import org.jetbrains.annotations.NonNls
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
|
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.core.*
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
|
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.*
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact
|
import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact
|
||||||
@@ -57,13 +58,13 @@ object AndroidSinglePlatformModuleConfigurator :
|
|||||||
|
|
||||||
+ArtifactBasedLibraryDependencyIR(
|
+ArtifactBasedLibraryDependencyIR(
|
||||||
MavenArtifact(DefaultRepository.GOOGLE, "androidx.appcompat", "appcompat"),
|
MavenArtifact(DefaultRepository.GOOGLE, "androidx.appcompat", "appcompat"),
|
||||||
version = Version.fromString("1.1.0"),
|
version = Versions.ANDROID.ANDROIDX_APPCOMPAT,
|
||||||
dependencyType = DependencyType.MAIN
|
dependencyType = DependencyType.MAIN
|
||||||
)
|
)
|
||||||
|
|
||||||
+ArtifactBasedLibraryDependencyIR(
|
+ArtifactBasedLibraryDependencyIR(
|
||||||
MavenArtifact(DefaultRepository.GOOGLE, "androidx.constraintlayout", "constraintlayout"),
|
MavenArtifact(DefaultRepository.GOOGLE, "androidx.constraintlayout", "constraintlayout"),
|
||||||
version = Version.fromString("1.1.3"),
|
version = Versions.ANDROID.ANDROIDX_CONSTRAINTLAYOUT,
|
||||||
dependencyType = DependencyType.MAIN
|
dependencyType = DependencyType.MAIN
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -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.settings.version.Version
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.InterceptionPoint
|
import org.jetbrains.kotlin.tools.projectWizard.transformers.interceptors.InterceptionPoint
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
|
import org.jetbrains.kotlin.tools.projectWizard.KotlinNewProjectWizardBundle
|
||||||
|
import org.jetbrains.kotlin.tools.projectWizard.Versions
|
||||||
|
|
||||||
class KtorServerTemplate : Template() {
|
class KtorServerTemplate : Template() {
|
||||||
override val title: String = KotlinNewProjectWizardBundle.message("module.template.ktor.server.title")
|
override val title: String = KotlinNewProjectWizardBundle.message("module.template.ktor.server.title")
|
||||||
@@ -40,7 +41,7 @@ class KtorServerTemplate : Template() {
|
|||||||
+ktorArtifactDependency("ktor-html-builder")
|
+ktorArtifactDependency("ktor-html-builder")
|
||||||
+ArtifactBasedLibraryDependencyIR(
|
+ArtifactBasedLibraryDependencyIR(
|
||||||
MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"),
|
MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"),
|
||||||
Version.fromString("0.6.12"),
|
Versions.KOTLINX.KOTLINX_HTML,
|
||||||
DependencyType.MAIN
|
DependencyType.MAIN
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -74,7 +75,7 @@ class KtorServerTemplate : Template() {
|
|||||||
|
|
||||||
private fun ktorArtifactDependency(@NonNls name: String) = ArtifactBasedLibraryDependencyIR(
|
private fun ktorArtifactDependency(@NonNls name: String) = ArtifactBasedLibraryDependencyIR(
|
||||||
MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name),
|
MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name),
|
||||||
Version.fromString("1.2.6"),
|
Versions.KTOR,
|
||||||
DependencyType.MAIN
|
DependencyType.MAIN
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user