chore: bump dependencies

inovait · Nov 4, 2024 · ec6d58a · ec6d58a
1 parent 71ba2bf
commit ec6d58a
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 52 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
    implementation(libs.dependencyAnalysis)
    implementation(libs.keeperPlugin)
    implementation(libs.kotlin.plugin)
+   implementation(libs.kotlin.plugin.compose)
    implementation(libs.kotlinova.gradle)
    implementation(libs.moduleGraphAssert)
    implementation(libs.moshi.ir)

diff --git a/buildSrc/src/main/kotlin/android-module-commons.gradle.kts b/buildSrc/src/main/kotlin/android-module-commons.gradle.kts
@@ -18,7 +18,7 @@ commonAndroid {
    // Use default namespace for no resources, modules that use resources must override this
    namespace = "si.inova.androidarchitectureplayground.noresources"
 
-   compileSdk = 34
+   compileSdk = 35
 
    compileOptions {
       sourceCompatibility = JavaVersion.VERSION_17

diff --git a/buildSrc/src/main/kotlin/compose.gradle.kts b/buildSrc/src/main/kotlin/compose.gradle.kts
@@ -1,28 +1,18 @@
 import org.gradle.accessors.dm.LibrariesForLibs
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import util.commonAndroid
-import util.commonKotlinOptions
 
 val libs = the<LibrariesForLibs>()
 
 plugins {
    id("com.joetr.compose.guard")
+   id("org.jetbrains.kotlin.plugin.compose")
 }
 
 commonAndroid {
    buildFeatures {
       compose = true
    }
-   composeOptions {
-      kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
-   }
-   commonKotlinOptions {
-      freeCompilerArgs += listOf(
-         "-P",
-         "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=" +
-            "${rootDir.absolutePath}/config/global_compose_stable_classes.txt"
-      )
-   }
 }
 
 //region Compose Guard

diff --git a/config/libs.toml b/config/libs.toml
@@ -1,52 +1,47 @@
 [versions]
 androidGradleCacheFix = "3.0.1"
-androidGradlePlugin = "8.6.1"
-androidx-activity-compose = "1.9.2"
-androidx-benchmark = "1.3.1"
-# See https://developer.android.com/jetpack/androidx/releases/compose-kotlin
-androidx-compose-compiler = "1.5.14"
-androidx-compose-material3 = "1.3.0"
-androidx-compose-runtime = "1.7.2"
-androidx-compose-tracing = "1.0.0-beta01"
-androidx-core = "1.13.1"
+androidGradlePlugin = "8.7.2"
+androidx-activity-compose = "1.9.3"
+androidx-benchmark = "1.3.3"
+androidx-compose-material3 = "1.3.1"
+androidx-compose-runtime = "1.7.5"
+androidx-compose-tracing = "1.7.5"
+androidx-core = "1.15.0"
 androidx-core-splashscreen = "1.0.1"
 androidx-datastore = "1.1.1"
-androidx-lifecycle = "2.8.6"
+androidx-lifecycle = "2.8.7"
 androidx-perfetto = "1.0.0"
-androidx-profileInstaller = "1.4.0"
+androidx-profileInstaller = "1.4.1"
 androidx-r8 = "8.5.35"
 androidx-test-espresso = "3.6.1"
 androidx-test-ext = "1.2.1"
-androidx-test-orchestrator = "1.5.0"
+androidx-test-orchestrator = "1.5.1"
 androidx-test-runner = "1.6.2"
 androidx-test-uiautomator = "2.3.0"
-certificateTransparency = "2.5.57"
+certificateTransparency = "2.5.62"
 coil = "2.7.0"
 composeGuard = "2.3.8"
-dependencyAnalysis = "2.1.1"
+dependencyAnalysis = "2.4.2"
 desugarJdkLibs = "2.1.2"
 detekt = "1.23.7"
 detekt-compilerWarnings = "0.0.4"
-detekt-compose = "0.4.12"
+detekt-compose = "0.4.17"
 dispatch = "1.0.0-beta10"
 junit4 = "4.13.2"
-junit4-parameterinjector = "1.17"
-junit5 = "5.11.1"
+junit4-parameterinjector = "1.18"
+junit5 = "5.11.3"
 keeperPlugin = "0.16.1"
 kotest = "5.9.1"
-# @pin as Anvil is not compatible with the K2 yet. See https://github.com/square/anvil/issues/733
-kotlin = "1.9.24"
+kotlin = "2.0.21"
 kotlin-coroutines = "1.9.0"
 kotlin-immutableCollections = "0.3.8"
-kotlinova = "4.0.0-alpha01"
 kotlinInject = "0.7.2"
 kotlinInject-anvil = "0.0.5"
-# @pin until we can also update Kotlin
-ksp = "1.9.24-1.0.20"
+kotlinova = "4.0.0-alpha01"
+ksp = "2.0.21-1.0.26"
 moduleGraphAssert = "2.7.1"
 moshi = "1.15.1"
-# @pin until we can also update Kotlin
-moshi-ir = "0.26.0"
+moshi-ir = "0.28.0"
 okhttp = "4.12.0"
 okio = "3.9.1"
 orgJson = "20240303"
@@ -58,8 +53,8 @@ showkase = "1.0.3"
 simpleStack = "2.9.0"
 sqldelight = "2.0.2"
 tomlj = "1.1.1"
-turbine = "1.1.0"
-unmock-androidJar = "14-robolectric-10818077"
+turbine = "1.2.0"
+unmock-androidJar = "15-robolectric-12543294"
 unmock-plugin = "0.8.0"
 versionCatalogUpdate = "0.8.4"
 whatTheStack = "1.0.0-alpha08"
@@ -124,7 +119,13 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te
 kotlin-immutableCollections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlin-immutableCollections" }
 # Dummy entry, we don't need to actually use the stdlib explicitly, but it is used for the version checker to auto update kotlin
 kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
+kotlin-plugin-compose = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlinInject-anvil-annotations = { module = "software.amazon.lastmile.kotlin.inject.anvil:runtime-optional", version.ref = "kotlinInject-anvil" }
+kotlinInject-anvil-compiler = { module = "software.amazon.lastmile.kotlin.inject.anvil:compiler", version.ref = "kotlinInject-anvil" }
+kotlinInject-anvil-runtime = { module = "software.amazon.lastmile.kotlin.inject.anvil:runtime", version.ref = "kotlinInject-anvil" }
+kotlinInject-compiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlinInject" }
+kotlinInject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlinInject" }
 kotlinova-compose = { module = "si.inova.kotlinova:compose", version.ref = "kotlinova" }
 kotlinova-compose-androidTest = { module = "si.inova.kotlinova:compose-android-test", version.ref = "kotlinova" }
 kotlinova-core = { module = "si.inova.kotlinova:core", version.ref = "kotlinova" }
@@ -136,11 +137,6 @@ kotlinova-navigation-detekt = { module = "si.inova.kotlinova:navigation-detekt",
 kotlinova-navigation-test = { module = "si.inova.kotlinova:navigation-test", version.ref = "kotlinova" }
 kotlinova-retrofit = { module = "si.inova.kotlinova:retrofit", version.ref = "kotlinova" }
 kotlinova-retrofit-test = { module = "si.inova.kotlinova:retrofit-test", version.ref = "kotlinova" }
-kotlinInject-compiler = { module = "me.tatarka.inject:kotlin-inject-compiler-ksp", version.ref = "kotlinInject" }
-kotlinInject-runtime = { module = "me.tatarka.inject:kotlin-inject-runtime", version.ref = "kotlinInject" }
-kotlinInject-anvil-compiler = { module = "software.amazon.lastmile.kotlin.inject.anvil:compiler", version.ref = "kotlinInject-anvil" }
-kotlinInject-anvil-runtime = { module = "software.amazon.lastmile.kotlin.inject.anvil:runtime", version.ref = "kotlinInject-anvil" }
-kotlinInject-anvil-annotations = { module = "software.amazon.lastmile.kotlin.inject.anvil:runtime-optional", version.ref = "kotlinInject-anvil" }
 ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
 moduleGraphAssert = { module = "com.jraska.module.graph.assertion:plugin", version.ref = "moduleGraphAssert" }
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

diff --git a/.../ui/src/main/kotlin/si/inova/androidarchitectureplayground/post/ui/list/PostListScreen.kt b/.../ui/src/main/kotlin/si/inova/androidarchitectureplayground/post/ui/list/PostListScreen.kt
@@ -169,7 +169,7 @@ private fun ColumnScope.PostList(
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun PostListContentSuccess() {
+internal fun PostListContentSuccessPreview() {
    PreviewTheme {
       PostListContent(
          state = Outcome.Success(
@@ -189,7 +189,7 @@ internal fun PostListContentSuccess() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun PostListContentLoading() {
+internal fun PostListContentLoadingPreview() {
    PreviewTheme {
       PostListContent(
          state = Outcome.Progress(
@@ -209,7 +209,7 @@ internal fun PostListContentLoading() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun PostListContentError() {
+internal fun PostListContentErrorPreview() {
    PreviewTheme {
       PostListContent(
          state = Outcome.Error(
@@ -230,7 +230,7 @@ internal fun PostListContentError() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun PostListContentLoadingMore() {
+internal fun PostListContentLoadingMorePreview() {
    PreviewTheme {
       PostListContent(
          state = Outcome.Progress(

diff --git a/shared-resources/build.gradle.kts b/shared-resources/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-   compileSdk = 34
+   compileSdk = 35
 
    namespace = "si.inova.androidarchitectureplayground.sharedresources"
 

diff --git a/.../ui/src/main/kotlin/si/inova/androidarchitectureplayground/user/ui/list/UserListScreen.kt b/.../ui/src/main/kotlin/si/inova/androidarchitectureplayground/user/ui/list/UserListScreen.kt
@@ -169,7 +169,7 @@ private fun ColumnScope.UserList(
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun UserListContentSuccess() {
+internal fun UserListContentSuccessPreview() {
    PreviewTheme {
       UserListContent(
          state = Outcome.Success(
@@ -189,7 +189,7 @@ internal fun UserListContentSuccess() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun UserListContentLoading() {
+internal fun UserListContentLoadingPreview() {
    PreviewTheme {
       UserListContent(
          state = Outcome.Progress(
@@ -209,7 +209,7 @@ internal fun UserListContentLoading() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun UserListContentError() {
+internal fun UserListContentErrorPreview() {
    PreviewTheme {
       UserListContent(
          state = Outcome.Error(
@@ -230,7 +230,7 @@ internal fun UserListContentError() {
 @FullScreenPreviews
 @ShowkaseComposable(group = "Test")
 @Composable
-internal fun UserListContentLoadingMore() {
+internal fun UserListContentLoadingMorePreview() {
    PreviewTheme {
       UserListContent(
          state = Outcome.Progress(