shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade kotlin version to 1.9.22

Browse Source
This commit is contained in:
Simplxs 2024-02-24 16:25:13 +08:00
parent 9a85e4d537
commit 4f1d19fcbd
No known key found for this signature in database
GPG Key ID: E23537FF14DD6507
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle.kts
View File

@ -92,7 +92,7 @@ android {
compose = true compose = true
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion = "1.5.4" kotlinCompilerExtensionVersion = "1.5.10"
} }
packaging { packaging {
jniLibs { jniLibs {
@ -127,11 +127,6 @@ android {
} }
configureAppSigningConfigsForRelease(project) configureAppSigningConfigsForRelease(project)
packagingOptions {
jniLibs {
useLegacyPackaging = true
}
}
} }
fun configureAppSigningConfigsForRelease(project: Project) { fun configureAppSigningConfigsForRelease(project: Project) {

2
build.gradle.kts
View File

@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.2.0" apply false 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 id("com.android.library") version "8.2.0" apply false
} }

2
settings.gradle.kts
View File

@ -26,7 +26,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath("com.android.tools:r8:8.2.26") classpath("com.android.tools:r8:8.2.47")
} }
} }

18
xposed/src/main/java/moe/fuqiuluo/shamrock/tools/Json.kt
View File

@ -46,16 +46,14 @@ val Collection<Any>.json: JsonArray
get() { get() {
val arrayList = arrayListOf<JsonElement>() val arrayList = arrayListOf<JsonElement>()
forEach { forEach {
if (it != null) { when (it) {
when (it) { is JsonElement -> arrayList.add(it)
is JsonElement -> arrayList.add(it) is Number -> arrayList.add(it.json)
is Number -> arrayList.add(it.json) is String -> arrayList.add(it.json)
is String -> arrayList.add(it.json) is Boolean -> arrayList.add(it.json)
is Boolean -> arrayList.add(it.json) is Map<*, *> -> arrayList.add((it as Map<String, Any>).json)
is Map<*, *> -> arrayList.add((it as Map<String, Any>).json) is Collection<*> -> arrayList.add((it as Collection<Any>).json)
is Collection<*> -> arrayList.add((it as Collection<Any>).json) else -> error("unknown array type: ${it::class.java}")
else -> error("unknown array type: ${it::class.java}")
}
} }
} }
return arrayList.jsonArray return arrayList.jsonArray