mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 03:52:18 +02:00
Code

Upgrade Kotlin to 1.7.10 and Compose Compiler to 1.3.0-rc01

Browse Source
This commit is contained in:
Patrick Goldinger 2022-07-28 15:51:57 +02:00
parent db378159d6
commit 2e74cec0db
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle.kts
View File

@ -44,9 +44,8 @@ android {
jvmTarget = "1.8"
freeCompilerArgs = listOf(
"-Xallow-result-return-type",
"-Xopt-in=kotlin.RequiresOptIn",
"-Xopt-in=kotlin.contracts.ExperimentalContracts",
"-Xjvm-default=compatibility",
"-opt-in=kotlin.contracts.ExperimentalContracts",
"-Xjvm-default=all-compatibility",
)
}

6
app/src/main/kotlin/dev/patrickgold/florisboard/ime/text/composing/HangulUnicode.kt
View File

@ -61,7 +61,7 @@ class HangulUnicode : Composer {
return Pair(0, ""+c)
}
val lastChar = s.last()
val lastOrd = lastChar.toInt()
val lastOrd = lastChar.code
if (lastChar in initials && c in medials) {
return Pair(1, "${syllable(initials.indexOf(lastChar), medials.indexOf(c), 0)}")
@ -96,9 +96,9 @@ class HangulUnicode : Composer {
return Pair(1, "${syllable(ini, medials.indexOf(tple!![1][tple[0].indexOf(c)]), 0)}")
}
} else if (lastChar in medialComp.keys && medialComp[lastChar]?.get(0)?.contains(c) == true) { // medial+final
return Pair(1, ""+ medialComp[lastChar]?.get(1)!![medialComp[lastChar]?.get(0)!!.indexOf(c)]);
return Pair(1, ""+ medialComp[lastChar]?.get(1)!![medialComp[lastChar]?.get(0)!!.indexOf(c)])
} else if (lastChar in finalComp.keys && finalComp[lastChar]?.get(0)?.contains(c) == true) { // final+final
return Pair(1, ""+ finalComp[lastChar]?.get(1)!![finalComp[lastChar]?.get(0)!!.indexOf(c)]);
return Pair(1, ""+ finalComp[lastChar]?.get(1)!![finalComp[lastChar]?.get(0)!!.indexOf(c)])
}
return Pair(0, ""+c)

3
app/src/main/kotlin/dev/patrickgold/florisboard/lib/crashutility/CrashUtility.kt
View File

@ -381,11 +381,10 @@ abstract class CrashUtility private constructor() {
private val oldHandler: WeakReference<Thread.UncaughtExceptionHandler?>,
private val ustDir: FsDir,
) : Thread.UncaughtExceptionHandler {
override fun uncaughtException(thread: Thread?, throwable: Throwable?) {
override fun uncaughtException(thread: Thread, throwable: Throwable) {
flogInfo(LogTopic.CRASH_UTILITY) {
"Detected application crash, executing custom crash handler."
}
throwable ?: return
val timestamp = System.currentTimeMillis()
val stacktrace = Log.getStackTraceString(throwable)
val ustFile = ustDir.subFile("$timestamp.$UNHANDLED_STACKTRACE_FILE_EXT")

10
gradle/libs.versions.toml
View File

@ -6,7 +6,7 @@ androidx-activity = "1.5.0"
androidx-autofill = "1.1.0"
androidx-collection = "1.2.0"
androidx-compose = "1.1.1"
androidx-compose-compiler = "1.1.1"
androidx-compose-compiler = "1.3.0-rc01"
androidx-core = "1.8.0"
androidx-core-splashscreen = "1.0.0-rc01"
androidx-emoji2 = "1.1.0"
@ -15,10 +15,10 @@ androidx-profileinstaller = "1.2.0-beta02"
androidx-room = "2.4.2"
cache4k = "0.7.0"
jetpref = "0.1.0-beta12"
kotlin = "1.6.10"
kotlinx-coroutines = "1.6.1"
kotlinx-serialization-json = "1.3.2"
ksp = "1.6.10-1.0.4"
kotlin = "1.7.10"
kotlinx-coroutines = "1.6.3"
kotlinx-serialization-json = "1.3.3"
ksp = "1.7.10-1.0.6"
mannodermaus-android-junit5 = "1.8.2.1"
mikepenz-aboutlibraries = "10.2.0"