diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 7acfdd83..cd27ceed 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.2 +compose.version=0.4.0-build180 kotlin.code.style=official diff --git a/components/build.gradle.kts b/components/build.gradle.kts index f06d6589..33aa8d6d 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.2" + val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-build180" 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.31")) + classpath(kotlin("gradle-plugin", version = "1.4.32")) } } diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts index 047d80a2..de6fd4a6 100644 --- a/examples/codeviewer/build.gradle.kts +++ b/examples/codeviewer/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { dependencies { // __LATEST_COMPOSE_RELEASE_VERSION__ - classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build179") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ classpath(kotlin("gradle-plugin", version = "1.4.32")) diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts index b8c0b475..e2862036 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.31" + kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.2" + id("org.jetbrains.compose") version "0.4.0-build180" } group = "me.user" diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts index fdd6f284..1ba21ba4 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.2") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.31")) + classpath(kotlin("gradle-plugin", version = "1.4.32")) } } diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts index c30357e7..d07128ca 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.31" + kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version "0.3.2" + id("org.jetbrains.compose") version "0.4.0-build180" } group = "org.example" diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts index c87ae3a8..43f5e2f6 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.2") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.31")) + classpath(kotlin("gradle-plugin", version = "1.4.32")) } } diff --git a/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt b/examples/todoapp/buildSrc/buildSrc/src/main/kotlin/Deps.kt index 6e96136a..d7c77356 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.31" + private const val VERSION = "1.4.32" 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.2" + private const val VERSION = "0.4.0-build180" const val gradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$VERSION" } } @@ -49,7 +49,7 @@ object Deps { } object Decompose { - private const val VERSION = "0.2.0" + private const val VERSION = "0.2.1" const val decompose = "com.arkivanov.decompose:decompose:$VERSION" const val decomposeIosX64 = "com.arkivanov.decompose:decompose-iosx64:$VERSION" const val decomposeIosArm64 = "com.arkivanov.decompose:decompose-iosarm64:$VERSION" diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts index f1e87b60..14436f4a 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.2") + classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-build180") classpath("com.android.tools.build:gradle:4.0.1") // __KOTLIN_COMPOSE_VERSION__ - classpath(kotlin("gradle-plugin", version = "1.4.31")) + classpath(kotlin("gradle-plugin", version = "1.4.32")) } } diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 6ad3a2b4..71927969 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.31" apply false + kotlin("jvm") version "1.4.32" 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/TestKotlinVersion.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt index 39ba1edb..a5dfadae 100644 --- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt +++ b/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.4.31"), + Default("1.4.32"), V1_5_20_dev_3226("1.5.20-dev-3226") } \ No newline at end of file diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 85118562..3e0e742a 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.2 +compose.version=0.4.0-build180 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/idea-plugin/build.gradle.kts b/idea-plugin/build.gradle.kts index 0350a2d6..951d9a7e 100644 --- a/idea-plugin/build.gradle.kts +++ b/idea-plugin/build.gradle.kts @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile plugins { id("java") - id("org.jetbrains.kotlin.jvm") version "1.4.31" + id("org.jetbrains.kotlin.jvm") version "1.4.32" id("org.jetbrains.intellij") version "0.7.2" id("org.jetbrains.changelog") version "1.1.2" } @@ -27,7 +27,7 @@ intellij { setPlugins( "java", "com.intellij.gradle", - "org.jetbrains.kotlin:203-1.4.31-release-IJ7148.5" + "org.jetbrains.kotlin:203-1.4.32-release-IJ7148.5" ) } diff --git a/templates/desktop-template/build.gradle.kts b/templates/desktop-template/build.gradle.kts index 7db7071c..54b5b558 100644 --- a/templates/desktop-template/build.gradle.kts +++ b/templates/desktop-template/build.gradle.kts @@ -5,7 +5,7 @@ plugins { // __KOTLIN_COMPOSE_VERSION__ kotlin("jvm") version "1.4.32" // __LATEST_COMPOSE_RELEASE_VERSION__ - id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build179") + id("org.jetbrains.compose") version (System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build180") } repositories { diff --git a/templates/multiplatform-template/build.gradle.kts b/templates/multiplatform-template/build.gradle.kts index d7cc46c6..0e40083c 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.4.0-build179" + val composeVersion = System.getenv("COMPOSE_TEMPLATE_COMPOSE_VERSION") ?: "0.4.0-build180" repositories { // TODO: remove after new build is published diff --git a/tools/replace.sh b/tools/replace.sh index d21d4fed..580b080f 100755 --- a/tools/replace.sh +++ b/tools/replace.sh @@ -1,11 +1,11 @@ #!/bin/bash ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/.. -COMPOSE_OLDVER=0.3.1 -COMPOSE_NEWVER=0.3.2 +COMPOSE_OLDVER=0.3.2 +COMPOSE_NEWVER=0.4.0-build180 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 +KOTLIN_OLDVER=1.4.31 +KOTLIN_NEWVER=1.4.32 find -E $ROOT -regex '.*\.(kts|properties|kt)' -exec sed -i '' -e "s/$KOTLIN_OLDVER/$KOTLIN_NEWVER/g" {} \;