From c868116535628b7807b5fbe546ed03d84407f8e1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 29 Mar 2021 19:28:01 +0300 Subject: [PATCH] Drop Bintray from wizards (KTI-528) --- .../fullStackWebApplication/build.gradle | 4 ++-- .../fullStackWebApplication/build.gradle.kts | 4 ++-- .../cli/KotlinVersionProviderTestWizardService.kt | 3 +-- .../tools/projectWizard/settings/buildsystem/Repository.kt | 6 +++--- .../tools/projectWizard/templates/KtorServerTemplate.kt | 2 +- .../tools/projectWizard/templates/SimpleJsClientTemplate.kt | 3 +-- 6 files changed, 10 insertions(+), 12 deletions(-) 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 d5427cb7c56..bee499a775f 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 @@ -11,8 +11,8 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { url 'https://dl.bintray.com/kotlin/kotlin-js-wrappers' } - maven { url 'https://dl.bintray.com/kotlin/kotlinx' } + maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers' } + maven { url 'https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven' } } 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 582a26fc742..b6000d516ad 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 @@ -11,8 +11,8 @@ version = "1.0-SNAPSHOT" repositories { jcenter() 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://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } + maven { url = uri("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") } } kotlin { diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt index 9c3df810f77..f3d3bd82117 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt @@ -33,8 +33,7 @@ class KotlinVersionProviderTestWizardService() : KotlinVersionProviderService(), companion object { private const val CACHE_REDIRECTOR_JETBRAINS_SPACE_URL = "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space" - val KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR = BintrayRepository("kotlin/p/kotlin/dev", CACHE_REDIRECTOR_JETBRAINS_SPACE_URL) - + val KOTLIN_DEV_BINTRAY_WITH_CACHE_REDIRECTOR = CustomMavenRepositoryImpl("kotlin/p/kotlin/dev", CACHE_REDIRECTOR_JETBRAINS_SPACE_URL) val TEST_KOTLIN_VERSION by lazy { EapVersionDownloader.getLatestEapVersion()!! 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 61b75380f8b..479782121f8 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 @@ -30,7 +30,7 @@ data class DefaultRepository(val type: Type) : Repository { interface CustomMavenRepository : Repository -data class BintrayRepository(val repository: String, val base: String = "https://dl.bintray.com") : CustomMavenRepository { +data class CustomMavenRepositoryImpl(val repository: String, val base: String) : CustomMavenRepository { override val url: String = "$base/$repository" override val idForMaven: String @@ -46,8 +46,8 @@ data class JetBrainsSpace(val repository: String) : CustomMavenRepository { object Repositories { val KTOR = DefaultRepository.MAVEN_CENTRAL - val KOTLINX = BintrayRepository("kotlin/kotlinx") // https://dl.bintray.com/kotlin/kotlinx - val KOTLIN_JS_WRAPPERS_BINTRAY = BintrayRepository("kotlin/kotlin-js-wrappers") // https://dl.bintray.com/kotlin/kotlin-js-wrappers + val KOTLINX_HTML = JetBrainsSpace("public/p/kotlinx-html/maven") + val KOTLIN_JS_WRAPPERS_BINTRAY = JetBrainsSpace("kotlin/p/kotlin/kotlin-js-wrappers") val KOTLIN_EAP_MAVEN_CENTRAL = DefaultRepository.MAVEN_CENTRAL val JETBRAINS_COMPOSE_DEV = JetBrainsSpace("public/p/compose/dev") val JETBRAINS_KOTLIN_DEV = JetBrainsSpace("kotlin/p/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 8f3d5fa587b..19849dcc90a 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 @@ -51,7 +51,7 @@ class KtorServerTemplate : Template() { +ktorArtifactDependency(serverEngine.reference.settingValue.dependencyName, kotlinVersion) +ktorArtifactDependency("ktor-html-builder", kotlinVersion) +ArtifactBasedLibraryDependencyIR( - MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), + MavenArtifact(Repositories.KOTLINX_HTML, "org.jetbrains.kotlinx", "kotlinx-html-jvm"), Versions.KOTLINX.KOTLINX_HTML, 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 e653ac3aa28..ac77352f6c5 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 @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.DependencyType import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase -import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.Repositories import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType @@ -45,7 +44,7 @@ class SimpleJsClientTemplate : JsClientTemplate() { buildList { if (useKotlinxHtml.reference.settingValue()) { +ArtifactBasedLibraryDependencyIR( - MavenArtifact(Repositories.KOTLINX, "org.jetbrains.kotlinx", "kotlinx-html"), + MavenArtifact(Repositories.KOTLINX_HTML, "org.jetbrains.kotlinx", "kotlinx-html"), Versions.KOTLINX.KOTLINX_HTML, DependencyType.MAIN )