From 7cfd932661f195c3d79dacb677efb999bfc86744 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 28 Mar 2023 08:48:42 +0000
Subject: [PATCH 1/4] Update dependency com.bumble.appyx:core to v1.1.0

---
 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 3bac7e6cca..aef5b46dab 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -38,7 +38,7 @@ datetime = "0.4.0"
 serialization_json = "1.5.0"
 showkase = "1.0.0-beta17"
 jsoup = "1.15.4"
-appyx = "1.0.5"
+appyx = "1.1.0"
 dependencycheck = "8.2.1"
 stem = "2.3.0"
 sqldelight = "1.5.5"

From 2c1d3ecdc1e69c56bae958c12b4d9c0969169a3e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 19:44:28 +0000
Subject: [PATCH 2/4] Update activity to v1.7.0

---
 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 aef5b46dab..b961a34c0c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ datastore = "1.0.0"
 constraintlayout = "2.1.4"
 recyclerview = "1.3.0"
 lifecycle = "2.5.1"
-activity = "1.6.1"
+activity = "1.7.0"
 startup = "1.1.1"
 
 # Compose

From a24d0c34e878c38523183235b9940b77a69dc160 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 22 Mar 2023 19:44:38 +0000
Subject: [PATCH 3/4] Update lifecycle to v2.6.1

---
 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 b961a34c0c..03828707b6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ corektx = "1.9.0"
 datastore = "1.0.0"
 constraintlayout = "2.1.4"
 recyclerview = "1.3.0"
-lifecycle = "2.5.1"
+lifecycle = "2.6.1"
 activity = "1.7.0"
 startup = "1.1.1"
 

From fe4a11b623bdafbcad2758f4b8dd06e3d8908362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= <jorgem@element.io>
Date: Tue, 28 Mar 2023 13:01:41 +0200
Subject: [PATCH 4/4] Fix tests using new OnBackPressedDispatcherOwner API

---
 .../io/element/android/tests/uitests/ScreenshotTest.kt      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt
index 27f29a0e8f..db9ad3ede2 100644
--- a/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt
+++ b/tests/uitests/src/test/kotlin/io/element/android/tests/uitests/ScreenshotTest.kt
@@ -32,6 +32,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalInspectionMode
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.Density
+import androidx.lifecycle.Lifecycle
 import app.cash.paparazzi.Paparazzi
 import com.airbnb.android.showkase.models.Showkase
 import com.google.testing.junit.testparameterinjector.TestParameter
@@ -95,9 +96,8 @@ class ScreenshotTest {
                 },
                 // Needed so that UI that uses it don't crash during screenshot tests
                 LocalOnBackPressedDispatcherOwner provides object : OnBackPressedDispatcherOwner {
-                    override fun getLifecycle() = lifecycleOwner.lifecycle
-
-                    override fun getOnBackPressedDispatcher() = OnBackPressedDispatcher()
+                    override val lifecycle: Lifecycle get() = lifecycleOwner.lifecycle
+                    override val onBackPressedDispatcher: OnBackPressedDispatcher get() = OnBackPressedDispatcher()
                 }
             ) {
                 ElementTheme {