From 03418c11c36edb285965f9741ca4067dfe17e7a9 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 8 Feb 2024 21:43:24 +0100 Subject: [PATCH] [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 --- .../jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt | 1 + .../kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt | 4 ++-- libraries/tools/kotlinp/jvm/build.gradle.kts | 4 ++-- .../org/jetbrains/kotlin/kotlinp/{ => jvm}/JvmKotlinp.kt | 3 ++- .../kotlin/kotlinp/{ => jvm}/KotlinpException.kt | 2 +- .../src/org/jetbrains/kotlin/kotlinp/{ => jvm}/Main.kt | 3 ++- .../src/org/jetbrains/kotlin/kotlinp/{ => jvm}/utils.kt | 2 +- .../kotlinp/{ => jvm}/test/AbstractK1KotlinpTest.kt | 2 +- .../kotlinp/{ => jvm}/test/AbstractK2KotlinpTest.kt | 2 +- .../kotlin/kotlinp/{ => jvm}/test/AbstractKotlinpTest.kt | 2 +- .../kotlin/kotlinp/{ => jvm}/test/GenerateKotlinpTests.kt | 2 +- .../kotlinp/{ => jvm}/test/K1KotlinpTestGenerated.java | 2 +- .../kotlinp/{ => jvm}/test/K2KotlinpTestGenerated.java | 2 +- .../kotlinp/{ => jvm}/test/KotlinpCompilerTestDataTest.kt | 2 +- .../kotlin/kotlinp/{ => jvm}/test/KotlinpTestUtils.kt | 8 ++++---- .../org/jetbrains/kotlin/kapt3/test/handlers/utils.kt | 2 +- .../kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Facade.kt | 2 +- 17 files changed, 24 insertions(+), 21 deletions(-) rename libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/{ => jvm}/JvmKotlinp.kt (98%) rename libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/{ => jvm}/KotlinpException.kt (87%) rename libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/{ => jvm}/Main.kt (97%) rename libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/{ => jvm}/utils.kt (98%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/AbstractK1KotlinpTest.kt (87%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/AbstractK2KotlinpTest.kt (86%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/AbstractKotlinpTest.kt (93%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/GenerateKotlinpTests.kt (93%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/K1KotlinpTestGenerated.java (99%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/K2KotlinpTestGenerated.java (99%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/KotlinpCompilerTestDataTest.kt (97%) rename libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/{ => jvm}/test/KotlinpTestUtils.kt (96%) diff --git a/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt b/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt index a1b7a963aad..646d06febf1 100644 --- a/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt +++ b/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/CheckerConfiguration.kt @@ -10,6 +10,7 @@ import kotlinx.metadata.jvm.* import org.jetbrains.kotlin.abicmp.* import org.jetbrains.kotlin.abicmp.checkers.* 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.FieldNode import org.jetbrains.org.objectweb.asm.tree.MethodNode diff --git a/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt b/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt index fc177e5833b..5cfa4f08793 100644 --- a/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt +++ b/libraries/tools/abi-comparator/src/main/kotlin/org/jetbrains/kotlin/abicmp/tasks/ClassTask.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.abicmp.reports.ClassReport import org.jetbrains.kotlin.abicmp.reports.ListEntryDiff import org.jetbrains.kotlin.abicmp.tag import org.jetbrains.kotlin.kotlinp.Settings -import org.jetbrains.kotlin.kotlinp.JvmKotlinp -import org.jetbrains.kotlin.kotlinp.readKotlinClassHeader +import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp +import org.jetbrains.kotlin.kotlinp.jvm.readKotlinClassHeader import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassWriter import org.jetbrains.org.objectweb.asm.tree.ClassNode diff --git a/libraries/tools/kotlinp/jvm/build.gradle.kts b/libraries/tools/kotlinp/jvm/build.gradle.kts index 8e4ccaf2bde..0068ed965d1 100644 --- a/libraries/tools/kotlinp/jvm/build.gradle.kts +++ b/libraries/tools/kotlinp/jvm/build.gradle.kts @@ -41,7 +41,7 @@ projectTest { 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 { archiveClassifier.set("shadow") @@ -49,7 +49,7 @@ val shadowJar by task { configurations = listOf(shadows) from(mainSourceSet.output) manifest { - attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.Main" + attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.jvm.Main" } } diff --git a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/JvmKotlinp.kt similarity index 98% rename from libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/JvmKotlinp.kt index b638ae96c89..61c5cf4ebaf 100644 --- a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt +++ b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/JvmKotlinp.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp +package org.jetbrains.kotlin.kotlinp.jvm import kotlinx.metadata.* import kotlinx.metadata.jvm.* +import org.jetbrains.kotlin.kotlinp.* class JvmKotlinp(settings: Settings) : Kotlinp(settings) { fun printClassFile(classFile: KotlinClassMetadata): String = printString { diff --git a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/KotlinpException.kt similarity index 87% rename from libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/KotlinpException.kt index 6bce2214ab6..cefc300f4f2 100644 --- a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt +++ b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/KotlinpException.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp +package org.jetbrains.kotlin.kotlinp.jvm class KotlinpException(message: String) : RuntimeException(message) diff --git a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/Main.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/Main.kt similarity index 97% rename from libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/Main.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/Main.kt index 5bd631cdd9c..94c64bf86e3 100644 --- a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/Main.kt +++ b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/Main.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp +package org.jetbrains.kotlin.kotlinp.jvm import kotlinx.metadata.jvm.UnstableMetadataApi +import org.jetbrains.kotlin.kotlinp.Settings import java.io.File import java.io.IOException import kotlin.system.exitProcess diff --git a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/utils.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/utils.kt similarity index 98% rename from libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/utils.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/utils.kt index edc72288530..24836b7862a 100644 --- a/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/utils.kt +++ b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/jvm/utils.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp +package org.jetbrains.kotlin.kotlinp.jvm import kotlinx.metadata.jvm.KotlinClassMetadata import kotlinx.metadata.jvm.KotlinModuleMetadata diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK1KotlinpTest.kt similarity index 87% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK1KotlinpTest.kt index fb498292820..2fceb9b4188 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK1KotlinpTest.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test abstract class AbstractK1KotlinpTest : AbstractKotlinpTest() { override fun useK2() = false diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK2KotlinpTest.kt similarity index 86% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK2KotlinpTest.kt index 2912086d5a8..d6c98412e46 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractK2KotlinpTest.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test abstract class AbstractK2KotlinpTest: AbstractKotlinpTest() { override fun useK2() = true diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt similarity index 93% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt index 95d1f25dc27..f9fb67cc6f0 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test import org.jetbrains.kotlin.test.TestCaseWithTmpdir import java.io.File diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/GenerateKotlinpTests.kt similarity index 93% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/GenerateKotlinpTests.kt index a8f1974deb0..01ce0122206 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/GenerateKotlinpTests.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K1KotlinpTestGenerated.java similarity index 99% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K1KotlinpTestGenerated.java index 676bf16bc1e..20e7cf2f12d 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K1KotlinpTestGenerated.java @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test; +package org.jetbrains.kotlin.kotlinp.jvm.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K2KotlinpTestGenerated.java similarity index 99% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K2KotlinpTestGenerated.java index de5e3658262..44c82dde434 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/K2KotlinpTestGenerated.java @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test; +package org.jetbrains.kotlin.kotlinp.jvm.test; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpCompilerTestDataTest.kt similarity index 97% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpCompilerTestDataTest.kt index 3b2f3bb1e8c..699f7a7727e 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpCompilerTestDataTest.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpTestUtils.kt similarity index 96% rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpTestUtils.kt index 16f239c8241..d7ac095eb31 100644 --- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/KotlinpTestUtils.kt @@ -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. */ -package org.jetbrains.kotlin.kotlinp.test +package org.jetbrains.kotlin.kotlinp.jvm.test import com.intellij.openapi.Disposable 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.jvm.compiler.AbstractLoadJavaTest import org.jetbrains.kotlin.kotlinp.Settings -import org.jetbrains.kotlin.kotlinp.JvmKotlinp -import org.jetbrains.kotlin.kotlinp.readClassFile -import org.jetbrains.kotlin.kotlinp.readModuleFile +import org.jetbrains.kotlin.kotlinp.jvm.JvmKotlinp +import org.jetbrains.kotlin.kotlinp.jvm.readClassFile +import org.jetbrains.kotlin.kotlinp.jvm.readModuleFile import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt index d183e8301b2..6a4ca2dbca3 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/handlers/utils.kt @@ -9,7 +9,7 @@ import com.sun.tools.javac.tree.JCTree.* import com.sun.tools.javac.tree.Pretty import kotlinx.metadata.jvm.KotlinClassMetadata 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.test.Assertions import org.jetbrains.kotlin.test.model.TestModule diff --git a/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Facade.kt b/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Facade.kt index b4385acc85a..3ec43aea7b7 100644 --- a/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Facade.kt +++ b/plugins/kapt4/test/org/jetbrains/kotlin/kapt4/Kapt4Facade.kt @@ -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.kaptOptionsProvider 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.services.* import org.jetbrains.kotlin.utils.Printer