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 61edc3a6071..a7d25070ee6 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 @@ -13,7 +13,6 @@ repositories { mavenCentral() maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } maven { url 'https://dl.bintray.com/kotlin/kotlinx' } - maven { url 'https://dl.bintray.com/kotlin/ktor' } } kotlin { 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 75eb49fc43e..32db0a3edab 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 @@ -13,7 +13,6 @@ repositories { mavenCentral() maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") } - maven { url = uri("https://dl.bintray.com/kotlin/ktor") } } kotlin { diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt index f71ce763c2f..90e87c68644 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/settings/buildsystem/Repository.kt @@ -45,7 +45,7 @@ data class JetBrainsSpace(val repository: String) : CustomMavenRepository { } object Repositories { - val KTOR_BINTRAY = BintrayRepository("kotlin/ktor") + val KTOR = DefaultRepository.MAVEN_CENTRAL val KOTLINX = BintrayRepository("kotlin/kotlinx") val KOTLIN_JS_WRAPPERS_BINTRAY = BintrayRepository("kotlin/kotlin-js-wrappers") val KOTLIN_EAP_MAVEN_CENTRAL = DefaultRepository.MAVEN_CENTRAL 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 21bdae1083e..8f3d5fa587b 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 @@ -59,7 +59,7 @@ class KtorServerTemplate : Template() { } override fun Writer.getIrsToAddToBuildFile(module: ModuleIR): List = buildList { - +RepositoryIR(Repositories.KTOR_BINTRAY) + +RepositoryIR(Repositories.KTOR) +RepositoryIR(DefaultRepository.JCENTER) +runTaskIrs(mainClass = "ServerKt") } @@ -89,7 +89,7 @@ class KtorServerTemplate : Template() { } private fun ktorArtifactDependency(@NonNls name: String, kotlinVersion: Version) = ArtifactBasedLibraryDependencyIR( - MavenArtifact(Repositories.KTOR_BINTRAY, "io.ktor", name), + MavenArtifact(Repositories.KTOR, "io.ktor", name), Versions.KTOR, DependencyType.MAIN )