update libs: kotlin 1.9.24, compose 1.6.10, etc.

.gitignore

@@ -70,3 +70,5 @@ note_room_key_store.jks
 /iosApp/fastlane/28F5CB4337.json
 /iosApp/fastlane/ios_distribution.p12
 /iosApp/fastlane/NoteDelight_Distribution_Profile.mobileprovision
+
+/.kotlin/

build-logic/convention/src/main/kotlin/com/softartdev/notedelight/ProjectExtensions.kt

@@ -4,37 +4,6 @@ import org.gradle.api.Project
 import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
-import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPILATION_NAME
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.Companion.COMMON_MAIN_SOURCE_SET_NAME
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.Companion.COMMON_TEST_SOURCE_SET_NAME
-import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetContainer
-import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 val Project.libs
     get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
-
-//FIXME https://github.com/cashapp/sqldelight/issues/4523
-fun KotlinSourceSetContainer.iosIntermediateSourceSets(vararg iosTargets: KotlinNativeTarget) {
-    val children: List<Pair<KotlinSourceSet, KotlinSourceSet>> = iosTargets.map { target ->
-        val main = target.compilations.getByName(MAIN_COMPILATION_NAME).defaultSourceSet
-        val test = target.compilations.getByName(TEST_COMPILATION_NAME).defaultSourceSet
-        return@map main to test
-    }
-    val parent: Pair<KotlinSourceSet, KotlinSourceSet> = Pair(
-        first = sourceSets.getByName(COMMON_MAIN_SOURCE_SET_NAME),
-        second = sourceSets.getByName(COMMON_TEST_SOURCE_SET_NAME)
-    )
-    createIntermediateSourceSet("iosMain", children.map { it.first }, parent.first)
-    createIntermediateSourceSet("iosTest", children.map { it.second }, parent.second)
-}
-
-private fun KotlinSourceSetContainer.createIntermediateSourceSet(
-    name: String,
-    children: List<KotlinSourceSet>,
-    parent: KotlinSourceSet
-): KotlinSourceSet = sourceSets.maybeCreate(name).apply {
-    dependsOn(parent)
-    children.forEach { it.dependsOn(this) }
-}

build.gradle.kts

@@ -1,15 +1,15 @@
 plugins {
-    alias(libs.plugins.gradle.convention).apply(false)
-    alias(libs.plugins.kotlin.multiplatform).apply(false)
-    alias(libs.plugins.kotlin.android).apply(false)
-    alias(libs.plugins.kotlin.jvm).apply(false)
-    alias(libs.plugins.kotlin.parcelize).apply(false)
-    alias(libs.plugins.kotlin.cocoapods).apply(false)
-    alias(libs.plugins.compose).apply(false)
-    alias(libs.plugins.android.application).apply(false)
-    alias(libs.plugins.android.library).apply(false)
-    alias(libs.plugins.sqlDelight).apply(false)
-    alias(libs.plugins.mokoResources).apply(false)
-    alias(libs.plugins.gms).apply(false)
-    alias(libs.plugins.crashlytics).apply(false)
+    alias(libs.plugins.gradle.convention) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.jvm) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.kotlin.cocoapods) apply false
+    alias(libs.plugins.compose) apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.sqlDelight) apply false
+    alias(libs.plugins.mokoResources) apply false
+    alias(libs.plugins.gms) apply false
+    alias(libs.plugins.crashlytics) apply false
 }

gradle/libs.versions.toml

@@ -3,12 +3,12 @@ compileSdk = "34"
 targetSdk = "34"
 minSdk = "21"
 jdk = "17"
-kotlin = "1.9.23"
-agp = "8.3.2"
+kotlin = "1.9.24"
+agp = "8.4.1"
 gms = "4.4.1"
-crashlytics = "2.9.9"
-compose = "1.6.2"
-composeCompiler = "1.5.10"
+crashlytics = "3.0.1"
+compose = "1.6.10"
+composeCompiler = "1.5.14"
 coroutines = "1.8.0"
 sqlDelight = "2.0.2"
 androidxSqlite = "2.4.0"
@@ -18,25 +18,26 @@ iosSqlCipher = "4.5.4"
 sqlcipherKtnPod = "1.4.2"
 decompose = "2.2.2-compose-experimental"
 koin = "3.5.3"
+kotlinx-serialization = "1.6.3"
 kotlinx-datetime = "0.5.0"
 napier = "2.7.1"
-mokoResources = "0.24.0-alpha-5"
-materialThemePrefs = "0.6.5"
-androidxActivityCompose = "1.8.2"
-androidxComposeTest = "1.6.5"
+mokoResources = "0.24.0-beta-5"
+materialThemePrefs = "0.8.1"
+androidxActivityCompose = "1.9.0"
+androidxComposeTest = "1.6.7"
 androidxCoreSplashscreen = "1.0.1"
 androidxLegacySupport = "1.0.0"
 androidxPreference = "1.2.1"
 androidxMultidex = "2.0.1"
 androidxTracing = "1.2.0"
-androidxLifecycle = "2.7.0"
+androidxLifecycle = "2.8.0"
 androidxArch = "2.2.0"
 androidxTestExt = "1.1.5"
 androidxTest = "1.5.2"
 androidxTestOrchestrator = "1.4.2"
-googleAndroidMaterial = "1.11.0"
-firebase = "32.8.0"
-leakCanary = "2.13"
+googleAndroidMaterial = "1.12.0"
+firebase = "33.0.0"
+leakCanary = "2.14"
 junit = "4.13.2"
 mockito = "5.11.0"
 turbine = "1.1.0"
@@ -78,6 +79,7 @@ koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", versi
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }
 
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 
 napier = { module = "io.github.aakira:napier", version.ref = "napier" }
@@ -143,7 +145,7 @@ gradle-convention = { id = "com.softartdev.notedelight.buildlogic.convention", v
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 compose = { id = "org.jetbrains.compose", version.ref = "compose" }
 android-application = { id = "com.android.application", version.ref = "agp" }

ios-compose-kit/build.gradle.kts

@@ -1,4 +1,3 @@
-import com.softartdev.notedelight.iosIntermediateSourceSets
 import org.gradle.internal.os.OperatingSystem
 
 plugins {
@@ -10,7 +9,8 @@ compose {
     kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
 }
 kotlin {
-    iosIntermediateSourceSets(iosArm64(), iosSimulatorArm64())
+    iosArm64()
+    iosSimulatorArm64()
     applyDefaultHierarchyTemplate()
 
     cocoapods {

ios-compose-kit/iosComposePod.podspec

@@ -46,5 +46,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['build/compose/ios/iosComposeKit/compose-resources']
+    spec.resources = ['build/compose/cocoapods/compose-resources']
 end

iosApp/Podfile.lock

@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
     :path: "../ios-compose-kit"
 
 SPEC CHECKSUMS:
-  iosComposePod: 89548faa077ccc250f44492362c2d701fb79d414
+  iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4
   SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
 
 PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3