From 04c82fc0bc20cd07c5bcc5d633cb00e7f9c9d5e5 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Tue, 28 Jun 2022 09:39:30 +1000 Subject: [PATCH] Upgrade to Compose 1.2.0-rc03 --- appcompat-theme/build.gradle | 2 +- drawablepainter/build.gradle | 2 +- flowlayout/build.gradle | 2 +- gradle.properties | 2 +- gradle/libs.versions.toml | 5 +++-- insets-ui/build.gradle | 2 +- insets/build.gradle | 2 +- internal-testutils/build.gradle | 2 +- navigation-animation/build.gradle | 2 +- navigation-material/build.gradle | 2 +- pager-indicators/build.gradle | 2 +- pager/build.gradle | 2 +- permissions/build.gradle | 2 +- placeholder-material/build.gradle | 2 +- placeholder/build.gradle | 2 +- sample/build.gradle | 2 +- swiperefresh/build.gradle | 2 +- systemuicontroller/build.gradle | 2 +- web/build.gradle | 2 +- 19 files changed, 21 insertions(+), 20 deletions(-) diff --git a/appcompat-theme/build.gradle b/appcompat-theme/build.gradle index 269ba90ec..661ef97d0 100644 --- a/appcompat-theme/build.gradle +++ b/appcompat-theme/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/drawablepainter/build.gradle b/drawablepainter/build.gradle index 88c835cc0..a43beea9c 100644 --- a/drawablepainter/build.gradle +++ b/drawablepainter/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/flowlayout/build.gradle b/flowlayout/build.gradle index f4bcb76f9..7360224bf 100644 --- a/flowlayout/build.gradle +++ b/flowlayout/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/gradle.properties b/gradle.properties index b5eaff080..ff53c337f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ systemProp.org.gradle.internal.http.socketTimeout=120000 GROUP=com.google.accompanist # !! No longer need to update this manually when using a Compose SNAPSHOT -VERSION_NAME=0.24.13-SNAPSHOT +VERSION_NAME=0.24.13-rc POM_DESCRIPTION=Utilities for Jetpack Compose diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12babc1e1..5c697159c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] -compose = "1.2.0-rc02" +compose = "1.2.0-rc03" +composeCompiler = "1.2.0" composesnapshot = "-" # a single character = no snapshot # gradlePlugin and lint need to be updated together @@ -7,7 +8,7 @@ gradlePlugin = "7.3.0-beta01" lintMinCompose = "30.0.0" ktlint = "0.42.1" -kotlin = "1.6.21" +kotlin = "1.7.0" coroutines = "1.6.0" okhttp = "3.12.13" coil = "1.3.2" diff --git a/insets-ui/build.gradle b/insets-ui/build.gradle index d43090658..e763c06ff 100644 --- a/insets-ui/build.gradle +++ b/insets-ui/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/insets/build.gradle b/insets/build.gradle index c9f8682aa..92cb49bde 100644 --- a/insets/build.gradle +++ b/insets/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/internal-testutils/build.gradle b/internal-testutils/build.gradle index f37016672..efdca5672 100644 --- a/internal-testutils/build.gradle +++ b/internal-testutils/build.gradle @@ -38,7 +38,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/navigation-animation/build.gradle b/navigation-animation/build.gradle index e61479965..9a6ac4bbf 100644 --- a/navigation-animation/build.gradle +++ b/navigation-animation/build.gradle @@ -46,7 +46,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/navigation-material/build.gradle b/navigation-material/build.gradle index 673c69137..3be323492 100644 --- a/navigation-material/build.gradle +++ b/navigation-material/build.gradle @@ -46,7 +46,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/pager-indicators/build.gradle b/pager-indicators/build.gradle index e34e6f979..26f66b885 100644 --- a/pager-indicators/build.gradle +++ b/pager-indicators/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/pager/build.gradle b/pager/build.gradle index 547b5d64a..0f6d18861 100644 --- a/pager/build.gradle +++ b/pager/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/permissions/build.gradle b/permissions/build.gradle index b75957535..72b56deb0 100644 --- a/permissions/build.gradle +++ b/permissions/build.gradle @@ -51,7 +51,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/placeholder-material/build.gradle b/placeholder-material/build.gradle index 3583a4652..d21f2e5aa 100644 --- a/placeholder-material/build.gradle +++ b/placeholder-material/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/placeholder/build.gradle b/placeholder/build.gradle index c14d15b50..37eb28b57 100644 --- a/placeholder/build.gradle +++ b/placeholder/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/sample/build.gradle b/sample/build.gradle index 379f51d13..1cb85325f 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -42,7 +42,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } } diff --git a/swiperefresh/build.gradle b/swiperefresh/build.gradle index 802e79eb2..4529e1f8d 100644 --- a/swiperefresh/build.gradle +++ b/swiperefresh/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/systemuicontroller/build.gradle b/systemuicontroller/build.gradle index a70e27d7d..63dd27ddf 100644 --- a/systemuicontroller/build.gradle +++ b/systemuicontroller/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions { diff --git a/web/build.gradle b/web/build.gradle index 54d5272c0..de21612d4 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -45,7 +45,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion libs.versions.compose.get() + kotlinCompilerExtensionVersion libs.versions.composeCompiler.get() } lintOptions {