Skip to content

Commit 3a6550b

Browse files
committed
Fix: kotlinx.serialization crashes when detecting Toybox on Android 6.0 only, due to R8 8.12 after upgrading AGP to 8.12
Signed-off-by: imknown <imknown@qq.com>
1 parent 03b4d64 commit 3a6550b

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/model/BaseInfo.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ import kotlinx.serialization.Serializable
55

66
@Keep
77
@Serializable
8-
open class BaseInfo {
9-
lateinit var version: String
10-
}
8+
class BaseInfo(val version: String)

app/src/main/java/net/imknown/android/forefrontinfo/ui/home/model/Lld.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ import kotlinx.serialization.Serializable
77
@Serializable
88
data class Lld(
99
val scheme: Int,
10+
val version: String,
1011
val android: Androids,
1112
val linux: Linuxes,
1213
val toybox: Toyboxes,
1314
val webView: WebViews
14-
) : BaseInfo() {
15+
) {
1516
companion object {
1617
const val SCHEME_VERSION = 1
1718
}
@@ -62,8 +63,9 @@ data class Lld(
6263
data class Android(
6364
val name: String,
6465
val api: String,
66+
val version: String,
6567
val phase: String? = null
66-
) : BaseInfo()
68+
)
6769

6870
// https://android.googlesource.com/platform/build/+refs
6971
// https://android.googlesource.com/platform/build/+/refs/tags/android-12.0.0_r29/core/build_id.mk
@@ -73,8 +75,9 @@ data class Lld(
7375
@Keep
7476
@Serializable
7577
data class Build(
78+
val version: String,
7679
val details: List<Detail>
77-
) : BaseInfo() {
80+
) {
7881
@Keep
7982
@Serializable
8083
data class Detail(

0 commit comments

Comments
 (0)