From c6c2c609efe8449b769e9d559c2d0d22eea1334b Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Tue, 20 Jun 2023 16:25:58 +0100 Subject: [PATCH 1/2] Update compose Bom to 2023.05.01 (1.4.3) and androidx.activity.activity-compose --- gradle/libs.versions.toml | 4 ++-- .../com/bumble/appyx/interop/ribs/InteropBackPressHandler.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a565ac8b1..91fa9554f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ accompanist = "0.28.0" androidx-lifecycle = "2.6.1" androidx-navigation-compose = "2.5.1" coil = "2.2.1" -composeBom = "2023.01.00" +composeBom = "2023.05.01" composeCompiler = "1.4.4" ribs = "0.39.0" mvicore = "1.2.6" @@ -19,7 +19,7 @@ detekt = "1.22.0" dependencyAnalysis = "1.13.1" [libraries] -androidx-activity-compose = "androidx.activity:activity-compose:1.3.1" +androidx-activity-compose = "androidx.activity:activity-compose:1.7.2" androidx-appcompat = "androidx.appcompat:appcompat:1.3.1" androidx-arch-core-testing = "androidx.arch.core:core-testing:2.1.0" androidx-core = "androidx.core:core-ktx:1.9.0" diff --git a/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropBackPressHandler.kt b/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropBackPressHandler.kt index b269149c0..c6213419b 100644 --- a/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropBackPressHandler.kt +++ b/libraries/interop-ribs/src/main/kotlin/com/bumble/appyx/interop/ribs/InteropBackPressHandler.kt @@ -40,7 +40,7 @@ internal class InteropBackPressHandler : override val lifecycle: Lifecycle get() = nodeLifecycle - override fun getOnBackPressedDispatcher(): OnBackPressedDispatcher = - dispatcher + override val onBackPressedDispatcher: OnBackPressedDispatcher + get() = dispatcher } From 0a5c592bc1d9db1530fe0ae3e2e2a1ad72464e08 Mon Sep 17 00:00:00 2001 From: andreykovalev Date: Tue, 20 Jun 2023 16:28:57 +0100 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 43b200667..bef1368f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Pending changes - [#425](https://github.com/bumble-tech/appyx/pull/425) – **Fixed**: Up navigation should be properly propagated from Appyx to RIBs +- [#384](https://github.com/bumble-tech/appyx/issues/384) – **Updated**: Compose BOM version and activity-compose version ---