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/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) {