From 6fbb98d64fd04d7fa0e22ab607f660f9c497e49e Mon Sep 17 00:00:00 2001 From: jinzequn Date: Thu, 23 Jan 2025 17:14:17 +0800 Subject: [PATCH] [Maintenance] remove useless NoClass, use kotlin.Nothing instead --- .../kotlin/org/koin/core/instance/ResolutionContext.kt | 4 ---- .../kotlin/org/koin/core/registry/InstanceRegistry.kt | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/ResolutionContext.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/ResolutionContext.kt index 047314cee..128494941 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/ResolutionContext.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/instance/ResolutionContext.kt @@ -15,7 +15,6 @@ */ package org.koin.core.instance -import org.koin.core.annotation.KoinInternalApi import org.koin.core.logger.Logger import org.koin.core.parameter.ParametersHolder import org.koin.core.qualifier.Qualifier @@ -36,6 +35,3 @@ class ResolutionContext( ){ val debugTag = "t:'${clazz.getFullName()}' - q:'$qualifier'" } - -@KoinInternalApi -class NoClass \ No newline at end of file diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt index 036f0b0db..1a4f15604 100644 --- a/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt +++ b/projects/core/koin-core/src/commonMain/kotlin/org/koin/core/registry/InstanceRegistry.kt @@ -22,9 +22,8 @@ import org.koin.core.definition.IndexKey import org.koin.core.definition.Kind import org.koin.core.definition._createDefinition import org.koin.core.definition.indexKey -import org.koin.core.instance.ResolutionContext import org.koin.core.instance.InstanceFactory -import org.koin.core.instance.NoClass +import org.koin.core.instance.ResolutionContext import org.koin.core.instance.ScopedInstanceFactory import org.koin.core.instance.SingleInstanceFactory import org.koin.core.module.Module @@ -91,7 +90,7 @@ class InstanceRegistry(val _koin: Koin) { } private fun createEagerInstances(instances: Collection>) { - val defaultContext = ResolutionContext(_koin.logger, _koin.scopeRegistry.rootScope, clazz = NoClass::class) + val defaultContext = ResolutionContext(_koin.logger, _koin.scopeRegistry.rootScope, clazz = Nothing::class) instances.forEach { factory -> factory.get(defaultContext) } }