Move KmModuleFragment to an internal.common package

because it is klib-related and can be read only with KotlinCommonMetadata.
This commit is contained in:
Leonid Startsev
2023-04-05 17:09:03 +02:00
committed by Space Team
parent c3d363d1b8
commit 0cfe2b04f5
26 changed files with 139 additions and 134 deletions
@@ -6,6 +6,7 @@
package kotlinx.metadata.klib
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
class ChunkedKlibModuleFragmentWriteStrategy(
private val topLevelClassifierDeclarationsPerFile: Int = 64,
@@ -7,7 +7,7 @@
package kotlinx.metadata.klib
import kotlinx.metadata.KmAnnotation
import kotlinx.metadata.KmModuleFragment
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.internal.*
import kotlinx.metadata.klib.impl.*
import org.jetbrains.kotlin.library.metadata.parseModuleHeader
@@ -138,4 +138,4 @@ private fun KmModuleFragment.fqNameOrFail(): String =
fqName ?: error("Module fragment must have a fully-qualified name.")
private fun KmModuleFragment.isEmpty(): Boolean =
classes.isEmpty() && (pkg?.let { it.functions.isEmpty() && it.properties.isEmpty() && it.typeAliases.isEmpty() } ?: true)
classes.isEmpty() && (pkg?.let { it.functions.isEmpty() && it.properties.isEmpty() && it.typeAliases.isEmpty() } ?: true)
@@ -7,6 +7,8 @@
package kotlinx.metadata.klib.impl
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.internal.common.KmModuleFragmentExtensionVisitor
import kotlinx.metadata.internal.extensions.*
import kotlinx.metadata.klib.*
@@ -260,4 +262,4 @@ internal class KlibValueParameterExtension : KlibValueParameterExtensionVisitor(
require(visitor is KlibValueParameterExtensionVisitor)
annotations.forEach(visitor::visitAnnotation)
}
}
}
@@ -7,6 +7,7 @@ package kotlinx.metadata.klib.impl
import kotlinx.metadata.*
import kotlinx.metadata.internal.*
import kotlinx.metadata.internal.common.*
import kotlinx.metadata.internal.extensions.*
import kotlinx.metadata.klib.*
import org.jetbrains.kotlin.library.metadata.KlibMetadataProtoBuf
@@ -428,4 +429,4 @@ internal class KlibMetadataExtensions : MetadataExtensions {
override fun createValueParameterExtension(): KmValueParameterExtension =
KlibValueParameterExtension()
}
}
@@ -6,6 +6,7 @@
package kotlinx.metadata.klib
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.impl.klibExtensions
val KmFunction.annotations: MutableList<KmAnnotation>
@@ -114,4 +115,4 @@ var KmTypeAlias.uniqId: UniqId?
}
val KmValueParameter.annotations: MutableList<KmAnnotation>
get() = klibExtensions.annotations
get() = klibExtensions.annotations
@@ -7,6 +7,7 @@
package kotlinx.metadata.klib
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragmentExtensionVisitor
abstract class KlibFunctionExtensionVisitor : KmFunctionExtensionVisitor {
@@ -154,4 +155,4 @@ abstract class KlibValueParameterExtensionVisitor : KmValueParameterExtensionVis
companion object {
val TYPE = KmExtensionType(KlibValueParameterExtensionVisitor::class)
}
}
}