From 8880c475fb2c1a4a16ca1eca1e8250685b7ee976 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Fri, 9 Dec 2022 22:22:14 +0800
Subject: [PATCH] Use bom to manage Compose versions (#3156)

https://android-developers.googleblog.com/2022/10/whats-new-in-jetpack-compose.html
https://developer.android.com/jetpack/androidx/releases/compose
---
 build.gradle | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index ee945e96a4..ab000e6be0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -106,8 +106,6 @@ allprojects {
 
 // todo remove ext block after migrating to version catalog
 ext {
-    compose_version = '1.3.1'
-    compose_compiler_version = "1.3.2"
     accompanist_version = '0.28.0'
     libsu_version = '5.0.3'
     protocVersion = '3.21.11'
@@ -161,7 +159,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = compose_compiler_version
+        kotlinCompilerExtensionVersion = "1.3.2"
     }
 
     final def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -356,15 +354,15 @@ dependencies {
     implementation 'com.github.ChickenHook:RestrictionBypass:2.2'
     implementation 'dev.rikka.tools.refine:runtime:3.1.1'
 
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "androidx.compose.ui:ui-text-google-fonts:$compose_version"
-    implementation "androidx.compose.foundation:foundation:$compose_version"
-    implementation "androidx.compose.material:material-icons-extended:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
+    implementation platform("androidx.compose:compose-bom:2022.12.00")
+    implementation "androidx.compose.ui:ui"
+    implementation "androidx.compose.ui:ui-tooling"
+    implementation "androidx.compose.ui:ui-text-google-fonts"
+    implementation "androidx.compose.foundation:foundation"
+    implementation "androidx.compose.material:material-icons-extended"
+    implementation "androidx.compose.material:material"
+    implementation "androidx.compose.runtime:runtime-livedata"
     implementation "androidx.compose.material3:material3:1.1.0-alpha02"
-    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-    implementation "androidx.compose.compiler:compiler:$compose_compiler_version"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.activity:activity-compose:1.6.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"