[kotlinp] Change the package name in :tools:kotlinp-jvm subproject

Change the package name for all *.kt files inside
the :tools:kotlinp-jvm subproject from "org.jetbrains.kotlin.kotlinp"
to "org.jetbrains.kotlin.kotlinp.jvm"

^KT-62340
This commit is contained in:
Dmitriy Dolovov
2024-02-08 21:43:24 +01:00
committed by Space Team
parent d30efdb001
commit 03418c11c3
17 changed files with 24 additions and 21 deletions
@@ -10,6 +10,7 @@ import kotlinx.metadata.jvm.*
import org.jetbrains.kotlin.abicmp.* import org.jetbrains.kotlin.abicmp.*
import org.jetbrains.kotlin.abicmp.checkers.* import org.jetbrains.kotlin.abicmp.checkers.*
import org.jetbrains.kotlin.kotlinp.* import org.jetbrains.kotlin.kotlinp.*
import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.org.objectweb.asm.tree.ClassNode import org.jetbrains.org.objectweb.asm.tree.ClassNode
import org.jetbrains.org.objectweb.asm.tree.FieldNode import org.jetbrains.org.objectweb.asm.tree.FieldNode
import org.jetbrains.org.objectweb.asm.tree.MethodNode import org.jetbrains.org.objectweb.asm.tree.MethodNode
@@ -14,8 +14,8 @@ import org.jetbrains.kotlin.abicmp.reports.ClassReport
import org.jetbrains.kotlin.abicmp.reports.ListEntryDiff import org.jetbrains.kotlin.abicmp.reports.ListEntryDiff
import org.jetbrains.kotlin.abicmp.tag import org.jetbrains.kotlin.abicmp.tag
import org.jetbrains.kotlin.kotlinp.Settings import org.jetbrains.kotlin.kotlinp.Settings
import org.jetbrains.kotlin.kotlinp.JvmKotlinp import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.kotlin.kotlinp.readKotlinClassHeader import org.jetbrains.kotlin.kotlinp.jvm.readKotlinClassHeader
import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassReader
import org.jetbrains.org.objectweb.asm.ClassWriter import org.jetbrains.org.objectweb.asm.ClassWriter
import org.jetbrains.org.objectweb.asm.tree.ClassNode import org.jetbrains.org.objectweb.asm.tree.ClassNode
+2 -2
View File
@@ -41,7 +41,7 @@ projectTest {
workingDir = rootDir workingDir = rootDir
} }
val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt") val generateTests by generator("org.jetbrains.kotlin.kotlinp.jvm.test.GenerateKotlinpTestsKt")
val shadowJar by task<ShadowJar> { val shadowJar by task<ShadowJar> {
archiveClassifier.set("shadow") archiveClassifier.set("shadow")
@@ -49,7 +49,7 @@ val shadowJar by task<ShadowJar> {
configurations = listOf(shadows) configurations = listOf(shadows)
from(mainSourceSet.output) from(mainSourceSet.output)
manifest { manifest {
attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.Main" attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.jvm.Main"
} }
} }
@@ -3,10 +3,11 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.* import kotlinx.metadata.*
import kotlinx.metadata.jvm.* import kotlinx.metadata.jvm.*
import org.jetbrains.kotlin.kotlinp.*
class JvmKotlinp(settings: Settings) : Kotlinp(settings) { class JvmKotlinp(settings: Settings) : Kotlinp(settings) {
fun printClassFile(classFile: KotlinClassMetadata): String = printString { fun printClassFile(classFile: KotlinClassMetadata): String = printString {
@@ -3,6 +3,6 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp package org.jetbrains.kotlin.kotlinp.jvm
class KotlinpException(message: String) : RuntimeException(message) class KotlinpException(message: String) : RuntimeException(message)
@@ -3,9 +3,10 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.jvm.UnstableMetadataApi import kotlinx.metadata.jvm.UnstableMetadataApi
import org.jetbrains.kotlin.kotlinp.Settings
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import kotlin.system.exitProcess import kotlin.system.exitProcess
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp package org.jetbrains.kotlin.kotlinp.jvm
import kotlinx.metadata.jvm.KotlinClassMetadata import kotlinx.metadata.jvm.KotlinClassMetadata
import kotlinx.metadata.jvm.KotlinModuleMetadata import kotlinx.metadata.jvm.KotlinModuleMetadata
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
abstract class AbstractK1KotlinpTest : AbstractKotlinpTest() { abstract class AbstractK1KotlinpTest : AbstractKotlinpTest() {
override fun useK2() = false override fun useK2() = false
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
abstract class AbstractK2KotlinpTest: AbstractKotlinpTest() { abstract class AbstractK2KotlinpTest: AbstractKotlinpTest() {
override fun useK2() = true override fun useK2() = true
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.TestCaseWithTmpdir
import java.io.File import java.io.File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test; package org.jetbrains.kotlin.kotlinp.jvm.test;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test; package org.jetbrains.kotlin.kotlinp.jvm.test;
import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.Disposer
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.kotlinp.test package org.jetbrains.kotlin.kotlinp.jvm.test
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertEquals
@@ -18,9 +18,9 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaTest import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaTest
import org.jetbrains.kotlin.kotlinp.Settings import org.jetbrains.kotlin.kotlinp.Settings
import org.jetbrains.kotlin.kotlinp.JvmKotlinp import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.kotlin.kotlinp.readClassFile import org.jetbrains.kotlin.kotlinp.jvm.readClassFile
import org.jetbrains.kotlin.kotlinp.readModuleFile import org.jetbrains.kotlin.kotlinp.jvm.readModuleFile
import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -9,7 +9,7 @@ import com.sun.tools.javac.tree.JCTree.*
import com.sun.tools.javac.tree.Pretty import com.sun.tools.javac.tree.Pretty
import kotlinx.metadata.jvm.KotlinClassMetadata import kotlinx.metadata.jvm.KotlinClassMetadata
import org.jetbrains.kotlin.kotlinp.Settings import org.jetbrains.kotlin.kotlinp.Settings
import org.jetbrains.kotlin.kotlinp.JvmKotlinp import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.test.Assertions import org.jetbrains.kotlin.test.Assertions
import org.jetbrains.kotlin.test.model.TestModule import org.jetbrains.kotlin.test.model.TestModule
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.kapt3.base.util.WriterBackedKaptLogger
import org.jetbrains.kotlin.kapt3.test.KaptMessageCollectorProvider import org.jetbrains.kotlin.kapt3.test.KaptMessageCollectorProvider
import org.jetbrains.kotlin.kapt3.test.kaptOptionsProvider import org.jetbrains.kotlin.kapt3.test.kaptOptionsProvider
import org.jetbrains.kotlin.kotlinp.Settings import org.jetbrains.kotlin.kotlinp.Settings
import org.jetbrains.kotlin.kotlinp.JvmKotlinp import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp
import org.jetbrains.kotlin.test.model.* import org.jetbrains.kotlin.test.model.*
import org.jetbrains.kotlin.test.services.* import org.jetbrains.kotlin.test.services.*
import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.Printer