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
+5 -5
View File
@@ -31,11 +31,11 @@ dependencies {
compileOnly(project(":compiler:plugin-api"))
compileOnly(project(":kotlin-build-common"))
// Include kotlinx.metadata for metadata stripping.
// Note that kotlinx-metadata-jvm already includes kotlinx-metadata, core:metadata, core:metadata.jvm,
// and protobuf-lite, so we only need to include kotlinx-metadata-jvm in the shadow jar.
compileOnly(project(":kotlinx-metadata"))
embedded(project(":kotlinx-metadata-jvm"))
// Include kotlin.metadata for metadata stripping.
// Note that kotlin-metadata-jvm already includes kotlin-metadata, core:metadata, core:metadata.jvm,
// and protobuf-lite, so we only need to include kotlin-metadata-jvm in the shadow jar.
compileOnly(project(":kotlin-metadata"))
embedded(project(":kotlin-metadata-jvm"))
compileOnly(intellijCore())
compileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.jvm.abi
import kotlinx.metadata.*
import kotlinx.metadata.jvm.*
import kotlin.metadata.*
import kotlin.metadata.jvm.*
import org.jetbrains.kotlin.load.java.JvmAnnotationNames.*
import org.jetbrains.org.objectweb.asm.AnnotationVisitor
import org.jetbrains.org.objectweb.asm.Opcodes
@@ -46,7 +46,7 @@ dependencies {
embedded(project(":kotlin-annotation-processing-base")) { isTransitive = false }
testApi(project(":tools:kotlinp-jvm"))
testApi(project(":kotlinx-metadata-jvm"))
testApi(project(":kotlin-metadata-jvm"))
}
optInToExperimentalCompilerApi()
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.kapt3.test.handlers
import com.sun.tools.javac.tree.JCTree.*
import com.sun.tools.javac.tree.Pretty
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.kotlinp.Settings
import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.kapt4
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.analysis.api.KtAnalysisApiInternals
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeTokenProvider
import org.jetbrains.kotlin.analysis.api.lifetime.KtReadActionConfinementLifetimeTokenProvider