diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle index 6aaf815129a..df75b360aaa 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle @@ -62,8 +62,8 @@ kotlin { jvmMain { dependencies { implementation kotlin('stdlib-jdk8') - implementation 'io.ktor:ktor-server-netty:1.2.6' - implementation 'io.ktor:ktor-html-builder:1.2.6' + implementation 'io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION' + implementation 'io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts index 2a094e08e8c..8d13cc6c458 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/fullStackWebApplication/build.gradle.kts @@ -62,8 +62,8 @@ kotlin { val jvmMain by getting { dependencies { implementation(kotlin("stdlib-jdk8")) - implementation("io.ktor:ktor-server-netty:1.2.6") - implementation("io.ktor:ktor-html-builder:1.2.6") + implementation("io.ktor:ktor-server-netty:1.3.2-KOTLIN_VERSION") + implementation("io.ktor:ktor-html-builder:1.3.2-KOTLIN_VERSION") implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1-KOTLIN_VERSION") } } 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 c95cbaf71d0..2262bd9284a 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 @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version object Versions { val KOTLIN = version("1.4-M1") // used as fallback version val GRADLE = version("6.3") - val KTOR = version("1.2.6") + val KTOR: (kotlinVersion: Version) -> Version = { kotlinVersion -> version("1.3.2-$kotlinVersion") } object ANDROID { val ANDROIDX_CORE_KTX = version("1.2.0") 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 8a519dcc210..b62c96b2a35 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 @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.tools.projectWizard.WizardRunConfiguration import org.jetbrains.kotlin.tools.projectWizard.core.Reader import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.ModuleKind +import org.jetbrains.kotlin.tools.projectWizard.settings.version.Version class KtorServerTemplate : Template() { override val title: String = KotlinNewProjectWizardBundle.message("module.template.ktor.server.title") @@ -40,9 +41,10 @@ class KtorServerTemplate : Template() { override fun Writer.getRequiredLibraries(module: ModuleIR): List = withSettingsOf(module.originalModule) { + val kotlinVersion = KotlinPlugin::version.propertyValue.version buildList { - +ktorArtifactDependency(serverEngine.reference.settingValue.dependencyName) - +ktorArtifactDependency("ktor-html-builder") + +ktorArtifactDependency(serverEngine.reference.settingValue.dependencyName, kotlinVersion) + +ktorArtifactDependency("ktor-html-builder", kotlinVersion) +ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version), @@ -81,9 +83,9 @@ class KtorServerTemplate : Template() { override val settings: List> = listOf(serverEngine) } -private fun ktorArtifactDependency(@NonNls name: String) = ArtifactBasedLibraryDependencyIR( +private fun ktorArtifactDependency(@NonNls name: String, kotlinVersion: Version) = ArtifactBasedLibraryDependencyIR( MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name), - Versions.KTOR, + Versions.KTOR(kotlinVersion), DependencyType.MAIN )