From a88ec4beb26897159f9b20dab12f793e38b9f4ac Mon Sep 17 00:00:00 2001 From: Grzegorz Bobryk Date: Sun, 27 Oct 2024 22:33:03 +0100 Subject: [PATCH] [Maintenance] removal of OptIn and Suppress conflicts resolved --- .../koin/androidx/viewmodel/ext/android/ViewModelLazy.kt | 4 +--- .../org/koin/androidx/compose/navigation/NavViewModel.kt | 6 +++--- .../src/main/java/org/koin/androidx/compose/ViewModel.kt | 6 +++--- .../commonTest/kotlin/org/koin/core/ParameterStackTest.kt | 3 --- .../kotlin/org/koin/core/ParametersInjectionTest.kt | 3 --- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/projects/android/koin-android/src/main/java/org/koin/androidx/viewmodel/ext/android/ViewModelLazy.kt b/projects/android/koin-android/src/main/java/org/koin/androidx/viewmodel/ext/android/ViewModelLazy.kt index ae3b3202c..8fa526372 100644 --- a/projects/android/koin-android/src/main/java/org/koin/androidx/viewmodel/ext/android/ViewModelLazy.kt +++ b/projects/android/koin-android/src/main/java/org/koin/androidx/viewmodel/ext/android/ViewModelLazy.kt @@ -1,5 +1,3 @@ -@file:Suppress("DEPRECATION") - package org.koin.androidx.viewmodel.ext.android import androidx.activity.ComponentActivity @@ -64,4 +62,4 @@ fun Fragment.viewModelForClass( scope = getKoinScope() ) } -} \ No newline at end of file +} diff --git a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt index 687ce5000..5709058e4 100644 --- a/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt +++ b/projects/compose/koin-androidx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.androidx.compose.navigation import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.compose.currentKoinScope @@ -52,4 +52,4 @@ inline fun koinNavViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt index 5eed9a712..faf2db22a 100644 --- a/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt +++ b/projects/compose/koin-androidx-compose/src/main/java/org/koin/androidx/compose/ViewModel.kt @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@file:Suppress("DeprecatedCallableAddReplaceWith") package org.koin.androidx.compose import androidx.compose.runtime.Composable -import androidx.lifecycle.* +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelStoreOwner import androidx.lifecycle.viewmodel.CreationExtras import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.koin.compose.currentKoinScope @@ -52,4 +52,4 @@ inline fun koinViewModel( return resolveViewModel( T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters ) -} \ No newline at end of file +} diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParameterStackTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParameterStackTest.kt index fcede0946..9d03f624b 100644 --- a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParameterStackTest.kt +++ b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParameterStackTest.kt @@ -1,7 +1,6 @@ package org.koin.core import org.koin.Simple -import org.koin.core.annotation.KoinInternalApi import org.koin.core.logger.Level import org.koin.core.parameter.parametersOf import org.koin.dsl.koinApplication @@ -9,9 +8,7 @@ import org.koin.dsl.module import org.koin.mp.KoinPlatformTools import org.koin.mp.generateId import kotlin.test.Test -import kotlin.test.assertTrue -@OptIn(KoinInternalApi::class) class ParameterStackTest { @Test diff --git a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt index 2cfd70350..772ce9ec4 100644 --- a/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt +++ b/projects/core/koin-core/src/commonTest/kotlin/org/koin/core/ParametersInjectionTest.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.awaitAll import kotlinx.coroutines.test.TestResult import kotlinx.coroutines.test.runTest import org.koin.Simple -import org.koin.core.annotation.KoinInternalApi import org.koin.core.logger.Level import org.koin.core.module.Module import org.koin.core.module.dsl.singleOf @@ -17,7 +16,6 @@ import org.koin.dsl.module import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertNull -import kotlin.test.assertTrue class ParametersInjectionTest { @@ -61,7 +59,6 @@ class ParametersInjectionTest { ) } - @OptIn(KoinInternalApi::class) private fun ensureCanInjectParam(module1: Module) { val app = koinApplication { printLogger(Level.DEBUG)