Change kotlinx- to kotlin- in kotlin-metadata-jvm and related projects

Change package, artifact group, artifact name, and Gradle module name to
kotlin-metadata and kotlin-metadata-jvm, respectively.

In Kotlin 2.0, kotlin-metadata-jvm library is promoted to stable, and is
a part of Kotlin distribution now.

Note that kotlinx-metadata-klib is left with org.jetbrains.kotlinx group, artifact name and package
because -klib part is considered not stable and for internal use. Since it is still published via Sonatype,
it should have kotlinx group. Therefore, it will have both classes from kotlin.metadata and kotlinx.metadata packages. This is not a problem, because we already had kotlinx.metadata split package between -jvm and -klib before.

#KT-63219 Fixed
This commit is contained in:
Leonid Startsev
2023-11-29 17:48:43 +01:00
committed by Space Team
parent c78d3edd24
commit 09e89db82f
138 changed files with 2070 additions and 2049 deletions
@@ -75,4 +75,4 @@ tasks {
systemProperty("konan.home", project.project(":kotlin-native").projectDir)
environment["LIBCLANG_DISABLE_CRASH_RECOVERY"] = "1"
}
}
}
@@ -207,4 +207,4 @@ class StubIrDriver(
out("}")
}
}
}
}
@@ -4,9 +4,11 @@
*/
package org.jetbrains.kotlin.native.interop.gen
import kotlinx.metadata.*
import kotlinx.metadata.klib.KlibEnumEntry
import kotlinx.metadata.klib.KlibModuleMetadata
import kotlin.metadata.*
import kotlinx.metadata.klib.*
import kotlinx.metadata.internal.common.*
import kotlin.metadata.internal.common.*
import org.jetbrains.kotlin.metadata.serialization.Interner
import org.jetbrains.kotlin.utils.addIfNotNull
@@ -4,8 +4,8 @@
*/
package org.jetbrains.kotlin.native.interop.gen.jvm
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.KlibModuleFragmentWriteStrategy
import kotlinx.metadata.klib.KlibModuleMetadata
import kotlinx.metadata.klib.className
@@ -24,17 +24,17 @@ import org.jetbrains.kotlin.library.metadata.KlibMetadataVersion
import java.util.*
fun createInteropLibrary(
metadata: KlibModuleMetadata,
outputPath: String,
moduleName: String,
libraryVersion: String,
nativeBitcodeFiles: List<String>,
target: KonanTarget,
manifest: Properties,
dependencies: List<KotlinLibrary>,
nopack: Boolean,
shortName: String?,
staticLibraries: List<String>
metadata: KlibModuleMetadata,
outputPath: String,
moduleName: String,
libraryVersion: String,
nativeBitcodeFiles: List<String>,
target: KonanTarget,
manifest: Properties,
dependencies: List<KotlinLibrary>,
nopack: Boolean,
shortName: String?,
staticLibraries: List<String>
) {
val version = KotlinLibraryVersioning(
libraryVersion = libraryVersion,
@@ -1,8 +1,8 @@
package org.jetbrains.kotlin.native.interop.gen
import kotlinx.metadata.KmAnnotationArgument
import kotlinx.metadata.KmClassifier
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.KmAnnotationArgument
import kotlin.metadata.KmClassifier
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.compileTimeValue
import org.jetbrains.kotlin.native.interop.indexer.FunctionDecl
import org.jetbrains.kotlin.native.interop.indexer.IntegerConstantDef