diff --git a/build.gradle.kts b/build.gradle.kts index 21b58313..4ccf9537 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -63,6 +63,7 @@ subprojects { } plugins.withType { configure { + // 32 requires a higher android plugin version compileSdkVersion(31) defaultConfig { minSdk = 21 diff --git a/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt index 03b69a1e..731c6302 100644 --- a/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt +++ b/core/src/androidMain/kotlin/ca/gosyer/jui/core/prefs/AndroidPreferenceAdapters.kt @@ -17,7 +17,7 @@ import kotlinx.serialization.modules.SerializersModule internal object StringAdapter : AndroidPreference.Adapter { override fun get(key: String, preferences: ObservableSettings): String { - return preferences.getString(key) // Not called unless key is present. + return preferences.getString(key, "") // Not called unless key is present. } override fun set(key: String, value: String, editor: ObservableSettings) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 068c68f3..b3558462 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] # Kotlin kotlin = "1.6.10" -coroutines = "1.6.1" +coroutines = "1.6.3" # Serialization -json = "1.3.2" +json = "1.3.3" # Compose composeGradle = "1.1.1" @@ -16,13 +16,13 @@ materialDialogs = "0.7.1" # Android androidGradle = "7.0.4" -core = "1.7.0" -appCompat = "1.6.0-alpha03" -activityCompose = "1.4.0" +core = "1.8.0" +appCompat = "1.6.0-alpha04" # alpha5+ requires android 32 +activityCompose = "1.5.0" work = "2.7.1" # Android Lifecycle -lifecycle = "2.5.0-beta01" +lifecycle = "2.5.0" # 2.6.0 alpha+ requires android 32 # Swing darklaf = "3.0.0" @@ -32,42 +32,42 @@ ksp = "1.6.10-1.0.4" kotlinInject = "0.4.1" # Network -ktor = "2.0.1" +ktor = "2.0.3" # Logging slf4j = "1.7.36" slf4jAndroid = "1.7.36-0" -log4j = "2.17.2" +log4j = "2.18.0" kmlogging = "1.2.0" # Storage -okio = "3.0.0" +okio = "3.0.0" # 3.1.0+ requires Kotlin 1.6.21+ appDirs = "1.2.1" # Preferences -multiplatformSettings = "0.8.1" +multiplatformSettings = "0.8.1" # 0.9+ requires Kotlin 1.6.21+ # Utility kroki = "1.22" -desugarJdkLibs = "1.1.5" -aboutLibraries = "10.1.0" +desugarJdkLibs = "1.1.6" # 1.2.0+ requires Android plugin 7.3 alpha +aboutLibraries = "10.3.1" dateTime = "0.3.2" # Localization -moko = "0.19.1" +moko = "0.20.1" # BuildConfigs buildconfig = "3.0.3" -buildkonfig = "0.11.0" +buildkonfig = "0.11.0" # 0.11.0+ requires Kotlin 1.7.0+ # Linter -kotlinter = "3.9.0" +kotlinter = "3.9.0" # 3.10.0+ requires Kotlin 1.7.0+ # Version updates versions = "0.42.0" # Optimizer -proguard = "7.2.1" +proguard = "7.2.2" [libraries] # Kotlin