azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: use custom Kotlin version for compose project

Browse Source
This commit is contained in:
Ilya Kirillov
2020-10-14 16:44:04 +03:00
parent b0bb03d761
commit ec1528e742
9 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle
Vendored
+1 -2
View File
@@ -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' }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/build.gradle.kts
Vendored
+1 -2
View File
@@ -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") }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle
Vendored
-1
View File
@@ -2,7 +2,6 @@ pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeDesktopApplication/settings.gradle.kts
Vendored
-1
View File
@@ -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") }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle
Vendored
+2 -3
View File
@@ -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' }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/build.gradle.kts
Vendored
+2 -3
View File
@@ -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") }
}
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle
Vendored
-1
View File
@@ -4,7 +4,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
mavenCentral()
maven { url 'KOTLIN_REPO' }
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/testData/projectTemplatesBuildFileGeneration/composeMultiplatformApplication/expected/settings.gradle.kts
Vendored
-1
View File
@@ -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") }
}
libraries/tools/new-project-wizard/new-project-wizard-cli/tests/org/jetbrains/kotlin/tools/projectWizard/cli/KotlinVersionProviderTestWizardService.kt
+7 -1
View File
@@ -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)