diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle index 405a4056ad2..1a6936ed911 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle @@ -1,7 +1,7 @@ import org.jetbrains.compose.compose plugins { - id 'org.jetbrains.kotlin.jvm' version 'KOTLIN_VERSION' + id 'org.jetbrains.kotlin.jvm' version '1.4.0' id 'org.jetbrains.compose' version '0.1.0-build63' id 'application' } @@ -12,7 +12,6 @@ version = '1.0-SNAPSHOT' repositories { jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts index 0389195322d..40240a32a17 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.compose.compose import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "KOTLIN_VERSION" + kotlin("jvm") version "1.4.0" id("org.jetbrains.compose") version "0.1.0-build63" application } @@ -13,7 +13,6 @@ version = "1.0-SNAPSHOT" repositories { jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle index 64e250c0e62..36552a57a9c 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle.kts index 0e1e742260b..2be82a340a2 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle.kts @@ -2,7 +2,6 @@ pluginManagement { repositories { gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle index 8b5b36103c7..c048691ccd4 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle @@ -3,10 +3,10 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { url 'KOTLIN_REPO' } + mavenCentral() } dependencies { - classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION') + classpath('org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0') classpath('com.android.tools.build:gradle:4.0.1') } } @@ -18,7 +18,6 @@ allprojects { repositories { jcenter() mavenCentral() - maven { url 'KOTLIN_REPO' } maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' } } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts index c3ba83a4f12..ef47d588ac1 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts @@ -3,10 +3,10 @@ buildscript { gradlePluginPortal() jcenter() google() - maven { url = uri("KOTLIN_REPO") } + mavenCentral() } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:KOTLIN_VERSION") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0") classpath("com.android.tools.build:gradle:4.0.1") } } @@ -18,7 +18,6 @@ allprojects { repositories { jcenter() mavenCentral() - maven { url = uri("KOTLIN_REPO") } maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } } \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle index 1cdcf40cf0a..300d572445d 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url 'KOTLIN_REPO' } maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' } } diff --git a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle.kts b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle.kts index de38ca7437b..9255b8878bc 100644 --- a/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle.kts +++ b/libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle.kts @@ -4,7 +4,6 @@ pluginManagement { jcenter() gradlePluginPortal() mavenCentral() - maven { url = uri("KOTLIN_REPO") } maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } 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 690460028dd..f4e6797e2eb 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 @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.tools.projectWizard.cli +import org.jetbrains.kotlin.tools.projectWizard.Versions import org.jetbrains.kotlin.tools.projectWizard.core.service.EapVersionDownloader import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardKotlinVersion import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionKind @@ -20,7 +21,12 @@ class KotlinVersionProviderTestWizardService() : KotlinVersionProviderService(), override fun getKotlinVersion(projectKind: ProjectKind): WizardKotlinVersion = - kotlinVersionWithDefaultValues(TEST_KOTLIN_VERSION) + kotlinVersionWithDefaultValues( + when (projectKind) { + ProjectKind.COMPOSE -> Versions.KOTLIN_VERSION_FOR_COMPOSE + else -> TEST_KOTLIN_VERSION + } + ) override fun getKotlinVersionRepository(versionKind: KotlinVersionKind): Repository = if (useCacheRedirector) { getKotlinVersionRepositoryWithCacheRedirector(versionKind)