From bcfd0eb125e654a863fb55b63db072a207b383e1 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Thu, 1 Sep 2022 15:24:50 +0300
Subject: [PATCH] For #12725: Upgrade compose to 1.2.1 version.

Split versioning of compose compiler.
Enable Xjvm-default to allow inheriting from interfaces with '@JvmDefault' members
like AbstractComposeView, NestedScrollConnection.
---
 app/build.gradle                       | 2 +-
 build.gradle                           | 2 +-
 buildSrc/src/main/java/Dependencies.kt | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6a06449835..8759ccd0f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -224,7 +224,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Versions.androidx_compose
+        kotlinCompilerExtensionVersion = Versions.androidx_compose_compiler
     }
 
 }
diff --git a/build.gradle b/build.gradle
index acf1f5143e..252a28b12e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -144,7 +144,7 @@ allprojects {
         kotlinOptions.jvmTarget = "1.8"
         kotlinOptions.allWarningsAsErrors = true
         kotlinOptions.freeCompilerArgs += [
-            "-Xopt-in=kotlin.RequiresOptIn"
+            "-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable"
         ]
     }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index afc7a9cf12..6055ee6052 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -20,7 +20,8 @@ object Versions {
     const val detekt = "1.19.0"
     const val jna = "5.8.0"
 
-    const val androidx_compose = "1.1.1"
+    const val androidx_compose = "1.2.1"
+    const val androidx_compose_compiler = "1.1.1"
     const val androidx_appcompat = "1.3.0"
     const val androidx_benchmark = "1.0.0"
     const val androidx_biometric = "1.1.0"