Browse Source

Migrate to Kotlin 1.5.30

pull/1118/head
Igor Demin 3 years ago
parent
commit
c9a7b15e86
  1. 2
      components/build.gradle.kts
  2. 2
      components/gradle.properties
  3. 2
      gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
  4. 2
      gradle-plugins/gradle.properties
  5. 4
      templates/desktop-template/build.gradle.kts
  6. 4
      templates/multiplatform-template/build.gradle.kts
  7. 4
      templates/web-template/build.gradle.kts
  8. 2
      web/buildSrc/build.gradle.kts
  9. 2
      web/compose-compiler-integration/main-template/build.gradle.kts
  10. 4
      web/gradle.properties
  11. 2
      web/settings.gradle.kts

2
components/build.gradle.kts

@ -10,7 +10,7 @@ buildscript {
dependencies {
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))
classpath(kotlin("gradle-plugin", version = "1.5.30"))
}
}

2
components/gradle.properties

@ -4,4 +4,4 @@ android.enableJetifier=true
kotlin.code.style=official
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=1.0.0-alpha1
compose.version=0.0.0-sync-2021-08-27-build327

2
gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt

@ -8,6 +8,6 @@ package org.jetbrains.compose.test
@Suppress("EnumEntryName")
enum class TestKotlinVersion(val versionString: String) {
// __KOTLIN_COMPOSE_VERSION__
Default("1.5.21"),
Default("1.5.30"),
V1_5_20("1.5.20")
}

2
gradle-plugins/gradle.properties

@ -6,7 +6,7 @@ kotlin.code.style=official
# unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
#
# __LATEST_COMPOSE_RELEASE_VERSION__
compose.version=0.5.0-build262
compose.version=0.0.0-sync-2021-08-27-build327
compose.with.web=false
# A version of Gradle plugin, that will be published,

4
templates/desktop-template/build.gradle.kts

@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("jvm") version "1.5.21"
kotlin("jvm") version "1.5.30"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha3")
id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-sync-2021-08-27-build327")
}
repositories {

4
templates/multiplatform-template/build.gradle.kts

@ -1,6 +1,6 @@
buildscript {
// __LATEST_COMPOSE_RELEASE_VERSION__
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "1.0.0-alpha3"
val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.0.0-sync-2021-08-27-build327"
repositories {
mavenCentral()
@ -12,7 +12,7 @@ buildscript {
classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion")
classpath("com.android.tools.build:gradle:4.1.3")
// __KOTLIN_COMPOSE_VERSION__
classpath(kotlin("gradle-plugin", version = "1.5.21"))
classpath(kotlin("gradle-plugin", version = "1.5.30"))
}
}

4
templates/web-template/build.gradle.kts

@ -3,9 +3,9 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
plugins {
// __KOTLIN_COMPOSE_VERSION__
kotlin("multiplatform") version "1.5.21"
kotlin("multiplatform") version "1.5.30"
// __LATEST_COMPOSE_RELEASE_VERSION__
id("org.jetbrains.compose") version ("1.0.0-alpha1")
id("org.jetbrains.compose") version ("0.0.0-sync-2021-08-27-build327")
}
repositories {

2
web/buildSrc/build.gradle.kts

@ -10,5 +10,5 @@ repositories {
}
plugins {
id("org.jetbrains.kotlin.jvm") version "1.5.21"
id("org.jetbrains.kotlin.jvm") version "1.5.30"
}

2
web/compose-compiler-integration/main-template/build.gradle.kts

@ -1,5 +1,5 @@
plugins {
kotlin("multiplatform") version "1.5.21"
kotlin("multiplatform") version "1.5.30"
id("org.jetbrains.compose")
}

4
web/gradle.properties

@ -1,6 +1,6 @@
# __LATEST_COMPOSE_RELEASE_VERSION__
COMPOSE_CORE_VERSION=1.0.0-alpha4-build321
COMPOSE_WEB_VERSION=1.0.0-alpha4
COMPOSE_CORE_VERSION=0.0.0-sync-2021-08-27-build327
COMPOSE_WEB_VERSION=0.0.0-sync-2021-08-27-build327
compose.web.buildSamples=false
compose.web.tests.integration.withFirefox
compose.web.tests.skip.benchmarks=false

2
web/settings.gradle.kts

@ -18,7 +18,7 @@ pluginManagement {
println("[build] compose core version: ${extra["COMPOSE_CORE_VERSION"]}")
useModule("org.jetbrains.compose:org.jetbrains.compose.gradle.plugin:${extra["COMPOSE_CORE_VERSION"]}")
} else if (requested.id.id == "org.jetbrains.kotlin.multiplatform") {
useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.21")
useModule("org.jetbrains.kotlin.multiplatform:org.jetbrains.kotlin.multiplatform.gradle.plugin:1.5.30")
}
}
}

Loading…
Cancel
Save