diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 12263b8..f78cde6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,7 +13,7 @@ val buildTag = System.getenv("GITHUB_RUN_NUMBER") ?: DateTimeFormatter.ISO_LOCAL android { namespace = "cloud.mike.divelog" - compileSdk = 33 + compileSdk = 34 signingConfigs { create("release") { @@ -27,7 +27,7 @@ android { defaultConfig { applicationId = "cloud.mike.divelog" minSdk = 26 - targetSdk = 33 + targetSdk = 34 versionCode = versionCodeProp versionName = "$versionNameProp+$buildTag" archivesName.set("divelog-$versionName") @@ -56,7 +56,7 @@ android { composeOptions { // Compose (https://developer.android.com/jetpack/androidx/releases/compose-kotlin) - kotlinCompilerExtensionVersion = "1.5.1" + kotlinCompilerExtensionVersion = "1.5.4" } kotlin { @@ -75,23 +75,23 @@ dependencies { implementation(project(":data")) // Dependency Injection (https://insert-koin.io/) - implementation("io.insert-koin:koin-android:3.4.3") - implementation("io.insert-koin:koin-androidx-compose:3.4.6") + implementation("io.insert-koin:koin-android:3.5.0") + implementation("io.insert-koin:koin-androidx-compose:3.5.0") // ViewModel Scoping (https://github.com/sebaslogen/resaca) - implementation("com.github.sebaslogen.resaca:resaca:2.4.5") + implementation("com.github.sebaslogen.resaca:resaca:3.0.0") // AndroidX (https://developer.android.com/jetpack/androidx/versions) - implementation("androidx.core:core-ktx:1.10.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.1") - implementation("androidx.activity:activity-compose:1.7.2") - implementation("androidx.navigation:navigation-compose:2.6.0") + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.6.2") + implementation("androidx.activity:activity-compose:1.8.0") + implementation("androidx.navigation:navigation-compose:2.7.5") implementation("androidx.core:core-splashscreen:1.0.1") - implementation("androidx.paging:paging-compose:3.2.0") + implementation("androidx.paging:paging-compose:3.2.1") // Compose (https://developer.android.com/jetpack/compose/bom/bom-mapping) - implementation(platform("androidx.compose:compose-bom:2023.06.01")) + implementation(platform("androidx.compose:compose-bom:2023.10.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-tooling-preview") debugImplementation("androidx.compose.ui:ui-tooling") @@ -107,5 +107,5 @@ dependencies { testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test") testImplementation("org.mockito:mockito-inline:5.2.0") testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0") - testImplementation("androidx.paging:paging-testing:3.2.0") + testImplementation("androidx.paging:paging-testing:3.2.1") } diff --git a/bluetooth/build.gradle.kts b/bluetooth/build.gradle.kts index 3fdac46..26e1b99 100644 --- a/bluetooth/build.gradle.kts +++ b/bluetooth/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "cloud.mike.divelog.bluetooth" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 @@ -20,7 +20,7 @@ android { dependencies { // Dependency Injection - implementation("io.insert-koin:koin-android:3.4.3") + implementation("io.insert-koin:koin-android:3.5.0") // Coroutines + Rx api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3") diff --git a/build.gradle.kts b/build.gradle.kts index b3e6458..f5d092b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,11 @@ plugins { id("com.android.library") version "8.1.3" apply false // Kotlin (https://kotlinlang.org/docs/releases.html#release-details) - id("org.jetbrains.kotlin.android") version "1.9.0" apply false - id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false + id("org.jetbrains.kotlin.android") version "1.9.20" apply false + id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false // Detekt (https://github.com/detekt/detekt#requirements) - id("io.gitlab.arturbosch.detekt") version "1.23.1" + id("io.gitlab.arturbosch.detekt") version "1.23.3" } // Use detekt in all modules @@ -19,6 +19,6 @@ subprojects { config.setFrom("${project.rootDir}/detekt.yml") } dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1") // ktlint rules + detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.3") // ktlint rules } } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 37605da..04b6a30 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -5,7 +5,7 @@ plugins { android { namespace = "cloud.mike.divelog.data" - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 26 @@ -24,10 +24,10 @@ dependencies { implementation(project(":bluetooth")) // Dependency Injection - implementation("io.insert-koin:koin-android:3.4.3") + implementation("io.insert-koin:koin-android:3.5.0") // Paging - api("androidx.paging:paging-runtime-ktx:3.2.0") + api("androidx.paging:paging-runtime-ktx:3.2.1") // Testing testImplementation("junit:junit:4.13.2")