Wizard: use custom Kotlin version for compose project
This commit is contained in:
+1
-2
@@ -1,7 +1,7 @@
|
|||||||
import org.jetbrains.compose.compose
|
import org.jetbrains.compose.compose
|
||||||
|
|
||||||
plugins {
|
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 'org.jetbrains.compose' version '0.1.0-build63'
|
||||||
id 'application'
|
id 'application'
|
||||||
}
|
}
|
||||||
@@ -12,7 +12,6 @@ version = '1.0-SNAPSHOT'
|
|||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'KOTLIN_REPO' }
|
|
||||||
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
|
|||||||
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm") version "KOTLIN_VERSION"
|
kotlin("jvm") version "1.4.0"
|
||||||
id("org.jetbrains.compose") version "0.1.0-build63"
|
id("org.jetbrains.compose") version "0.1.0-build63"
|
||||||
application
|
application
|
||||||
}
|
}
|
||||||
@@ -13,7 +13,6 @@ version = "1.0-SNAPSHOT"
|
|||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url = uri("KOTLIN_REPO") }
|
|
||||||
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -2,7 +2,6 @@ pluginManagement {
|
|||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'KOTLIN_REPO' }
|
|
||||||
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -2,7 +2,6 @@ pluginManagement {
|
|||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url = uri("KOTLIN_REPO") }
|
|
||||||
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-3
@@ -3,10 +3,10 @@ buildscript {
|
|||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
jcenter()
|
jcenter()
|
||||||
google()
|
google()
|
||||||
maven { url 'KOTLIN_REPO' }
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
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')
|
classpath('com.android.tools.build:gradle:4.0.1')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,6 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'KOTLIN_REPO' }
|
|
||||||
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-3
@@ -3,10 +3,10 @@ buildscript {
|
|||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
jcenter()
|
jcenter()
|
||||||
google()
|
google()
|
||||||
maven { url = uri("KOTLIN_REPO") }
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
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")
|
classpath("com.android.tools.build:gradle:4.0.1")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,6 @@ allprojects {
|
|||||||
repositories {
|
repositories {
|
||||||
jcenter()
|
jcenter()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url = uri("KOTLIN_REPO") }
|
|
||||||
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-1
@@ -4,7 +4,6 @@ pluginManagement {
|
|||||||
jcenter()
|
jcenter()
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url 'KOTLIN_REPO' }
|
|
||||||
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
maven { url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-1
@@ -4,7 +4,6 @@ pluginManagement {
|
|||||||
jcenter()
|
jcenter()
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url = uri("KOTLIN_REPO") }
|
|
||||||
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
maven { url = uri("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.tools.projectWizard.cli
|
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.EapVersionDownloader
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardKotlinVersion
|
import org.jetbrains.kotlin.tools.projectWizard.core.service.WizardKotlinVersion
|
||||||
import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionKind
|
import org.jetbrains.kotlin.tools.projectWizard.core.service.KotlinVersionKind
|
||||||
@@ -20,7 +21,12 @@ class KotlinVersionProviderTestWizardService() : KotlinVersionProviderService(),
|
|||||||
|
|
||||||
|
|
||||||
override fun getKotlinVersion(projectKind: ProjectKind): WizardKotlinVersion =
|
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) {
|
override fun getKotlinVersionRepository(versionKind: KotlinVersionKind): Repository = if (useCacheRedirector) {
|
||||||
getKotlinVersionRepositoryWithCacheRedirector(versionKind)
|
getKotlinVersionRepositoryWithCacheRedirector(versionKind)
|
||||||
|
|||||||
Reference in New Issue
Block a user