diff --git a/ci/compose-uber-jar/gradle.properties b/ci/compose-uber-jar/gradle.properties index 44c7d60417..03b9d463c9 100644 --- a/ci/compose-uber-jar/gradle.properties +++ b/ci/compose-uber-jar/gradle.properties @@ -1,2 +1,2 @@ -compose.version=1.0.1-rc2 +compose.version=1.1.0 kotlin.code.style=official diff --git a/components/gradle.properties b/components/gradle.properties index f5c963b26e..8fb205f495 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -5,4 +5,4 @@ kotlin.code.style=official # __KOTLIN_COMPOSE_VERSION__ kotlin.version=1.6.10 # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/codeviewer/gradle.properties b/examples/codeviewer/gradle.properties index 14eb612db5..6849fa0b48 100644 --- a/examples/codeviewer/gradle.properties +++ b/examples/codeviewer/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.6.10 agp.version=7.0.4 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/falling-balls/gradle.properties b/examples/falling-balls/gradle.properties index d97ca90eff..9bb8d52f7d 100644 --- a/examples/falling-balls/gradle.properties +++ b/examples/falling-balls/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt index 8918ee2bc7..77cea5c2be 100755 --- a/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt +++ b/examples/imageviewer/common/src/androidMain/kotlin/example/imageviewer/style/Decoration.kt @@ -5,34 +5,34 @@ import androidx.compose.ui.res.painterResource import example.imageviewer.common.R @Composable -fun icEmpty() = painterResource(R.raw.empty) +fun icEmpty() = painterResource(R.drawable.empty) @Composable -fun icBack() = painterResource(R.raw.back) +fun icBack() = painterResource(R.drawable.back) @Composable -fun icRefresh() = painterResource(R.raw.refresh) +fun icRefresh() = painterResource(R.drawable.refresh) @Composable -fun icDots() = painterResource(R.raw.dots) +fun icDots() = painterResource(R.drawable.dots) @Composable -fun icFilterGrayscaleOn() = painterResource(R.raw.grayscale_on) +fun icFilterGrayscaleOn() = painterResource(R.drawable.grayscale_on) @Composable -fun icFilterGrayscaleOff() = painterResource(R.raw.grayscale_off) +fun icFilterGrayscaleOff() = painterResource(R.drawable.grayscale_off) @Composable -fun icFilterPixelOn() = painterResource(R.raw.pixel_on) +fun icFilterPixelOn() = painterResource(R.drawable.pixel_on) @Composable -fun icFilterPixelOff() = painterResource(R.raw.pixel_off) +fun icFilterPixelOff() = painterResource(R.drawable.pixel_off) @Composable -fun icFilterBlurOn() = painterResource(R.raw.blur_on) +fun icFilterBlurOn() = painterResource(R.drawable.blur_on) @Composable -fun icFilterBlurOff() = painterResource(R.raw.blur_off) +fun icFilterBlurOff() = painterResource(R.drawable.blur_off) @Composable -fun icFilterUnknown() = painterResource(R.raw.filter_unknown) +fun icFilterUnknown() = painterResource(R.drawable.filter_unknown) diff --git a/examples/imageviewer/common/src/androidMain/res/raw/back.png b/examples/imageviewer/common/src/androidMain/res/drawable/back.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/back.png rename to examples/imageviewer/common/src/androidMain/res/drawable/back.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/blur_off.png b/examples/imageviewer/common/src/androidMain/res/drawable/blur_off.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/blur_off.png rename to examples/imageviewer/common/src/androidMain/res/drawable/blur_off.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/blur_on.png b/examples/imageviewer/common/src/androidMain/res/drawable/blur_on.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/blur_on.png rename to examples/imageviewer/common/src/androidMain/res/drawable/blur_on.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/dots.png b/examples/imageviewer/common/src/androidMain/res/drawable/dots.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/dots.png rename to examples/imageviewer/common/src/androidMain/res/drawable/dots.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/empty.png b/examples/imageviewer/common/src/androidMain/res/drawable/empty.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/empty.png rename to examples/imageviewer/common/src/androidMain/res/drawable/empty.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/filter_unknown.png b/examples/imageviewer/common/src/androidMain/res/drawable/filter_unknown.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/filter_unknown.png rename to examples/imageviewer/common/src/androidMain/res/drawable/filter_unknown.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/grayscale_off.png b/examples/imageviewer/common/src/androidMain/res/drawable/grayscale_off.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/grayscale_off.png rename to examples/imageviewer/common/src/androidMain/res/drawable/grayscale_off.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/grayscale_on.png b/examples/imageviewer/common/src/androidMain/res/drawable/grayscale_on.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/grayscale_on.png rename to examples/imageviewer/common/src/androidMain/res/drawable/grayscale_on.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/pixel_off.png b/examples/imageviewer/common/src/androidMain/res/drawable/pixel_off.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/pixel_off.png rename to examples/imageviewer/common/src/androidMain/res/drawable/pixel_off.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/pixel_on.png b/examples/imageviewer/common/src/androidMain/res/drawable/pixel_on.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/pixel_on.png rename to examples/imageviewer/common/src/androidMain/res/drawable/pixel_on.png diff --git a/examples/imageviewer/common/src/androidMain/res/raw/refresh.png b/examples/imageviewer/common/src/androidMain/res/drawable/refresh.png similarity index 100% rename from examples/imageviewer/common/src/androidMain/res/raw/refresh.png rename to examples/imageviewer/common/src/androidMain/res/drawable/refresh.png diff --git a/examples/imageviewer/gradle.properties b/examples/imageviewer/gradle.properties index 14eb612db5..6849fa0b48 100755 --- a/examples/imageviewer/gradle.properties +++ b/examples/imageviewer/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.6.10 agp.version=7.0.4 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/intellij-plugin-with-experimental-shared-base/gradle.properties b/examples/intellij-plugin-with-experimental-shared-base/gradle.properties index 4218dc8395..bf812e078f 100644 --- a/examples/intellij-plugin-with-experimental-shared-base/gradle.properties +++ b/examples/intellij-plugin-with-experimental-shared-base/gradle.properties @@ -1,5 +1,5 @@ kotlin.stdlib.default.dependency=false kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/intellij-plugin/gradle.properties b/examples/intellij-plugin/gradle.properties index d97ca90eff..9bb8d52f7d 100644 --- a/examples/intellij-plugin/gradle.properties +++ b/examples/intellij-plugin/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/issues/gradle.properties b/examples/issues/gradle.properties index 14a606d0ab..242c14d70f 100644 --- a/examples/issues/gradle.properties +++ b/examples/issues/gradle.properties @@ -21,4 +21,4 @@ android.useAndroidX=true android.enableJetifier=true kotlin.version=1.6.10 agp.version=7.0.4 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/notepad/gradle.properties b/examples/notepad/gradle.properties index edb8733db4..654c3e3d5f 100644 --- a/examples/notepad/gradle.properties +++ b/examples/notepad/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 \ No newline at end of file +compose.version=1.1.0 \ No newline at end of file diff --git a/examples/todoapp-lite/gradle.properties b/examples/todoapp-lite/gradle.properties index 14eb612db5..6849fa0b48 100755 --- a/examples/todoapp-lite/gradle.properties +++ b/examples/todoapp-lite/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.6.10 agp.version=7.0.4 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/todoapp/buildSrc/gradle.properties b/examples/todoapp/buildSrc/gradle.properties index 998bcf1c5b..5aab64a51b 100755 --- a/examples/todoapp/buildSrc/gradle.properties +++ b/examples/todoapp/buildSrc/gradle.properties @@ -1,3 +1,3 @@ # TODO can we get rid of duplication with root gradle.properties? kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/todoapp/gradle.properties b/examples/todoapp/gradle.properties index 9e9d3d7eee..c9f33ec9f7 100755 --- a/examples/todoapp/gradle.properties +++ b/examples/todoapp/gradle.properties @@ -24,4 +24,4 @@ org.gradle.caching=true kotlin.native.disableCompilerDaemon=true kotlin.version=1.6.10 -compose.version=1.0.1 \ No newline at end of file +compose.version=1.1.0 \ No newline at end of file diff --git a/examples/visual-effects/gradle.properties b/examples/visual-effects/gradle.properties index d97ca90eff..9bb8d52f7d 100644 --- a/examples/visual-effects/gradle.properties +++ b/examples/visual-effects/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/web-compose-bird/gradle.properties b/examples/web-compose-bird/gradle.properties index 6d98ad2a0d..2e1d6a4d40 100644 --- a/examples/web-compose-bird/gradle.properties +++ b/examples/web-compose-bird/gradle.properties @@ -1,4 +1,4 @@ kotlin.code.style=official org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/web-landing/gradle.properties b/examples/web-landing/gradle.properties index d97ca90eff..9bb8d52f7d 100644 --- a/examples/web-landing/gradle.properties +++ b/examples/web-landing/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/web-with-react/gradle.properties b/examples/web-with-react/gradle.properties index d97ca90eff..9bb8d52f7d 100644 --- a/examples/web-with-react/gradle.properties +++ b/examples/web-with-react/gradle.properties @@ -1,3 +1,3 @@ kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/examples/widgets-gallery/gradle.properties b/examples/widgets-gallery/gradle.properties index 20a9ad100b..a960629879 100644 --- a/examples/widgets-gallery/gradle.properties +++ b/examples/widgets-gallery/gradle.properties @@ -20,5 +20,5 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 agp.version=7.0.4 diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index d065a2cc1e..f31e8cd07f 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.0.0-master-dev570 +compose.version=1.1.0 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. diff --git a/templates/desktop-template/gradle.properties b/templates/desktop-template/gradle.properties index 7cea32dab0..5679ab5bab 100644 --- a/templates/desktop-template/gradle.properties +++ b/templates/desktop-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/templates/multiplatform-template/gradle.properties b/templates/multiplatform-template/gradle.properties index 7ea3403d59..c0554eeeca 100644 --- a/templates/multiplatform-template/gradle.properties +++ b/templates/multiplatform-template/gradle.properties @@ -4,4 +4,4 @@ android.enableJetifier=true kotlin.code.style=official kotlin.version=1.6.10 agp.version=7.0.4 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/templates/web-template/gradle.properties b/templates/web-template/gradle.properties index 7cea32dab0..5679ab5bab 100644 --- a/templates/web-template/gradle.properties +++ b/templates/web-template/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 kotlin.code.style=official kotlin.version=1.6.10 -compose.version=1.0.1 +compose.version=1.1.0 diff --git a/tutorials/Getting_Started/README.md b/tutorials/Getting_Started/README.md index 8271b39f02..8ceeb64e6f 100644 --- a/tutorials/Getting_Started/README.md +++ b/tutorials/Getting_Started/README.md @@ -44,7 +44,7 @@ The Compose plugin version used in the wizard above may be not the last. Update ``` plugins { kotlin("jvm") version "1.6.10" - id("org.jetbrains.compose") version "1.0.1-rc2" + id("org.jetbrains.compose") version "1.1.0-rc01" } ``` @@ -80,7 +80,7 @@ import org.jetbrains.compose.compose plugins { kotlin("jvm") version "1.6.10" - id("org.jetbrains.compose") version "1.0.1-rc2" + id("org.jetbrains.compose") version "1.1.0-rc01" } repositories { diff --git a/tutorials/Web/Getting_Started/README.md b/tutorials/Web/Getting_Started/README.md index 13073810ba..be90390b33 100644 --- a/tutorials/Web/Getting_Started/README.md +++ b/tutorials/Web/Getting_Started/README.md @@ -39,7 +39,7 @@ pluginManagement { // Add compose gradle plugin plugins { kotlin("multiplatform") version "1.6.10" - id("org.jetbrains.compose") version "1.0.1-rc2" + id("org.jetbrains.compose") version "1.1.0" } // Add maven repositories diff --git a/web/gradle.properties b/web/gradle.properties index 45f4e07fb7..18004c5d53 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,5 +1,5 @@ -COMPOSE_CORE_VERSION=1.1.0-alpha03 -COMPOSE_WEB_VERSION=1.1.0-alpha03 +COMPOSE_CORE_VERSION=1.1.0 +COMPOSE_WEB_VERSION=1.1.0 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false