From b87e880b923f65e38ecc3164ea1373d2fe7b4dcb Mon Sep 17 00:00:00 2001
From: Zongle Wang <wangzongler@gmail.com>
Date: Tue, 30 Apr 2024 10:03:35 +0800
Subject: [PATCH] Kotlin 2.0.0-RC2 (#4343)

---
 .gitignore                                          |  1 +
 build.gradle                                        | 13 +++++--------
 .../src/app/lawnchair/ui/popup/LawnchairShortcut.kt | 13 +++++++------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8a3a1b4f4d..3b2ea15e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ WallpaperPicker/.project.properties
 bin
 .idea
 .gradle
+.kotlin
 local.properties
 build
 .DS_Store
diff --git a/build.gradle b/build.gradle
index fad1535522..579755ec27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,11 @@ plugins {
     id 'com.android.library' version "8.3.2" apply false
     id 'com.android.test' version '8.3.2' apply false
     id 'androidx.baselineprofile' version '1.2.4'
-    id 'org.jetbrains.kotlin.android' version "1.9.23"
-    id 'org.jetbrains.kotlin.plugin.parcelize' version "1.9.23"
-    id 'org.jetbrains.kotlin.plugin.serialization' version "1.9.23"
-    id "com.google.devtools.ksp" version "1.9.23-1.0.20"
+    id 'org.jetbrains.kotlin.android' version "2.0.0-RC2"
+    id 'org.jetbrains.kotlin.plugin.compose' version "2.0.0-RC2"
+    id 'org.jetbrains.kotlin.plugin.parcelize' version "2.0.0-RC2"
+    id 'org.jetbrains.kotlin.plugin.serialization' version "2.0.0-RC2"
+    id "com.google.devtools.ksp" version "2.0.0-RC1-1.0.20"
     id 'com.google.protobuf' version "0.9.4"
     id 'app.cash.licensee' version "1.11.0"
     id 'dev.rikka.tools.refine' version "4.4.0"
@@ -165,10 +166,6 @@ android {
         resValues true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.12"
-    }
-
     final def keystorePropertiesFile = rootProject.file("keystore.properties")
     def releaseSigning = signingConfigs.debug
     if (keystorePropertiesFile.exists()) {
diff --git a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
index 3c04d21d60..6f4c5dede8 100644
--- a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
+++ b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
@@ -35,13 +35,14 @@ class LawnchairShortcut {
 
     companion object {
 
-        val CUSTOMIZE: SystemShortcut.Factory<LawnchairLauncher?> = SystemShortcut.Factory<LawnchairLauncher?> { activity, itemInfo, originalView ->
-            if (PreferenceManager2.getInstance(activity).lockHomeScreen.firstBlocking()) {
-                null
-            } else {
-                getAppInfo(activity, itemInfo)?.let { Customize(activity, it, itemInfo, originalView) }
+        val CUSTOMIZE =
+            SystemShortcut.Factory { activity: LawnchairLauncher, itemInfo, originalView ->
+                if (PreferenceManager2.getInstance(activity).lockHomeScreen.firstBlocking()) {
+                    null
+                } else {
+                    getAppInfo(activity, itemInfo)?.let { Customize(activity, it, itemInfo, originalView) }
+                }
             }
-        }
 
         private fun getAppInfo(launcher: LawnchairLauncher, itemInfo: ItemInfo): ModelAppInfo? {
             if (itemInfo is ModelAppInfo) return itemInfo