Skip to content

Commit 29470dd

Browse files
committed
all library update
1 parent 0fb1245 commit 29470dd

File tree

5 files changed

+39
-44
lines changed

5 files changed

+39
-44
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ xcuserdata
55
!src/**/build/
66
local.properties
77
.idea
8+
.kotlin
89
.DS_Store
910
captures
1011
.externalNativeBuild

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ plugins {
66
alias(libs.plugins.jetbrainsCompose) apply false
77
alias(libs.plugins.compose.compiler) apply false
88
alias(libs.plugins.kotlinMultiplatform) apply false
9+
alias(libs.plugins.kotlinSerialization) apply false
10+
alias(libs.plugins.sqlDelight) apply false
911
}

composeApp/build.gradle.kts

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import org.jetbrains.compose.ExperimentalComposeLibrary
21
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
32
import com.codingfeline.buildkonfig.compiler.FieldSpec
3+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
44
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
55
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
6+
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
67
import java.util.*
78

89
plugins {
@@ -11,8 +12,8 @@ plugins {
1112
alias(libs.plugins.jetbrainsCompose)
1213
alias(libs.plugins.compose.compiler)
1314
alias(libs.plugins.buildkonfig)
14-
kotlin("plugin.serialization") version "1.9.21"
15-
id("app.cash.sqldelight") version "2.0.1"
15+
alias(libs.plugins.kotlinSerialization)
16+
alias(libs.plugins.sqlDelight)
1617
}
1718

1819
kotlin {
@@ -27,9 +28,9 @@ kotlin {
2728
}
2829

2930
androidTarget {
30-
compilations.all {
31-
kotlinOptions {
32-
jvmTarget = "1.8"
31+
tasks.withType<KotlinJvmCompile>().configureEach {
32+
compilerOptions {
33+
jvmTarget.set(JvmTarget.JVM_1_8)
3334
}
3435
}
3536
}
@@ -104,12 +105,10 @@ kotlin {
104105
implementation(libs.koin.core)
105106

106107
//Ktor
107-
with(libs.ktor.client) {
108-
implementation(core)
109-
implementation(content.negotiation)
110-
implementation(serialization)
111-
api(logging)
112-
}
108+
implementation(libs.ktor.client.core)
109+
implementation(libs.ktor.client.content.negotiation)
110+
implementation(libs.ktor.client.serialization)
111+
implementation(libs.ktor.client.logging)
113112

114113
// markdown
115114
implementation(libs.multiplatform.markdown.renderer)
@@ -193,9 +192,6 @@ android {
193192
sourceCompatibility = JavaVersion.VERSION_1_8
194193
targetCompatibility = JavaVersion.VERSION_1_8
195194
}
196-
dependencies {
197-
debugImplementation(libs.compose.ui.tooling)
198-
}
199195
}
200196

201197
compose.desktop {

composeApp/src/androidMain/kotlin/com/coding/meet/gaminiaikmp/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ class MainActivity : ComponentActivity() {
1616

1717

1818
override fun onCreate(savedInstanceState: Bundle?) {
19+
installSplashScreen()
1920
super.onCreate(savedInstanceState)
2021
window.statusBarColor = borderColor.toArgb()
2122
window.navigationBarColor = borderColor.toArgb()
22-
installSplashScreen()
2323
setContent {
2424
val mainViewModel: MainViewModel = KoinPlatform.getKoin().get()
2525
onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {

gradle/libs.versions.toml

Lines changed: 24 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,40 @@
11
[versions]
2-
agp = "8.2.0"
2+
agp = "8.2.2"
33
android-compileSdk = "34"
44
android-minSdk = "24"
55
android-targetSdk = "34"
6-
androidx-activityCompose = "1.9.0"
7-
androidx-appcompat = "1.6.1"
6+
androidx-activityCompose = "1.9.2"
7+
androidx-appcompat = "1.7.0"
88
androidx-constraintlayout = "2.1.4"
99
androidx-core-ktx = "1.13.1"
10-
androidx-espresso-core = "3.5.1"
10+
androidx-espresso-core = "3.6.1"
1111
androidx-material = "1.12.0"
12-
androidx-test-junit = "1.1.5"
13-
compose = "1.5.4"
14-
compose-compiler = "1.5.6"
12+
androidx-test-junit = "1.2.1"
13+
compose = "1.7.2"
1514
coreSplashscreen = "1.0.1"
16-
koinCompose = "1.1.0"
17-
moko-mvvm = "0.16.1"
18-
kotlinx-datetime = "0.5.0"
15+
kotlinx-datetime = "0.6.0"
1916
compose-plugin = "1.6.10"
2017
junit = "4.13.2"
21-
kotlin = "2.0.0"
22-
coreI18n = "1.0.0-alpha01"
18+
kotlin = "2.0.20"
2319
mpfilepicker = "3.1.0"
24-
koin = "3.5.3"
20+
koin = "3.5.6"
21+
koinCompose = "1.1.0"
2522
multiplatformMarkdownRenderer = "0.21.0"
2623
multiplatformSettingsNoArg = "1.1.1"
2724
precomposeKoin = "1.6.0"
2825
precomposeViewmodel = "1.6.0"
2926
precompose = "1.6.0"
30-
sqldelight = "2.0.1"
27+
sqldelight = "2.0.2"
3128
appyx-navigation = "2.0.0-alpha09"
32-
ktor = "2.3.11"
33-
coroutines = "1.8.0"
34-
kermit = "2.0.2"
35-
animationAndroid = "1.5.4"
29+
ktor = "2.3.12"
30+
coroutines = "1.9.0"
31+
kermit = "2.0.4"
3632
buildkonfig = "0.15.1"
3733
kstore = "0.8.0"
3834

3935

4036
[libraries]
4137
androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
42-
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinCompose" }
4338
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
4439
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
4540
junit = { group = "junit", name = "junit", version.ref = "junit" }
@@ -51,16 +46,14 @@ androidx-material = { group = "com.google.android.material", name = "material",
5146
androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }
5247
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
5348
compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
54-
moko-mvvm = { module = "dev.icerock.moko:mvvm-compose", version.ref = "moko-mvvm" }
49+
5550
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
51+
kotlinx-coroutines = {module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref="coroutines"}
5652

5753
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
5854
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
5955
compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
6056
compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
61-
androidx-core-i18n = { group = "androidx.core", name = "core-i18n", version.ref = "coreI18n" }
62-
63-
kotlinx-coroutines = {module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref="coroutines"}
6457

6558
ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
6659
ktor-client-okhttp = {module = "io.ktor:ktor-client-android", version.ref = "ktor"}
@@ -70,7 +63,6 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
7063
ktor-client-java = {module = "io.ktor:ktor-client-java", version.ref = "ktor"}
7164
ktor-client-serialization = {module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor"}
7265
ktor-client-logging = {module = "io.ktor:ktor-client-logging", version.ref = "ktor"}
73-
7466
kermit = {module = "co.touchlab:kermit", version.ref = "kermit"}
7567

7668

@@ -80,20 +72,22 @@ multiplatform-settings-no-arg = { module = "com.russhwolf:multiplatform-settings
8072

8173
koin-android = {group = "io.insert-koin", name = "koin-android", version.ref="koin"}
8274
koin-core = {group = "io.insert-koin", name = "koin-core", version.ref="koin"}
75+
koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koinCompose" }
8376
koin-core-coroutine = {module = "io.insert-koin:koin-core-coroutines", version.ref="koin"}
8477

8578
precompose-koin = { module = "moe.tlaster:precompose-koin", version.ref = "precomposeKoin" }
8679
precompose-viewmodel = { module = "moe.tlaster:precompose-viewmodel", version.ref = "precomposeViewmodel" }
8780
precompose = { module = "moe.tlaster:precompose", version.ref = "precompose" }
81+
8882
sqldelight-coroutine-ext = {module = "app.cash.sqldelight:coroutines-extensions", version.ref = "sqldelight"}
8983
sqldelight-primitive-adapters = {module = "app.cash.sqldelight:primitive-adapters", version.ref = "sqldelight"}
90-
spotlight = { module = "com.bumble.appyx:spotlight", version.ref = "appyx-navigation" }
91-
spotlight-android = { module = "com.bumble.appyx:spotlight-android", version.ref = "appyx-navigation" }
9284
sqldelight-android-driver = {module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight"}
9385
sqldelight-native-driver = {module = "app.cash.sqldelight:native-driver", version.ref = "sqldelight"}
9486
web-worker-driver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "sqldelight" }
9587
sqlite-driver = { module = "app.cash.sqldelight:sqlite-driver", version.ref = "sqldelight" }
96-
androidx-animation-android = { group = "androidx.compose.animation", name = "animation-android", version.ref = "animationAndroid" }
88+
89+
spotlight = { module = "com.bumble.appyx:spotlight", version.ref = "appyx-navigation" }
90+
spotlight-android = { module = "com.bumble.appyx:spotlight-android", version.ref = "appyx-navigation" }
9791

9892
kstore = { module = "io.github.xxfast:kstore", version.ref = "kstore" }
9993
kstore-file = { module = "io.github.xxfast:kstore-file", version.ref = "kstore" }
@@ -105,4 +99,6 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
10599
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
106100
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
107101
buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig" }
108-
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
102+
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
103+
kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
104+
sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }

0 commit comments

Comments
 (0)