From db87bf3d1e3db6258c9cddee679472bff324fe88 Mon Sep 17 00:00:00 2001 From: Romain Boisselle Date: Mon, 2 Dec 2024 15:08:29 +0100 Subject: [PATCH] chore: revert deprecation on Jetpack Compose APIs. --- build.gradle.kts | 2 +- .../kotlin/org/kodein/di/compose/android/viewModel.kt | 6 ------ .../kotlin/org/kodein/di/compose/viewModel.kt | 10 ---------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fed3e1a6..7b2b8834 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,5 +5,5 @@ plugins { allprojects { group = "org.kodein.di" - version = "7.23.0" + version = "7.23.1" } diff --git a/framework/compose/kodein-di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt b/framework/compose/kodein-di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt index 1f9845e4..0980837b 100644 --- a/framework/compose/kodein-di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt +++ b/framework/compose/kodein-di-framework-android-x-compose/src/main/kotlin/org/kodein/di/compose/android/viewModel.kt @@ -86,12 +86,6 @@ public inline fun viewModel( * @throws DI.DependencyLoopException If the value construction triggered a dependency loop. */ @Composable -@Deprecated( - message = "Use the new Compose Multiplatform rememberViewModel instead from Kodein Framework Compose", - ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"), - DeprecationLevel.WARNING -) -@Suppress("DEPRECATION") public inline fun rememberViewModel( tag: String? = null, arg: A, diff --git a/framework/compose/kodein-di-framework-compose/src/androidMain/kotlin/org/kodein/di/compose/viewModel.kt b/framework/compose/kodein-di-framework-compose/src/androidMain/kotlin/org/kodein/di/compose/viewModel.kt index 44ed42d8..6edc2dfb 100644 --- a/framework/compose/kodein-di-framework-compose/src/androidMain/kotlin/org/kodein/di/compose/viewModel.kt +++ b/framework/compose/kodein-di-framework-compose/src/androidMain/kotlin/org/kodein/di/compose/viewModel.kt @@ -21,11 +21,6 @@ import org.kodein.di.instance * @throws DI.DependencyLoopException If the value construction triggered a dependency loop. */ @Composable -@Deprecated( - message = "Use the new Compose Multiplatform rememberViewModel instead", - ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"), - DeprecationLevel.WARNING -) public inline fun rememberViewModel(tag: Any? = null): ViewModelLazy = with(localDI()) { val viewModelStoreOwner = LocalViewModelStoreOwner.current ?: error("") @@ -57,11 +52,6 @@ public inline fun rememberViewModel(tag: Any? = null): * @throws DI.DependencyLoopException If the value construction triggered a dependency loop. */ @Composable -@Deprecated( - message = "Use the new Compose Multiplatform rememberViewModel instead", - ReplaceWith("rememberViewModel", "org.kodein.di.compose.viewmodel"), - DeprecationLevel.WARNING -) public inline fun rememberViewModel(tag: Any? = null, arg: A): ViewModelLazy = with(localDI()) { val viewModelStoreOwner = LocalViewModelStoreOwner.current ?: error("")