From 1b4c64dc325c7b26879a5961ccdc3063f7665e99 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Wed, 24 Aug 2022 11:18:40 +1000 Subject: [PATCH] Update to Compose 1.3.0-beta01 --- adaptive/build.gradle | 1 + appcompat-theme/build.gradle | 1 + drawablepainter/build.gradle | 1 + flowlayout/build.gradle | 1 + gradle.properties | 2 +- gradle/libs.versions.toml | 6 +++--- insets-ui/build.gradle | 2 ++ insets/build.gradle | 1 + navigation-animation/build.gradle | 1 + navigation-material/build.gradle | 1 + pager-indicators/build.gradle | 2 ++ pager/build.gradle | 1 + placeholder-material/build.gradle | 1 + placeholder/build.gradle | 1 + swiperefresh/build.gradle | 2 +- systemuicontroller/build.gradle | 1 + web/build.gradle | 1 + 17 files changed, 21 insertions(+), 5 deletions(-) diff --git a/adaptive/build.gradle b/adaptive/build.gradle index fa867381b..977a947e7 100644 --- a/adaptive/build.gradle +++ b/adaptive/build.gradle @@ -87,6 +87,7 @@ dependencies { api libs.androidx.window implementation libs.napier + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/appcompat-theme/build.gradle b/appcompat-theme/build.gradle index 9a25562d8..1c60d7a97 100644 --- a/appcompat-theme/build.gradle +++ b/appcompat-theme/build.gradle @@ -84,6 +84,7 @@ android { dependencies { implementation libs.androidx.core implementation libs.compose.material.material + implementation libs.kotlin.coroutines.android api libs.androidx.appcompat diff --git a/drawablepainter/build.gradle b/drawablepainter/build.gradle index 03e0ba926..3c15fc2bb 100644 --- a/drawablepainter/build.gradle +++ b/drawablepainter/build.gradle @@ -65,6 +65,7 @@ android { dependencies { implementation libs.compose.ui.ui + implementation libs.kotlin.coroutines.android } apply plugin: "com.vanniktech.maven.publish" diff --git a/flowlayout/build.gradle b/flowlayout/build.gradle index b6565a993..f15b34629 100644 --- a/flowlayout/build.gradle +++ b/flowlayout/build.gradle @@ -84,6 +84,7 @@ android { dependencies { implementation libs.compose.foundation.foundation implementation libs.compose.ui.util + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/gradle.properties b/gradle.properties index 27d0db166..158295e3d 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.26.2-SNAPSHOT +VERSION_NAME=0.26.2-beta POM_DESCRIPTION=Utilities for Jetpack Compose diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 357cf6564..5c36fb27c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] -compose = "1.3.0-alpha03" +compose = "1.3.0-beta01" composeCompiler = "1.3.0" composesnapshot = "-" # a single character = no snapshot # gradlePlugin and lint need to be updated together -gradlePlugin = "7.3.0-beta05" +gradlePlugin = "7.3.0-rc01" lintMinCompose = "30.0.0" ktlint = "0.45.2" kotlin = "1.7.10" -coroutines = "1.6.0" +coroutines = "1.6.4" okhttp = "3.12.13" coil = "1.3.2" diff --git a/insets-ui/build.gradle b/insets-ui/build.gradle index a9fd35641..9deaab50c 100644 --- a/insets-ui/build.gradle +++ b/insets-ui/build.gradle @@ -90,6 +90,8 @@ dependencies { api project(':insets') api libs.compose.material.material + implementation libs.kotlin.coroutines.android + // ====================== // Test dependencies // ====================== diff --git a/insets/build.gradle b/insets/build.gradle index 4bc926ec7..d033602a0 100644 --- a/insets/build.gradle +++ b/insets/build.gradle @@ -86,6 +86,7 @@ dependencies { implementation libs.androidx.dynamicanimation implementation libs.compose.foundation.foundation + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/navigation-animation/build.gradle b/navigation-animation/build.gradle index 6da047e72..e6ac9cc2b 100644 --- a/navigation-animation/build.gradle +++ b/navigation-animation/build.gradle @@ -75,6 +75,7 @@ dependencies { implementation libs.compose.animation.animation implementation libs.compose.foundation.foundation implementation libs.compose.material.material + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/navigation-material/build.gradle b/navigation-material/build.gradle index 4b107f537..162c98b84 100644 --- a/navigation-material/build.gradle +++ b/navigation-material/build.gradle @@ -74,6 +74,7 @@ dependencies { api libs.androidx.navigation.compose implementation libs.compose.foundation.foundation implementation libs.compose.material.material + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/pager-indicators/build.gradle b/pager-indicators/build.gradle index cb4f6ef0a..9d27701a9 100644 --- a/pager-indicators/build.gradle +++ b/pager-indicators/build.gradle @@ -85,6 +85,8 @@ dependencies { api project(':pager') api libs.compose.material.material + implementation libs.kotlin.coroutines.android + // ====================== // Test dependencies // ====================== diff --git a/pager/build.gradle b/pager/build.gradle index 1c25f5d27..889422fb5 100644 --- a/pager/build.gradle +++ b/pager/build.gradle @@ -86,6 +86,7 @@ dependencies { api libs.snapper implementation libs.napier + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/placeholder-material/build.gradle b/placeholder-material/build.gradle index f9724eb28..9491a2527 100644 --- a/placeholder-material/build.gradle +++ b/placeholder-material/build.gradle @@ -74,6 +74,7 @@ dependencies { implementation libs.compose.material.material api project(':placeholder') implementation libs.napier + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/placeholder/build.gradle b/placeholder/build.gradle index 178f75527..045269509 100644 --- a/placeholder/build.gradle +++ b/placeholder/build.gradle @@ -90,6 +90,7 @@ dependencies { implementation libs.compose.foundation.foundation implementation libs.compose.ui.util implementation libs.napier + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/swiperefresh/build.gradle b/swiperefresh/build.gradle index 8e9fcf9c0..2d92b1a6e 100644 --- a/swiperefresh/build.gradle +++ b/swiperefresh/build.gradle @@ -84,11 +84,11 @@ android { dependencies { implementation libs.compose.material.material implementation libs.compose.ui.util + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies // ====================== - androidTestImplementation project(':internal-testutils') testImplementation project(':internal-testutils') diff --git a/systemuicontroller/build.gradle b/systemuicontroller/build.gradle index c9575c668..04fe77d94 100644 --- a/systemuicontroller/build.gradle +++ b/systemuicontroller/build.gradle @@ -89,6 +89,7 @@ android { dependencies { implementation libs.androidx.core implementation libs.compose.ui.ui + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies diff --git a/web/build.gradle b/web/build.gradle index 772369214..9f7bb04b9 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -86,6 +86,7 @@ dependencies { implementation libs.compose.material.material implementation libs.compose.ui.util implementation libs.androidx.activity.compose + implementation libs.kotlin.coroutines.android // ====================== // Test dependencies