From 4f1d19fcbd4ae827df90d3180f402373565af909 Mon Sep 17 00:00:00 2001
From: Simplxs <simplxsa@gmail.com>
Date: Sat, 24 Feb 2024 16:25:13 +0800
Subject: [PATCH] upgrade kotlin version to 1.9.22

---
 app/build.gradle.kts                           |  7 +------
 build.gradle.kts                               |  2 +-
 settings.gradle.kts                            |  2 +-
 .../java/moe/fuqiuluo/shamrock/tools/Json.kt   | 18 ++++++++----------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d78eb21..1b98640 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -92,7 +92,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.4"
+        kotlinCompilerExtensionVersion = "1.5.10"
     }
     packaging {
         jniLibs {
@@ -127,11 +127,6 @@ android {
     }
 
     configureAppSigningConfigsForRelease(project)
-    packagingOptions {
-        jniLibs {
-            useLegacyPackaging = true
-        }
-    }
 }
 
 fun configureAppSigningConfigsForRelease(project: Project) {
diff --git a/build.gradle.kts b/build.gradle.kts
index 7ffa57f..6561f5b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     id("com.android.application") version "8.2.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.20" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
     id("com.android.library") version "8.2.0" apply false
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index bdfff11..9693397 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,7 +26,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.android.tools:r8:8.2.26")
+        classpath("com.android.tools:r8:8.2.47")
     }
 }
 
diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt
index f4e1fba..6f51897 100644
--- a/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt
+++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt
@@ -46,16 +46,14 @@ val Collection<Any>.json: JsonArray
     get() {
         val arrayList = arrayListOf<JsonElement>()
         forEach {
-            if (it != null) {
-                when (it) {
-                    is JsonElement -> arrayList.add(it)
-                    is Number -> arrayList.add(it.json)
-                    is String -> arrayList.add(it.json)
-                    is Boolean -> arrayList.add(it.json)
-                    is Map<*, *> -> arrayList.add((it as Map<String, Any>).json)
-                    is Collection<*> -> arrayList.add((it as Collection<Any>).json)
-                    else -> error("unknown array type: ${it::class.java}")
-                }
+            when (it) {
+                is JsonElement -> arrayList.add(it)
+                is Number -> arrayList.add(it.json)
+                is String -> arrayList.add(it.json)
+                is Boolean -> arrayList.add(it.json)
+                is Map<*, *> -> arrayList.add((it as Map<String, Any>).json)
+                is Collection<*> -> arrayList.add((it as Collection<Any>).json)
+                else -> error("unknown array type: ${it::class.java}")
             }
         }
         return arrayList.jsonArray