diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties
index d50de329..8d5eca5b 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.4.0-rc1
+compose.version=0.4.0-rc2
 kotlin.code.style=official
diff --git a/components/build.gradle.kts b/components/build.gradle.kts
index d21749ce..23838067 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.4.0-rc1"
+    val composeVersion = System.getenv("COMPOSE_RELEASE_VERSION") ?: "0.4.0-rc2"
 
     repositories {
         google()
diff --git a/examples/codeviewer/build.gradle.kts b/examples/codeviewer/build.gradle.kts
index 5ac6d9c6..ee7747a4 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-rc1")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
         classpath("com.android.tools.build:gradle:4.0.1")
          // __KOTLIN_COMPOSE_VERSION__
         classpath(kotlin("gradle-plugin", version = "1.5.10"))
diff --git a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt
index e1b6cc8b..c6c5ef62 100644
--- a/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt
+++ b/examples/codeviewer/common/src/commonMain/kotlin/org/jetbrains/codeviewer/ui/filetree/FileTree.kt
@@ -43,7 +43,7 @@ class FileTree(root: File, private val editors: Editors) {
             get() = if (file.file.isDirectory) {
                 ItemType.Folder(isExpanded = file.children.isNotEmpty(), canExpand = file.canExpand)
             } else {
-                ItemType.File(ext = file.file.name.substringAfterLast(".").toLowerCase())
+                ItemType.File(ext = file.file.name.substringAfterLast(".").lowercase())
             }
 
         fun open() = when (type) {
@@ -69,4 +69,4 @@ class FileTree(root: File, private val editors: Editors) {
         addTo(list)
         return list
     }
-}
\ No newline at end of file
+}
diff --git a/examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt b/examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt
index 69b9387d..e3811a69 100644
--- a/examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt
+++ b/examples/codeviewer/common/src/jvmMain/kotlin/org/jetbrains/codeviewer/platform/JvmFile.kt
@@ -94,7 +94,7 @@ private fun java.io.File.readLinePositions(
                 if (isBeginOfLine) {
                     starts.add(position.toInt())
                 }
-                isBeginOfLine = byte.toChar() == '\n'
+                isBeginOfLine = Char(byte.toInt()) == '\n'
                 position++
             }
             channel.close()
@@ -142,4 +142,4 @@ private class IntList(initialCapacity: Int = 16) {
     fun compact() {
         array = array.copyOfRange(0, size)
     }
-}
\ No newline at end of file
+}
diff --git a/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties b/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
index ac33e994..7665b0fa 100644
--- a/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/codeviewer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/falling_balls/build.gradle.kts b/examples/falling_balls/build.gradle.kts
index 83cd8fda..0e6198a6 100644
--- a/examples/falling_balls/build.gradle.kts
+++ b/examples/falling_balls/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     // __KOTLIN_COMPOSE_VERSION__
     kotlin("jvm") version "1.5.10"
     // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "0.4.0-rc1"
+    id("org.jetbrains.compose") version "0.4.0-rc2"
 }
 
 group = "me.user"
