chore: allow internal use of deprecated APIs

kosi-libs · Jul 11, 2024 · 25bd0ad · 25bd0ad
1 parent 0af1948
commit 25bd0ad
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt b/...di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt
@@ -27,6 +27,7 @@ import org.kodein.type.generic
     ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"),
     DeprecationLevel.WARNING
 )
+@Suppress("DEPRECATION")
 public inline fun <reified VM : ViewModel> rememberViewModel(
     tag: String? = null
 ): ViewModelLazy<VM> = with(localDI()) {
@@ -59,6 +60,7 @@ public inline fun <reified VM : ViewModel> rememberViewModel(
     ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"),
     DeprecationLevel.WARNING
 )
+@Suppress("DEPRECATION")
 public inline fun <reified VM : ViewModel> viewModel(
     tag: String? = null
 ): VM = with(localDI()) {
@@ -95,6 +97,7 @@ public inline fun <reified VM : ViewModel> viewModel(
     ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"),
     DeprecationLevel.WARNING
 )
+@Suppress("DEPRECATION")
 public inline fun <reified A : Any, reified VM : ViewModel> rememberViewModel(
     tag: String? = null,
     arg: A,
@@ -138,6 +141,7 @@ public inline fun <reified A : Any, reified VM : ViewModel> rememberViewModel(
     ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"),
     DeprecationLevel.WARNING
 )
+@Suppress("DEPRECATION")
 public inline fun <reified A : Any, reified VM : ViewModel> viewModel(
     tag: String? = null,
     arg: A,

diff --git a/framework/compose/kodein-di-framework-compose/build.gradle.kts b/framework/compose/kodein-di-framework-compose/build.gradle.kts
@@ -13,13 +13,13 @@ kotlin.kodein {
 
     common.mainDependencies {
         implementation(kotlin.compose.runtime)
+        implementation(libs.jetbrains.lifecycle.viewmodel.compose)
         api(projects.kodeinDi)
     }
 
     android {
         sources.mainDependencies {
             api(projects.framework.android.kodeinDiFrameworkAndroidX)
-            implementation(libs.jetbrains.compose.viewmodel)
             implementation(libs.android.x.lifecycle.viewmodel.compose)
         }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ androidx-lifecycle = "2.7.0"
 androidx-compose = "2.7.7"
 # Compose
 jbCompose = "1.6.11"
-compose-viewmodel = "2.8.0"
+jb-lifecycle = "2.8.0"
 compose-navigation = "2.7.0-alpha07"
 compose-compiler = "2.0.0"
 compose-bom = "2024.05.00"
@@ -43,7 +43,7 @@ android-x-compose-navigation = { module = "androidx.navigation:navigation-compos
 android-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
 android-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 # Compose Multiplatform
-jetbrains-compose-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "compose-viewmodel" }
+jetbrains-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jb-lifecycle" }
 jetbrains-compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
 # KSP
 kotlinpoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinpoet" }