diff --git a/api/build.gradle.kts b/api/build.gradle.kts index e514d723..f02d9d62 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -45,10 +45,7 @@ dependencies { implementation(platform(libs.koin.bom)) implementation(libs.bundles.koin) - //testImplementation(libs.bundles.kointest) - // I don't know why but those dependencies are unreachable when accessed directly from version catalog - testImplementation("io.insert-koin:koin-test:${libs.versions.koin.bom.get()}") - testImplementation("io.insert-koin:koin-test-junit4:${libs.versions.koin.bom.get()}") + testImplementation(libs.bundles.kointest) implementation(libs.konsumexml) implementation(libs.kotlinxmlbuilder) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4c64d4b9..4a66ad8e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -90,10 +90,7 @@ dependencies { implementation(platform(libs.koin.bom)) implementation(libs.bundles.koin) - //androidTestImplementation(libs.bundles.kointest) - // I don't know why but those dependencies are unreachable when accessed directly from version catalog - androidTestImplementation("io.insert-koin:koin-test:${libs.versions.koin.bom.get()}") - androidTestImplementation("io.insert-koin:koin-test-junit4:${libs.versions.koin.bom.get()}") + androidTestImplementation(libs.bundles.kointest) androidTestImplementation(libs.okhttp.mockserver) diff --git a/app/src/main/java/com/readrops/app/MainActivity.kt b/app/src/main/java/com/readrops/app/MainActivity.kt index 7fe65ed3..651b2b7c 100644 --- a/app/src/main/java/com/readrops/app/MainActivity.kt +++ b/app/src/main/java/com/readrops/app/MainActivity.kt @@ -34,14 +34,13 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import org.koin.androidx.compose.KoinAndroidContext -import org.koin.core.annotation.KoinExperimentalAPI import org.koin.core.component.KoinComponent import org.koin.core.component.get import org.koin.core.parameter.parametersOf class MainActivity : ComponentActivity(), KoinComponent { - @OptIn(KoinExperimentalAPI::class, ExperimentalVoyagerApi::class) + @OptIn(ExperimentalVoyagerApi::class) override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() super.onCreate(savedInstanceState) diff --git a/db/build.gradle.kts b/db/build.gradle.kts index dd08004f..0034761b 100644 --- a/db/build.gradle.kts +++ b/db/build.gradle.kts @@ -58,10 +58,7 @@ dependencies { implementation(platform(libs.koin.bom)) implementation(libs.bundles.koin) - //androidTestImplementation(libs.bundles.kointest) - // I don't know why but those dependencies are unreachable when accessed directly from version catalog - androidTestImplementation("io.insert-koin:koin-test:${libs.versions.koin.bom.get()}") - androidTestImplementation("io.insert-koin:koin-test-junit4:${libs.versions.koin.bom.get()}") + androidTestImplementation(libs.bundles.kointest) implementation(libs.bundles.coroutines) androidTestImplementation(libs.coroutines.test) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ea5e976c..ff085317 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,19 +1,19 @@ [versions] -kotlin = "2.0.0" -ksp = "2.0.0-1.0.24" -android_agp = "8.5.2" -compose_bom = "2024.09.02" +kotlin = "2.0.20" +ksp = "2.0.20-1.0.25" +android_agp = "8.6.1" +compose_bom = "2024.09.03" -voyager = "1.1.0-beta02" +voyager = "1.1.0-beta03" lifecycle = "2.8.6" coil = "2.7.0" -coroutines = "1.8.1" +coroutines = "1.9.0" room = "2.6.1" -koin-bom = "3.5.6" +koin-bom = "4.0.0" paging = "3.3.2" okhttp = "4.12.0" retrofit = "2.11.0" -about_libraries = "11.2.2" +about_libraries = "11.2.3" [plugins] ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } @@ -34,7 +34,7 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" # specify material3 version is required for gradle to find the dependency compose-material3 = { module = "androidx.compose.material3:material3", version = "1.3.0" } compose-activity = "androidx.activity:activity-compose:1.9.2" -compose-permissions = "com.google.accompanist:accompanist-permissions:0.34.0" +compose-permissions = "com.google.accompanist:accompanist-permissions:0.36.0" voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" } @@ -64,8 +64,8 @@ koin-bom = { module = "io.insert-koin:koin-bom", version.ref = "koin-bom" } koin-core = { module = "io.insert-koin:koin-core" } koin-android = { module = "io.insert-koin:koin-android" } koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose" } -koin-test = { module = "io.insert-koin:koin-test" } -koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4" } +koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin-bom" } +koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin-bom" } paging-runtime = { module = "androidx.paging:paging-runtime-ktx", version.ref = "paging" } paging-compose = { module = "androidx.paging:paging-compose", version.ref = "paging" }