From ca96931379c3d32b26c9f26872fdcb67b1181774 Mon Sep 17 00:00:00 2001
From: Ruben Sousa <ruben.sousa@joyn.de>
Date: Tue, 8 Oct 2024 15:34:41 +0200
Subject: [PATCH] Downgrade kotlin back to 1.9.25

---
 dpadrecyclerview-compose/build.gradle                    | 9 ++++++++-
 .../rubensousa/dpadrecyclerview/compose/DpadClickable.kt | 9 ++++++---
 gradle/libs.versions.toml                                | 4 ++--
 sample/build.gradle                                      | 9 ++++++++-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle
index 9e9cf420..5686d403 100644
--- a/dpadrecyclerview-compose/build.gradle
+++ b/dpadrecyclerview-compose/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.carioca.allure)
     alias(libs.plugins.maven.publish)
     id 'org.jetbrains.dokka'
@@ -41,6 +40,14 @@ android {
         jvmTarget = '1.8'
     }
 
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
+
 }
 
 dependencies {
diff --git a/dpadrecyclerview-compose/src/main/java/com/rubensousa/dpadrecyclerview/compose/DpadClickable.kt b/dpadrecyclerview-compose/src/main/java/com/rubensousa/dpadrecyclerview/compose/DpadClickable.kt
index 34ad0fac..8434034a 100644
--- a/dpadrecyclerview-compose/src/main/java/com/rubensousa/dpadrecyclerview/compose/DpadClickable.kt
+++ b/dpadrecyclerview-compose/src/main/java/com/rubensousa/dpadrecyclerview/compose/DpadClickable.kt
@@ -63,6 +63,7 @@ import kotlinx.coroutines.launch
  * and triggers a sound effect on click.
  * Workaround for: https://issuetracker.google.com/issues/268268856
  */
+@Suppress("UnnecessaryVariable")
 @Composable
 fun Modifier.dpadClickable(
     enabled: Boolean = true,
@@ -70,6 +71,8 @@ fun Modifier.dpadClickable(
     onLongClick: (() -> Unit)? = null,
     onClick: (() -> Unit)?,
 ): Modifier {
+    val clickLambda = onClick
+    val longClickLambda = onLongClick
     val context = LocalContext.current
     val audioManager = remember { context.getSystemService(Context.AUDIO_SERVICE) as? AudioManager }
     return handleDpadCenter(
@@ -92,8 +95,8 @@ fun Modifier.dpadClickable(
         }
     ).focusable(interactionSource = interactionSource)
         .semantics(mergeDescendants = true) {
-            onClick {
-                onClick?.let { action ->
+            onClick(label = null) {
+                clickLambda?.let { action ->
                     audioManager?.playSoundEffect(AudioManager.FX_KEY_CLICK)
                     action()
                     return@onClick true
@@ -101,7 +104,7 @@ fun Modifier.dpadClickable(
                 false
             }
             onLongClick {
-                onLongClick?.let { action ->
+                longClickLambda?.let { action ->
                     action()
                     return@onLongClick true
                 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0a734ae2..590e8863 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,6 +8,7 @@ androidx-appcompat = "1.7.0"
 androidx-compose-ui = "1.7.0-rc01"
 androidx-test-espresso = '3.6.1'
 androidx-test-uiautomator = '2.3.0'
+androidx-compose-compiler = '1.5.15'
 # From sample
 androidx-compose-material3 = '1.2.1'
 androidx-constraintlayout = "2.1.4"
@@ -28,7 +29,7 @@ guava = "33.1.0-android"
 timber = "5.0.1"
 
 decorator = "2.1.0"
-kotlin = "2.0.0"
+kotlin = "1.9.25"
 kover = "0.7.6"
 jacoco = "0.8.11"
 test-junit = '4.13.2'
@@ -42,7 +43,6 @@ android-application = { id = "com.android.application", version.ref = "android-g
 android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
 androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }
 jacoco = { id = "org.jacoco.core", version.ref = "jacoco" }
-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
 carioca-allure = { id = "com.rubensousa.carioca.report.allure", version.ref = "carioca-allure" }
diff --git a/sample/build.gradle b/sample/build.gradle
index 598ee057..871ae96c 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -2,7 +2,6 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.androidx.navigation.safeargs)
-    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.carioca.allure)
 }
 
@@ -40,6 +39,14 @@ android {
     buildFeatures {
         viewBinding true
     }
+
+    buildFeatures {
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+    }
 }
 
 dependencies {