diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle index dc4a3e10ebd..c67e47172d7 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle @@ -10,6 +10,9 @@ repositories { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + maven { + url 'https://dl.bintray.com/kotlin/kotlinx' + } maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts index 822f74c2a9d..727cf477c5b 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/frontendApplication/build.gradle.kts @@ -10,6 +10,9 @@ repositories { maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } + maven { + url = uri("https://dl.bintray.com/kotlin/kotlinx") + } maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } 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 05e58dd2d85..6aaf815129a 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 @@ -16,6 +16,9 @@ repositories { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } + maven { + url 'https://dl.bintray.com/kotlin/kotlinx' + } maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } 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 9a3cfa583e2..2a094e08e8c 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 @@ -16,6 +16,9 @@ repositories { maven { url = uri("https://dl.bintray.com/kotlin/kotlin-dev") } + maven { + url = uri("https://dl.bintray.com/kotlin/kotlinx") + } maven { url = uri("https://dl.bintray.com/kotlin/kotlin-js-wrappers") } 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 829f7f28bda..bf142e57574 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 @@ -39,6 +39,7 @@ data class BintrayRepository(val repository: String, val base: String = "https:/ object Repositories { val KTOR_BINTRAY = BintrayRepository("kotlin/ktor") + val KOTLINX = BintrayRepository("kotlin/kotlinx") val KOTLIN_JS_WRAPPERS_BINTRAY = BintrayRepository("kotlin/kotlin-js-wrappers") val KOTLIN_EAP_BINTRAY = BintrayRepository("kotlin/kotlin-eap") val KOTLIN_DEV_BINTRAY = BintrayRepository("kotlin/kotlin-dev") 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 5e2dc444bf5..8a519dcc210 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 @@ -44,7 +44,7 @@ class KtorServerTemplate : Template() { +ktorArtifactDependency(serverEngine.reference.settingValue.dependencyName) +ktorArtifactDependency("ktor-html-builder") +ArtifactBasedLibraryDependencyIR( - MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), + MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version), DependencyType.MAIN ) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index 9f916799e8b..7c55b0564cb 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -71,7 +71,7 @@ class SimpleJsClientTemplate : Template() { override fun Writer.getRequiredLibraries(module: ModuleIR): List = withSettingsOf(module.originalModule) { buildList { +ArtifactBasedLibraryDependencyIR( - MavenArtifact(DefaultRepository.JCENTER, "org.jetbrains.kotlinx", "kotlinx-html-js"), + MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-js"), Versions.KOTLINX.KOTLINX_HTML(KotlinPlugin::version.propertyValue.version), DependencyType.MAIN )