azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/abi-comparator/build.gradle.kts
+2 -2
View File
@@ -8,8 +8,8 @@ dependencies {
implementation(commonDependency("org.apache.commons:commons-text"))
implementation(project(":tools:kotlinp-jvm"))
implementation(project(":kotlinx-metadata-jvm"))
implementation(project(":kotlinx-metadata"))
implementation(project(":kotlin-metadata-jvm"))
implementation(project(":kotlin-metadata"))
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/ClassMetadataChecker.kt
+2 -2
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.ClassMetadataReport
interface ClassMetadataChecker : Checker {
fun check(metadata1: KotlinClassMetadata.Class, metadata2: KotlinClassMetadata.Class, report: ClassMetadataReport)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/ClassMetadataListChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.ClassMetadataReport
abstract class ClassMetadataListChecker(name: String) : ClassMetadataChecker {
@@ -26,4 +26,4 @@ abstract class ClassMetadataListChecker(name: String) : ClassMetadataChecker {
fun classMetadataListChecker(name: String, listGetter: (KotlinClassMetadata.Class) -> List<String>) =
object : ClassMetadataListChecker(name) {
override fun getList(metadata: KotlinClassMetadata.Class) = listGetter(metadata)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/ClassMetadataPropertyChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.ClassMetadataReport
import org.jetbrains.kotlin.abicmp.reports.NamedDiffEntry
@@ -24,4 +24,4 @@ abstract class ClassMetadataPropertyChecker(name: String) : PropertyChecker<Stri
fun classMetadataPropertyChecker(name: String, propertyGetter: (KotlinClassMetadata.Class) -> String) =
object : ClassMetadataPropertyChecker(name) {
override fun getProperty(node: KotlinClassMetadata.Class) = propertyGetter(node)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/GenericMetadataChecker.kt
+5 -5
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.KmConstructor
import kotlinx.metadata.KmFunction
import kotlinx.metadata.KmProperty
import kotlinx.metadata.KmTypeAlias
import kotlin.metadata.KmConstructor
import kotlin.metadata.KmFunction
import kotlin.metadata.KmProperty
import kotlin.metadata.KmTypeAlias
import org.jetbrains.kotlin.abicmp.reports.MetadataPropertyReport
import org.jetbrains.kotlin.abicmp.reports.NamedDiffEntry
@@ -47,4 +47,4 @@ fun typeAliasMetadataPropertyChecker(name: String, propertyGetter: (KmTypeAlias)
fun propertyMetadataPropertyChecker(name: String, propertyGetter: (KmProperty) -> String) =
object : GenericMetadataPropertyChecker<KmProperty>("property.$name") {
override fun getProperty(node: KmProperty) = propertyGetter(node)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/MultiFileClassFacadeMetadataChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassFacadeMetadataReport
interface MultiFileClassFacadeMetadataChecker : Checker {
@@ -14,4 +14,4 @@ interface MultiFileClassFacadeMetadataChecker : Checker {
metadata2: KotlinClassMetadata.MultiFileClassFacade,
report: MultiFileClassFacadeMetadataReport,
)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/MultiFileClassFacadeMetadataListChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassFacadeMetadataReport
abstract class MultiFileClassFacadeMetadataListChecker(name: String) : MultiFileClassFacadeMetadataChecker {
@@ -30,4 +30,4 @@ abstract class MultiFileClassFacadeMetadataListChecker(name: String) : MultiFile
fun multiFileClassFacadeMetadataListChecker(name: String, listGetter: (KotlinClassMetadata.MultiFileClassFacade) -> List<String>) =
object : MultiFileClassFacadeMetadataListChecker(name) {
override fun getList(metadata: KotlinClassMetadata.MultiFileClassFacade) = listGetter(metadata)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/MultiFileClassPartMetadataChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassPartMetadataReport
interface MultiFileClassPartMetadataChecker : Checker {
@@ -14,4 +14,4 @@ interface MultiFileClassPartMetadataChecker : Checker {
metadata2: KotlinClassMetadata.MultiFileClassPart,
report: MultiFileClassPartMetadataReport,
)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/MultiFileClassPartMetadataPropertyChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassPartMetadataReport
import org.jetbrains.kotlin.abicmp.reports.NamedDiffEntry
@@ -28,4 +28,4 @@ abstract class MultiFileClassPartMetadataPropertyChecker(name: String) :
fun multiFileClassPartMetadataPropertyChecker(name: String, propertyGetter: (KotlinClassMetadata.MultiFileClassPart) -> String) =
object : MultiFileClassPartMetadataPropertyChecker(name) {
override fun getProperty(node: KotlinClassMetadata.MultiFileClassPart) = propertyGetter(node)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/PackageMetadataChecker.kt
+2 -2
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.KmPackage
import kotlin.metadata.KmPackage
import org.jetbrains.kotlin.abicmp.reports.PackageMetadataReport
interface PackageMetadataChecker : Checker {
fun check(metadata1: KmPackage, metadata2: KmPackage, report: PackageMetadataReport)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/PackageMetadataListChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.KmPackage
import kotlin.metadata.KmPackage
import org.jetbrains.kotlin.abicmp.reports.PackageMetadataReport
abstract class PackageMetadataListChecker(name: String) : PackageMetadataChecker {
@@ -30,4 +30,4 @@ abstract class PackageMetadataListChecker(name: String) : PackageMetadataChecker
fun fileFacadeMetadataListChecker(name: String, listGetter: (KmPackage) -> List<String>) =
object : PackageMetadataListChecker(name) {
override fun getList(metadata: KmPackage) = listGetter(metadata)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/SyntheticClassMetadataChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.SyntheticClassMetadataReport
interface SyntheticClassMetadataChecker : Checker {
@@ -14,4 +14,4 @@ interface SyntheticClassMetadataChecker : Checker {
metadata2: KotlinClassMetadata.SyntheticClass,
report: SyntheticClassMetadataReport,
)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/SyntheticClassMetadataPropertyChecker.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.NamedDiffEntry
import org.jetbrains.kotlin.abicmp.reports.SyntheticClassMetadataReport
@@ -28,4 +28,4 @@ abstract class SyntheticClassMetadataPropertyChecker(name: String) :
fun syntheticClassMetadataPropertyChecker(name: String, propertyGetter: (KotlinClassMetadata.SyntheticClass) -> String) =
object : SyntheticClassMetadataPropertyChecker(name) {
override fun getProperty(node: KotlinClassMetadata.SyntheticClass) = propertyGetter(node)
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/checkers/metadataUtils.kt
+6 -6
View File
@@ -5,11 +5,11 @@
package org.jetbrains.kotlin.abicmp.checkers
import kotlinx.metadata.*
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.getterSignature
import kotlinx.metadata.jvm.localDelegatedProperties
import kotlinx.metadata.jvm.signature
import kotlin.metadata.*
import kotlin.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.getterSignature
import kotlin.metadata.jvm.localDelegatedProperties
import kotlin.metadata.jvm.signature
import org.jetbrains.kotlin.abicmp.reports.MetadataPropertyReport
import org.jetbrains.kotlin.abicmp.tasks.GenericMetadataTask
@@ -42,4 +42,4 @@ inline fun <R, T> checkMetadataMembers(
val member2 = membersMetadata2[id]!!
GenericMetadataTask(member1, member2, reportBuilder(id), checkers).run()
}
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt
+3 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.*
import kotlinx.metadata.jvm.*
import kotlin.metadata.*
import kotlin.metadata.jvm.*
import org.jetbrains.kotlin.abicmp.*
import org.jetbrains.kotlin.abicmp.checkers.*
import org.jetbrains.kotlin.kotlinp.*
@@ -213,6 +213,7 @@ class CheckerConfiguration(private val enabledExclusively: Set<String>, private
}
}
private val kotlinp = JvmKotlinp(Settings(isVerbose = true, sortDeclarations = true))
private fun renderAnnotation(annotation: KmAnnotation) = printString { kotlinp.renderAnnotation(annotation, this) }
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassMetadataTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.checkers.*
import org.jetbrains.kotlin.abicmp.reports.ClassMetadataReport
@@ -56,4 +56,4 @@ class ClassMetadataTask(
report::localDelegatedPropertyReport
) { loadLocalDelegatedProperties(it) }
}
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.checkers.loadFields
import org.jetbrains.kotlin.abicmp.checkers.loadMethods
import org.jetbrains.kotlin.abicmp.classFlags
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/MultiFileClassFacadeMetadataTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassFacadeMetadataReport
class MultiFileClassFacadeMetadataTask(
@@ -19,4 +19,4 @@ class MultiFileClassFacadeMetadataTask(
checker.check(metadata1, metadata2, report)
}
}
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/MultiFileClassPartMetadataTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.MultiFileClassPartMetadataReport
class MultiFileClassPartMetadataTask(
@@ -20,4 +20,4 @@ class MultiFileClassPartMetadataTask(
}
PackageMetadataTask(configuration, metadata1.kmPackage, metadata2.kmPackage, report.packageReport()).run()
}
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/PackageMetadataTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.KmPackage
import kotlin.metadata.KmPackage
import org.jetbrains.kotlin.abicmp.checkers.*
import org.jetbrains.kotlin.abicmp.reports.PackageMetadataReport
@@ -38,4 +38,4 @@ class PackageMetadataTask(
)
}
}
}
libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/SyntheticMetadataTask.kt
+2 -2
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.abicmp.tasks
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.abicmp.reports.SyntheticClassMetadataReport
class SyntheticMetadataTask(
@@ -30,4 +30,4 @@ class SyntheticMetadataTask(
).run()
}
}
}
}
libraries/tools/kotlinp/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ plugins {
}
dependencies {
compileOnly(project(":kotlinx-metadata"))
compileOnly(project(":kotlin-metadata"))
}
sourceSets {
libraries/tools/kotlinp/jvm/build.gradle.kts
+6 -6
View File
@@ -11,24 +11,24 @@ val kotlinpAsmVersion = "9.0"
val shadows by configurations.creating
dependencies {
compileOnly(project(":kotlinx-metadata"))
compileOnly(project(":kotlinx-metadata-jvm"))
compileOnly(project(":kotlin-metadata"))
compileOnly(project(":kotlin-metadata-jvm"))
api(project(":tools:kotlinp"))
implementation("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
testApi(intellijCore())
testCompileOnly(project(":kotlinx-metadata"))
testCompileOnly(project(":kotlinx-metadata-jvm"))
testCompileOnly(project(":kotlin-metadata"))
testCompileOnly(project(":kotlin-metadata-jvm"))
testImplementation(libs.junit4)
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(projectTests(":generators:test-generator"))
testRuntimeOnly(project(":kotlinx-metadata-jvm"))
testRuntimeOnly(project(":kotlin-metadata-jvm"))
shadows(project(":kotlinx-metadata-jvm"))
shadows(project(":kotlin-metadata-jvm"))
shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion")
}
libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/JvmKotlinp.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.*
import kotlinx.metadata.jvm.*
import kotlin.metadata.*
import kotlin.metadata.jvm.*
import org.jetbrains.kotlin.kotlinp.*
class JvmKotlinp(settings: Settings) : Kotlinp(settings) {
libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/Main.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.jvm.UnstableMetadataApi
import kotlin.metadata.jvm.UnstableMetadataApi
import org.jetbrains.kotlin.kotlinp.Settings
import java.io.File
import java.io.IOException
libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/utils.kt
+4 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.KotlinModuleMetadata
import kotlinx.metadata.jvm.Metadata
import kotlinx.metadata.jvm.UnstableMetadataApi
import kotlin.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinModuleMetadata
import kotlin.metadata.jvm.Metadata
import kotlin.metadata.jvm.UnstableMetadataApi
import org.jetbrains.org.objectweb.asm.*
import java.io.File
import java.io.FileInputStream
libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpTestUtils.kt
+3 -3
View File
@@ -7,9 +7,9 @@ package org.jetbrains.kotlin.kotlinp.jvm.test
import com.intellij.openapi.Disposable
import junit.framework.TestCase.assertEquals
import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.KotlinModuleMetadata
import kotlinx.metadata.jvm.UnstableMetadataApi
import kotlin.metadata.jvm.KotlinClassMetadata
import kotlin.metadata.jvm.KotlinModuleMetadata
import kotlin.metadata.jvm.UnstableMetadataApi
import org.jetbrains.kotlin.checkers.setupLanguageVersionSettingsForCompilerTests
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/Kotlinp.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.kotlinp
import kotlinx.metadata.*
import kotlin.metadata.*
import kotlin.contracts.ExperimentalContracts
abstract class Kotlinp(protected val settings: Settings) {