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
native/commonizer/build.gradle.kts
+3 -3
View File
@@ -14,14 +14,14 @@ configurations {
dependencies {
embedded(project(":kotlinx-metadata-klib")) { isTransitive = false }
embedded(project(":kotlinx-metadata")) { isTransitive = false }
embedded(project(":kotlin-metadata")) { isTransitive = false }
embedded(project(":native:kotlin-klib-commonizer-api")) { isTransitive = false }
embedded(project(":kotlin-tooling-core")) { isTransitive = false }
// N.B. The order of "kotlinx-metadata*" dependencies makes sense for runtime classpath
// of the "runCommonizer" task. Please, don't mix them up.
compileOnly(project(":kotlinx-metadata-klib")) { isTransitive = false }
compileOnly(project(":kotlinx-metadata")) { isTransitive = false }
compileOnly(project(":kotlin-metadata")) { isTransitive = false }
compileOnly(project(":native:kotlin-klib-commonizer-api")) { isTransitive = false }
compileOnly(project(":kotlin-tooling-core")) { isTransitive = false }
compileOnly(project(":compiler:cli-common"))
@@ -41,7 +41,7 @@ dependencies {
testImplementation(libs.junit4)
testImplementation(projectTests(":compiler:tests-common"))
testImplementation(project(":kotlinx-metadata-klib")) { isTransitive = false }
testImplementation(project(":kotlinx-metadata")) { isTransitive = false }
testImplementation(project(":kotlin-metadata")) { isTransitive = false }
testImplementation(project(":native:kotlin-klib-commonizer-api"))
testImplementation(project(":kotlin-tooling-core"))
testApi(intellijCore())
native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirDeclaration.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.cir
import kotlinx.metadata.*
import kotlin.metadata.*
import kotlinx.metadata.klib.KlibModuleMetadata
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
native/commonizer/src/org/jetbrains/kotlin/commonizer/cir/CirType.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.cir
import kotlinx.metadata.KmType
import kotlin.metadata.KmType
import org.jetbrains.kotlin.commonizer.utils.Interner
import org.jetbrains.kotlin.commonizer.utils.appendHashCode
import org.jetbrains.kotlin.commonizer.utils.hashCode
native/commonizer/src/org/jetbrains/kotlin/commonizer/facade.kt
+1 -1
View File
@@ -132,4 +132,4 @@ private val allowedDuplicates = run {
"platform/CoreGraphics/CGVector.Companion",
)
cfcgTypesClassifiers.map { CirEntityId.create(it) }.toSet()
}
}
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirDeserializers.kt
+4 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.*
import kotlinx.metadata.Modality as KmModality
import kotlinx.metadata.Visibility as KmVisibility
import kotlinx.metadata.ClassKind as KmClassKind
import kotlin.metadata.*
import kotlin.metadata.Modality as KmModality
import kotlin.metadata.Visibility as KmVisibility
import kotlin.metadata.ClassKind as KmClassKind
import kotlinx.metadata.klib.annotations
import kotlinx.metadata.klib.compileTimeValue
import kotlinx.metadata.klib.getterAnnotations
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirSerializers.kt
+2 -2
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.*
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import org.jetbrains.kotlin.commonizer.cir.*
import org.jetbrains.kotlin.commonizer.metadata.TypeAliasExpansion.*
import org.jetbrains.kotlin.commonizer.utils.DEFAULT_SETTER_VALUE_NAME
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTreeSerializer.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.KlibModuleMetadata
import org.jetbrains.kotlin.commonizer.cir.*
import org.jetbrains.kotlin.commonizer.mergedtree.*
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeParameterResolver.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.KmTypeParameter
import kotlin.metadata.KmTypeParameter
interface CirTypeParameterResolver {
fun resolveTypeParameter(id: Int): KmTypeParameter?
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/CirTypeResolver.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.KmTypeParameter
import kotlin.metadata.KmTypeParameter
import org.jetbrains.kotlin.commonizer.cir.CirEntityId
import org.jetbrains.kotlin.commonizer.cir.CirProvided
import org.jetbrains.kotlin.commonizer.mergedtree.CirProvidedClassifiers
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/flags.kt
+3 -3
View File
@@ -5,9 +5,9 @@
package org.jetbrains.kotlin.commonizer.metadata
import kotlinx.metadata.*
import kotlinx.metadata.Modality as KmModality
import kotlinx.metadata.ClassKind as KmClassKind
import kotlin.metadata.*
import kotlin.metadata.Modality as KmModality
import kotlin.metadata.ClassKind as KmClassKind
import org.jetbrains.kotlin.commonizer.cir.*
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind
native/commonizer/src/org/jetbrains/kotlin/commonizer/metadata/utils/MetadataDeclarationsComparator.kt
+2 -2
View File
@@ -6,9 +6,9 @@
package org.jetbrains.kotlin.commonizer.metadata.utils
import com.intellij.util.containers.FactoryMap
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.*
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import org.jetbrains.kotlin.commonizer.metadata.utils.MetadataDeclarationsComparator.EntityKind.*
import org.jetbrains.kotlin.commonizer.metadata.utils.MetadataDeclarationsComparator.Mismatch
import org.jetbrains.kotlin.commonizer.metadata.utils.MetadataDeclarationsComparator.Result
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassConstructorDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.KmConstructor
import kotlin.metadata.KmConstructor
import org.jetbrains.kotlin.commonizer.cir.CirClassConstructor
import org.jetbrains.kotlin.commonizer.cir.CirContainingClass
import org.jetbrains.kotlin.commonizer.metadata.CirDeserializers
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeClassDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.*
import kotlin.metadata.*
import org.jetbrains.kotlin.commonizer.metadata.CirDeserializers
import org.jetbrains.kotlin.commonizer.metadata.CirTypeResolver
import org.jetbrains.kotlin.commonizer.tree.CirTreeClass
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeFunctionDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.KmFunction
import kotlin.metadata.KmFunction
import org.jetbrains.kotlin.commonizer.cir.CirClass
import org.jetbrains.kotlin.commonizer.cir.CirContainingClass
import org.jetbrains.kotlin.commonizer.cir.CirFunction
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeModuleDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.KlibModuleMetadata
import kotlinx.metadata.klib.fqName
import org.jetbrains.kotlin.commonizer.cir.CirModule
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePackageDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.internal.common.KmModuleFragment
import org.jetbrains.kotlin.commonizer.cir.CirPackage
import org.jetbrains.kotlin.commonizer.cir.CirPackageName
import org.jetbrains.kotlin.commonizer.metadata.CirTypeResolver
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreePropertyDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.KmProperty
import kotlin.metadata.KmProperty
import org.jetbrains.kotlin.commonizer.cir.CirContainingClass
import org.jetbrains.kotlin.commonizer.cir.CirName
import org.jetbrains.kotlin.commonizer.cir.CirProperty
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/CirTreeTypeAliasDeserializer.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import kotlinx.metadata.KmTypeAlias
import kotlin.metadata.KmTypeAlias
import org.jetbrains.kotlin.commonizer.cir.CirEntityId
import org.jetbrains.kotlin.commonizer.cir.CirName
import org.jetbrains.kotlin.commonizer.cir.CirPackageName
native/commonizer/src/org/jetbrains/kotlin/commonizer/tree/deserializer/ClassesToProcess.kt
+2 -2
View File
@@ -6,8 +6,8 @@
package org.jetbrains.kotlin.commonizer.tree.deserializer
import com.intellij.util.containers.FactoryMap
import kotlinx.metadata.*
import kotlinx.metadata.internal.common.KmModuleFragment
import kotlin.metadata.*
import kotlin.metadata.internal.common.KmModuleFragment
import kotlinx.metadata.klib.klibEnumEntries
import org.jetbrains.kotlin.commonizer.cir.CirEntityId
import org.jetbrains.kotlin.commonizer.cir.CirName
native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/excludes.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.utils
import kotlinx.metadata.*
import kotlin.metadata.*
import kotlinx.metadata.klib.annotations
internal const val KNI_BRIDGE_FUNCTION_PREFIX = "kniBridge"
native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/names.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.utils
import kotlinx.metadata.ClassName
import kotlin.metadata.ClassName
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.commonizer.cir.CirEntityId
import org.jetbrains.kotlin.commonizer.cir.CirName
native/commonizer/src/org/jetbrains/kotlin/commonizer/utils/type.kt
+1 -1
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer.utils
import kotlinx.metadata.*
import kotlin.metadata.*
internal inline val KmTypeParameter.filteredUpperBounds: List<KmType>
get() = upperBounds.takeUnless { it.singleOrNull()?.isNullableAny == true } ?: emptyList()