diff --git a/examples/falling_balls/gradle/wrapper/gradle-wrapper.properties b/examples/falling_balls/gradle/wrapper/gradle-wrapper.properties
index be52383e..549d8442 100644
--- a/examples/falling_balls/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/falling_balls/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/imageviewer/build.gradle.kts b/examples/imageviewer/build.gradle.kts
index 025697bc..acab0e08 100755
--- a/examples/imageviewer/build.gradle.kts
+++ b/examples/imageviewer/build.gradle.kts
@@ -11,7 +11,7 @@ buildscript {
 
     dependencies {
         // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
         classpath("com.android.tools.build:gradle:4.0.1")
         // __KOTLIN_COMPOSE_VERSION__
         classpath(kotlin("gradle-plugin", version = "1.5.10"))
diff --git a/examples/imageviewer/gradle/wrapper/gradle-wrapper.properties b/examples/imageviewer/gradle/wrapper/gradle-wrapper.properties
index 622ab64a..549d8442 100755
--- a/examples/imageviewer/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/imageviewer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/intelliJPlugin/build.gradle.kts b/examples/intelliJPlugin/build.gradle.kts
index 1d367e46..15525e48 100644
--- a/examples/intelliJPlugin/build.gradle.kts
+++ b/examples/intelliJPlugin/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     java
     kotlin("jvm") version "1.5.10"
     // __LATEST_COMPOSE_RELEASE_VERSION__
-    id("org.jetbrains.compose") version "0.4.0-rc1"
+    id("org.jetbrains.compose") version "0.4.0-rc2"
 }
 
 group = "org.example"
@@ -25,7 +25,7 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version = "2020.3.2"
+    version = "2021.1"
 }
 tasks.getByName<org.jetbrains.intellij.tasks.PatchPluginXmlTask>("patchPluginXml") {
     changeNotes("""
diff --git a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties b/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties
index ac33e994..7665b0fa 100644
--- a/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/intelliJPlugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/issues/build.gradle.kts b/examples/issues/build.gradle.kts
index 53135f9f..b612e99c 100644
--- a/examples/issues/build.gradle.kts
+++ b/examples/issues/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
         classpath("com.android.tools.build:gradle:4.0.1")
         // __KOTLIN_COMPOSE_VERSION__
         classpath(kotlin("gradle-plugin", version = "1.5.10"))
diff --git a/examples/issues/gradle/wrapper/gradle-wrapper.properties b/examples/issues/gradle/wrapper/gradle-wrapper.properties
index ac33e994..7665b0fa 100644
--- a/examples/issues/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/issues/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/web-getting-started/build.gradle.kts b/examples/web-getting-started/build.gradle.kts
index d3e94d96..410d7bc8 100644
--- a/examples/web-getting-started/build.gradle.kts
+++ b/examples/web-getting-started/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.5.0"
+    kotlin("multiplatform") version "1.5.10"
     id("org.jetbrains.compose") version "0.0.0-web-dev-13"
 }
 
diff --git a/examples/web_landing/build.gradle.kts b/examples/web_landing/build.gradle.kts
index ac4865f8..88363de5 100644
--- a/examples/web_landing/build.gradle.kts
+++ b/examples/web_landing/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform") version "1.5.0"
+    id("org.jetbrains.kotlin.multiplatform") version "1.5.10"
     id("org.jetbrains.compose") version "0.0.0-web-dev-13"
 }
 
diff --git a/examples/widgetsgallery/build.gradle.kts b/examples/widgetsgallery/build.gradle.kts
index 2c95dc75..9c3e42c4 100644
--- a/examples/widgetsgallery/build.gradle.kts
+++ b/examples/widgetsgallery/build.gradle.kts
@@ -9,7 +9,7 @@ buildscript {
 
     dependencies {
         // __LATEST_COMPOSE_RELEASE_VERSION__
-        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc1")
+        classpath("org.jetbrains.compose:compose-gradle-plugin:0.4.0-rc2")
         classpath("com.android.tools.build:gradle:4.0.1")
         // __KOTLIN_COMPOSE_VERSION__
         classpath(kotlin("gradle-plugin", version = "1.5.10"))
diff --git a/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties b/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties
index ac33e994..7665b0fa 100644
--- a/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/widgetsgallery/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index 242e8fd1..4a0fdd80 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.4.0-rc1
+compose.version=0.4.0-rc2
 compose.with.web=false
 
 # A version of Gradle plugin, that will be published,
diff --git a/tools/replace.sh b/tools/replace.sh
index d5afb58a..b09b2dad 100755
--- a/tools/replace.sh
+++ b/tools/replace.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/..
-COMPOSE_OLDVER=0.4.0-build209
-COMPOSE_NEWVER=0.4.0-rc1
+COMPOSE_OLDVER=0.4.0-rc1
+COMPOSE_NEWVER=0.4.0-rc2
 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
diff --git a/tutorials/checker/gradle/wrapper/gradle-wrapper.properties b/tutorials/checker/gradle/wrapper/gradle-wrapper.properties
index be52383e..549d8442 100644
--- a/tutorials/checker/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/checker/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists