Skip to content

Commit b764813

Browse files
softartdevsoftartdev
committed
update libs: kotlin 1.9.24, compose 1.6.10, etc.
1 parent fe412c5 commit b764813

15 files changed

Lines changed: 158 additions & 206 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ note_room_key_store.jks
7070
/iosApp/fastlane/28F5CB4337.json
7171
/iosApp/fastlane/ios_distribution.p12
7272
/iosApp/fastlane/NoteDelight_Distribution_Profile.mobileprovision
73+
74+
/.kotlin/

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,6 @@ import org.gradle.api.Project
44
import org.gradle.api.artifacts.VersionCatalog
55
import org.gradle.api.artifacts.VersionCatalogsExtension
66
import org.gradle.kotlin.dsl.getByType
7-
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.MAIN_COMPILATION_NAME
8-
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.Companion.TEST_COMPILATION_NAME
9-
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
10-
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.Companion.COMMON_MAIN_SOURCE_SET_NAME
11-
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet.Companion.COMMON_TEST_SOURCE_SET_NAME
12-
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetContainer
13-
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
147

158
val Project.libs
169
get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
17-
18-
//FIXME https://github.com/cashapp/sqldelight/issues/4523
19-
fun KotlinSourceSetContainer.iosIntermediateSourceSets(vararg iosTargets: KotlinNativeTarget) {
20-
val children: List<Pair<KotlinSourceSet, KotlinSourceSet>> = iosTargets.map { target ->
21-
val main = target.compilations.getByName(MAIN_COMPILATION_NAME).defaultSourceSet
22-
val test = target.compilations.getByName(TEST_COMPILATION_NAME).defaultSourceSet
23-
return@map main to test
24-
}
25-
val parent: Pair<KotlinSourceSet, KotlinSourceSet> = Pair(
26-
first = sourceSets.getByName(COMMON_MAIN_SOURCE_SET_NAME),
27-
second = sourceSets.getByName(COMMON_TEST_SOURCE_SET_NAME)
28-
)
29-
createIntermediateSourceSet("iosMain", children.map { it.first }, parent.first)
30-
createIntermediateSourceSet("iosTest", children.map { it.second }, parent.second)
31-
}
32-
33-
private fun KotlinSourceSetContainer.createIntermediateSourceSet(
34-
name: String,
35-
children: List<KotlinSourceSet>,
36-
parent: KotlinSourceSet
37-
): KotlinSourceSet = sourceSets.maybeCreate(name).apply {
38-
dependsOn(parent)
39-
children.forEach { it.dependsOn(this) }
40-
}

