From 62a1d1bcb94c0a877ce855279876f07d5b6b0fb5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 May 2025 11:07:20 +0200
Subject: [PATCH] fix(deps): update android.gradle.plugin to v8.10.0 (#4687)

* fix(deps): update android.gradle.plugin to v8.10.0

* Update lint version to 8.11.0-alpha09

* Fix lint false positive.

Error: Modifier factory functions must use the receiver Modifier instance [ModifierFactoryUnreferencedReceiver from androidx.compose.ui]

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Benoit Marty <benoit@matrix.org>
---
 .../location/api/internal/ModifierCenterBottomEdge.kt     | 8 ++++----
 gradle.properties                                         | 2 +-
 gradle/libs.versions.toml                                 | 2 +-
 .../android/libraries/designsystem/modifiers/Clickable.kt | 2 +-
 .../libraries/designsystem/theme/components/ListItem.kt   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
index 747eda0bae..40112cea4f 100644
--- a/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
+++ b/features/location/api/src/main/kotlin/io/element/android/features/location/api/internal/ModifierCenterBottomEdge.kt
@@ -15,13 +15,13 @@ import androidx.compose.ui.unit.IntOffset
  * Horizontally aligns the content to the center of the space.
  * Vertically aligns the bottom edge of the content to the center of the space.
  */
-fun Modifier.centerBottomEdge(scope: BoxScope): Modifier = with(scope) {
-    then(
+fun Modifier.centerBottomEdge(scope: BoxScope): Modifier = this.then(
+    with(scope) {
         Modifier.align { size, space, _ ->
             IntOffset(
                 x = (space.width - size.width) / 2,
                 y = space.height / 2 - size.height,
             )
         }
-    )
-}
+    }
+)
diff --git a/gradle.properties b/gradle.properties
index 4a941c0143..c9789f9dff 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -40,7 +40,7 @@ signing.element.nightly.keyPassword=Secret
 
 # Customise the Lint version to use a more recent version than the one bundled with AGP
 # https://googlesamples.github.io/android-custom-lint-rules/usage/newer-lint.md.html
-android.experimental.lint.version=8.10.0-alpha08
+android.experimental.lint.version=8.11.0-alpha09
 
 # Enable test fixture for all modules by default
 android.experimental.enableTestFixtures=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1a94aa4ec1..49c8ce9422 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 # Project
-android_gradle_plugin = "8.9.2"
+android_gradle_plugin = "8.10.0"
 kotlin = "2.1.20"
 kotlinpoet = "2.1.0"
 ksp = "2.1.20-2.0.1"
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
index 3931d8d8d0..5789a4525d 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/modifiers/Clickable.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 
-fun Modifier.clickableIfNotNull(onClick: (() -> Unit)? = null): Modifier = then(
+fun Modifier.clickableIfNotNull(onClick: (() -> Unit)? = null): Modifier = this.then(
     if (onClick != null) {
         Modifier.clickable { onClick() }
     } else {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
index 426bd975a4..78195d4f98 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt
@@ -177,7 +177,7 @@ private fun Modifier.withAccessibilityModifier(
     content: ListItemContent?,
     enabled: Boolean,
     onClick: (() -> Unit)?,
-): Modifier = then(
+): Modifier = this.then(
     when (content) {
         is ListItemContent.Checkbox -> {
             Modifier.toggleable(