diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 794713360a..7acfdd8300 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,3 +1,3 @@ # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=0.3.1 +compose.version=0.3.2 kotlin.code.style=official diff --git a/components/build.gradle.kts b/components/build.gradle.kts index 41ad0fa991..f06d658904 100644 --- a/components/build.gradle.kts +++ b/components/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.3.1" + val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.3.2" repositories { google() @@ -11,7 +11,7 @@ buildscript { dependencies { classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index 511b5f0f83..6fc342c918 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -9,10 +9,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts index 6318fde644..b8c0b4753d 100644 --- a/examples/falling_balls/build.gradle.kts +++ b/examples/falling_balls/build.gradle.kts @@ -4,9 +4,9 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.4.30" + kotlin("jvm") version "1.4.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.1" + id("org.jetbrains.compose") version "0.3.2" } group = "me.user" diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index 554c12cd2a..fdd6f28481 100755 --- a/examples/imageviewer/build.gradle.kts +++ b/examples/imageviewer/build.gradle.kts @@ -11,10 +11,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts index b98f913752..c30357e7d0 100644 --- a/examples/intelliJPlugin/build.gradle.kts +++ b/examples/intelliJPlugin/build.gradle.kts @@ -3,9 +3,9 @@ import org.jetbrains.compose.compose plugins { id("org.jetbrains.intellij") version "0.6.5" java - kotlin("jvm") version "1.4.30" + kotlin("jvm") version "1.4.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.1" + id("org.jetbrains.compose") version "0.3.2" } group = "org.example" @@ -26,7 +26,7 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version = "2020.3.1" + version = "2020.3.2" } tasks.getByName("patchPluginXml") { changeNotes(""" diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index 1e86513324..c87ae3a8d5 100644 --- a/examples/issues/build.gradle.kts +++ b/examples/issues/build.gradle.kts @@ -9,10 +9,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 3d8d3b560b..8d1fbbd66e 100644 --- a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt +++ b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt @@ -3,7 +3,7 @@ object Deps { object JetBrains { object Kotlin { // __KOTLIN_COMPOSE_VERSION__ - private const val VERSION = "1.4.30" + private const val VERSION = "1.4.31" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VERSION" const val testCommon = "org.jetbrains.kotlin:kotlin-test-common:$VERSION" const val testJunit = "org.jetbrains.kotlin:kotlin-test-junit:$VERSION" @@ -12,7 +12,7 @@ object Deps { object Compose { // __LATEST_COMPOSE_RELEASE_VERSION__ - private const val VERSION = "0.3.1" + private const val VERSION = "0.3.2" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts index 7924d8b36e..f1e87b608e 100644 --- a/examples/widgetsgallery/build.gradle.kts +++ b/examples/widgetsgallery/build.gradle.kts @@ -9,10 +9,10 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.1") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.3.2") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index b6715cea11..cc86fc5ff4 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -2,7 +2,7 @@ import com.gradle.publish.PluginBundleExtension plugins { // __KOTLIN_COMPOSE_VERSION__ - kotlin("jvm") version "1.4.30" apply false + kotlin("jvm") version "1.4.31" apply false id("com.gradle.plugin-publish") version "0.10.1" apply false id("de.fuerstenau.buildconfig") version "1.1.8" apply false } diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt index f099a5d5b1..341b55654c 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt +++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt @@ -2,7 +2,7 @@ package org.jetbrains.compose.test object TestProperties { // __KOTLIN_COMPOSE_VERSION__ - val kotlinVersion: String = "1.4.30" + val kotlinVersion: String = "1.4.31" val composeVersion: String get() = System.getProperty("compose.plugin.version")!! diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index cc8434904a..851185621c 100644 --- a/gradle-plugins/gradle.properties +++ b/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.3.1 +compose.version=0.3.2 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 328f86d0a6..3d61738165 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/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.4.30" + kotlin("jvm") version "1.4.31" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.1") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.2") } repositories { diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index 6cee40b9a9..ed26961247 100644 --- a/templates/multiplatform-template/build.gradle.kts +++ b/templates/multiplatform-template/build.gradle.kts @@ -1,6 +1,6 @@ buildscript { // __LATEST_COMPOSE_RELEASE_VERSION__ - val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.1" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.3.2" repositories { // TODO: remove after new build is published @@ -14,7 +14,7 @@ buildscript { classpath("org.jetbrains.compose:compose-gradle-plugin:$composeVersion") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.30")) + classpath(kotlin("gradle-plugin", version = "1.4.31")) } } diff --git a/tools/replace.sh b/tools/replace.sh index e4cbedc7e2..d21d4feddd 100755 --- a/tools/replace.sh +++ b/tools/replace.sh @@ -1,9 +1,11 @@ #!/bin/bash ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/.. -COMPOSE_OLDVER=0.3.0 -COMPOSE_NEWVER=0.3.1 +COMPOSE_OLDVER=0.3.1 +COMPOSE_NEWVER=0.3.2 find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$COMPOSE_OLDVER/$COMPOSE_NEWVER/g" {} \; APPCOMPAT_OLDVER=1.1.0 APPCOMPAT_NEWVER=1.3.0-beta01 find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$APPCOMPAT_OLDVER/$APPCOMPAT_NEWVER/g" {} \; - +KOTLIN_OLDVER=1.4.30 +KOTLIN_NEWVER=1.4.31 +find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$KOTLIN_OLDVER/$KOTLIN_NEWVER/g" {} \;