‎build.gradle.kts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
2-
alias(libs.plugins.gradle.convention).apply(false)
3-
alias(libs.plugins.kotlin.multiplatform).apply(false)
4-
alias(libs.plugins.kotlin.android).apply(false)
5-
alias(libs.plugins.kotlin.jvm).apply(false)
6-
alias(libs.plugins.kotlin.parcelize).apply(false)
7-
alias(libs.plugins.kotlin.cocoapods).apply(false)
8-
alias(libs.plugins.compose).apply(false)
9-
alias(libs.plugins.android.application).apply(false)
10-
alias(libs.plugins.android.library).apply(false)
11-
alias(libs.plugins.sqlDelight).apply(false)
12-
alias(libs.plugins.mokoResources).apply(false)
13-
alias(libs.plugins.gms).apply(false)
14-
alias(libs.plugins.crashlytics).apply(false)
2+
alias(libs.plugins.gradle.convention) apply false
3+
alias(libs.plugins.kotlin.multiplatform) apply false
4+
alias(libs.plugins.kotlin.android) apply false
5+
alias(libs.plugins.kotlin.jvm) apply false
6+
alias(libs.plugins.kotlin.serialization) apply false
7+
alias(libs.plugins.kotlin.cocoapods) apply false
8+
alias(libs.plugins.compose) apply false
9+
alias(libs.plugins.android.application) apply false
10+
alias(libs.plugins.android.library) apply false
11+
alias(libs.plugins.sqlDelight) apply false
12+
alias(libs.plugins.mokoResources) apply false
13+
alias(libs.plugins.gms) apply false
14+
alias(libs.plugins.crashlytics) apply false
1515
}

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ compileSdk = "34"
33
targetSdk = "34"
44
minSdk = "21"
55
jdk = "17"
6-
kotlin = "1.9.23"
7-
agp = "8.3.2"
6+
kotlin = "1.9.24"
7+
agp = "8.4.1"
88
gms = "4.4.1"
9-
crashlytics = "2.9.9"
10-
compose = "1.6.2"
11-
composeCompiler = "1.5.10"
9+
crashlytics = "3.0.1"
10+
compose = "1.6.10"
11+
composeCompiler = "1.5.14"
1212
coroutines = "1.8.0"
1313
sqlDelight = "2.0.2"
1414
androidxSqlite = "2.4.0"
@@ -18,25 +18,26 @@ iosSqlCipher = "4.5.4"
1818
sqlcipherKtnPod = "1.4.2"
1919
decompose = "2.2.2-compose-experimental"
2020
koin = "3.5.3"
21+
kotlinx-serialization = "1.6.3"
2122
kotlinx-datetime = "0.5.0"
2223
napier = "2.7.1"
23-
mokoResources = "0.24.0-alpha-5"
24-
materialThemePrefs = "0.6.5"
25-
androidxActivityCompose = "1.8.2"
26-
androidxComposeTest = "1.6.5"
24+
mokoResources = "0.24.0-beta-5"
25+
materialThemePrefs = "0.8.1"
26+
androidxActivityCompose = "1.9.0"
27+
androidxComposeTest = "1.6.7"
2728
androidxCoreSplashscreen = "1.0.1"
2829
androidxLegacySupport = "1.0.0"
2930
androidxPreference = "1.2.1"
3031
androidxMultidex = "2.0.1"
3132
androidxTracing = "1.2.0"
32-
androidxLifecycle = "2.7.0"
33+
androidxLifecycle = "2.8.0"
3334
androidxArch = "2.2.0"
3435
androidxTestExt = "1.1.5"
3536
androidxTest = "1.5.2"
3637
androidxTestOrchestrator = "1.4.2"
37-
googleAndroidMaterial = "1.11.0"
38-
firebase = "32.8.0"
39-
leakCanary = "2.13"
38+
googleAndroidMaterial = "1.12.0"
39+
firebase = "33.0.0"
40+
leakCanary = "2.14"
4041
junit = "4.13.2"
4142
mockito = "5.11.0"
4243
turbine = "1.1.0"
@@ -78,6 +79,7 @@ koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", versi
7879
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
7980
koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }
8081

82+
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
8183
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
8284

8385
napier = { module = "io.github.aakira:napier", version.ref = "napier" }
@@ -143,7 +145,7 @@ gradle-convention = { id = "com.softartdev.notedelight.buildlogic.convention", v
143145
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
144146
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
145147
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
146-
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
148+
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
147149
kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
148150
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
149151
android-application = { id = "com.android.application", version.ref = "agp" }

‎ios-compose-kit/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.softartdev.notedelight.iosIntermediateSourceSets
21
import org.gradle.internal.os.OperatingSystem
32

43
plugins {
@@ -10,7 +9,8 @@ compose {
109
kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
1110
}
1211
kotlin {
13-
iosIntermediateSourceSets(iosArm64(), iosSimulatorArm64())
12+
iosArm64()
13+
iosSimulatorArm64()
1414
applyDefaultHierarchyTemplate()
1515

1616
cocoapods {

‎ios-compose-kit/iosComposePod.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Pod::Spec.new do |spec|
4646
SCRIPT
4747
}
4848
]
49-
spec.resources = ['build/compose/ios/iosComposeKit/compose-resources']
49+
spec.resources = ['build/compose/cocoapods/compose-resources']
5050
end

‎iosApp/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
1919
:path: "../ios-compose-kit"
2020

2121
SPEC CHECKSUMS:
22-
iosComposePod: 89548faa077ccc250f44492362c2d701fb79d414
22+
iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4
2323
SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
2424

2525
PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3

‎iosApp/Pods/Local Podspecs/iosComposePod.podspec.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎iosApp/Pods/Manifest.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)