From 1eb3e51b01b6665017a6a0054da4fa0b77f0ada9 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Wed, 10 Aug 2022 10:06:43 -0700 Subject: [PATCH 1/3] Update to Compose 1.2.1 --- gradle.properties | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index d4f8a2551..865413dbd 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.25.1-SNAPSHOT +VERSION_NAME=0.25.1 POM_DESCRIPTION=Utilities for Jetpack Compose diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2c9464cfe..1badb9287 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -compose = "1.2.0" -composeCompiler = "1.2.0" +compose = "1.2.1" +composeCompiler = "1.3.0" composesnapshot = "-" # a single character = no snapshot # gradlePlugin and lint need to be updated together From 6a4330003ebe4ae269d31a1938531417ea4d068d Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Wed, 10 Aug 2022 10:09:01 -0700 Subject: [PATCH 2/3] Update workflow to run on compose-1.2 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0dd9c5aa7..18ff4632f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,8 @@ on: branches: - main - compose-1.0 + - compose-1.1 + - compose-1.2 paths-ignore: - '**.md' pull_request: From 20bfd34ae8ebf0e20b3d039193840d271258aa15 Mon Sep 17 00:00:00 2001 From: Ben Trengrove Date: Wed, 10 Aug 2022 10:13:08 -0700 Subject: [PATCH 3/3] Upgrade to Kotlin 1.7.10 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1badb9287..7d33a4f30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ gradlePlugin = "7.3.0-beta05" lintMinCompose = "30.0.0" ktlint = "0.42.1" -kotlin = "1.7.0" +kotlin = "1.7.10" coroutines = "1.6.0" okhttp = "3.12.13" coil = "1.3.2"