From 4e9b2be5831692d75619dffea448130bd1b238a6 Mon Sep 17 00:00:00 2001 From: AbdallahMehiz Date: Sat, 8 Feb 2025 02:15:19 +0100 Subject: [PATCH] chore: bump libs --- app/build.gradle.kts | 4 +++- app/src/main/java/live/mehiz/mpvkt/App.kt | 26 +++++++++++--------- gradle/libs.versions.toml | 29 ++++++++++++----------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ae391b4..94e2829 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -123,8 +123,10 @@ dependencies { implementation(libs.mpv.lib) - implementation(libs.seeker) + implementation(platform(libs.koin.bom)) implementation(libs.bundles.koin) + + implementation(libs.seeker) implementation(libs.bundles.voyager) implementation(libs.compose.prefs) implementation(libs.bundles.about.libs) diff --git a/app/src/main/java/live/mehiz/mpvkt/App.kt b/app/src/main/java/live/mehiz/mpvkt/App.kt index 6236b32..22606ac 100644 --- a/app/src/main/java/live/mehiz/mpvkt/App.kt +++ b/app/src/main/java/live/mehiz/mpvkt/App.kt @@ -8,20 +8,24 @@ import live.mehiz.mpvkt.di.ViewModelModule import live.mehiz.mpvkt.presentation.crash.CrashActivity import live.mehiz.mpvkt.presentation.crash.GlobalExceptionHandler import org.koin.android.ext.koin.androidContext -import org.koin.core.context.startKoin +import org.koin.androix.startup.KoinStartup +import org.koin.core.annotation.KoinExperimentalAPI +import org.koin.dsl.koinConfiguration -class App : Application() { +@OptIn(KoinExperimentalAPI::class) +class App : Application(), KoinStartup { override fun onCreate() { super.onCreate() Thread.setDefaultUncaughtExceptionHandler(GlobalExceptionHandler(applicationContext, CrashActivity::class.java)) - startKoin { - androidContext(this@App) - modules( - PreferencesModule, - DatabaseModule, - FileManagerModule, - ViewModelModule, - ) - } + } + + override fun onKoinStartup() = koinConfiguration { + androidContext(this@App) + modules( + PreferencesModule, + DatabaseModule, + FileManagerModule, + ViewModelModule, + ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 13e7329..a471d37 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,12 @@ [versions] agp = "8.8.0" -kotlin = "2.1.0" +kotlin = "2.1.10" coreKtx = "1.15.0" lifecycleRuntimeKtx = "2.8.7" -composeBom = "2025.01.00" +composeBom = "2025.01.01" activityCompose = "1.10.0" -koin = "4.0.0" +koin = "4.0.2" voyager = "1.1.0-beta03" -material3Android = "1.3.1" room = "2.6.1" detekt = "1.23.7" about-libs = "11.4.0" @@ -21,9 +20,9 @@ androidx-ui = { group = "androidx.compose.ui", name = "ui" } androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" } androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" } androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" } -androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } +androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version = "1.3.1" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" } -androidx-material3-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.7.6" } +androidx-material3-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version = "1.7.7" } androidx-compose-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout-compose", version = "1.1.0" } androidx-compose-animation-graphics = { group = "androidx.compose.animation", name = "animation-graphics-android" } androidx-preferences-ktx = { group = "androidx.preference", name = "preference-ktx", version = "1.2.1" } @@ -34,10 +33,12 @@ seeker = "com.github.abdallahmehiz:seeker:2.0.1" material = "com.google.android.material:material:1.12.0" -koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } -koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } -koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin" } -koin-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" } +koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin" } +koin-core = { module = "io.insert-koin:koin-core" } +koin-android = { module = "io.insert-koin:koin-android" } +koin-compose = { module = "io.insert-koin:koin-compose" } +koin-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel" } +koin-startup = { module = "io.insert-koin:koin-androidx-startup" } voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" } @@ -48,8 +49,8 @@ room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" } room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" } room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" } -detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt"} -detekt-formatter = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt"} +detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } +detekt-formatter = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" } detekt-rules-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.4.10" } kotlinx-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.8" } @@ -62,12 +63,12 @@ about-libs-ui-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version. simple-icons = { module = "br.com.devsrsouza.compose.icons:simple-icons", version = "1.1.1" } [bundles] -koin = ["koin-core", "koin-android", "koin-compose", "koin-viewmodel"] +koin = ["koin-core", "koin-android", "koin-compose", "koin-viewmodel", "koin-startup"] voyager = ["voyager-navigator", "voyager-transitions"] about-libs = ["about-libs-core", "about-libs-ui-m3"] [plugins] -ksp = { id = "com.google.devtools.ksp", version = "2.1.0-1.0.29" } +ksp = { id = "com.google.devtools.ksp", version = "2.1.10-1.0.29" } android-application = { id = "com.android.application", version.ref = "agp" } jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }