[Maintenance] removal of OptIn and Suppress

conflicts resolved
InsertKoinIO · Oct 27, 2024 · a88ec4b · a88ec4b
1 parent 580affd
commit a88ec4b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/...droid/koin-android/src/main/java/org/koin/androidx/viewmodel/ext/android/ViewModelLazy.kt b/...droid/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 <T : ViewModel> Fragment.viewModelForClass(
             scope = getKoinScope()
         )
     }
-}
+}
diff --git a/...idx-compose-navigation/src/main/java/org/koin/androidx/compose/navigation/NavViewModel.kt b/...idx-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 <reified T : ViewModel> koinNavViewModel(
     return resolveViewModel(
         T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters
     )
-}
+}
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
@@ -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 <reified T : ViewModel> koinViewModel(
     return resolveViewModel(
         T::class, viewModelStoreOwner.viewModelStore, key, extras, qualifier, scope, parameters
     )
-}
+}
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
@@ -1,17 +1,14 @@
 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
 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
@@ -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)