From d30efdb0012182cf74551eb9e08616aa73e576f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 8 Feb 2024 21:32:02 +0100 Subject: [PATCH] [kotlinp] Split :tools:kotlinp into "common" and "jvm" subprojects The "common" subproject keeps only backend-neutral logic and depends only on :kotlinx-metadata library. It takes the name of the former project - :tools:kotlinp The "jvm" subproject depends on the "common" one and also depends on :kotlinx-metadata-jvm. It gets the new name - :tools:kotlinp-jvm There is a lot of touched files in this commit. The majority of them is just moved files (tests, test data, etc). Only the following files were actually modified: .space/CODEOWNERS build.gradle.kts libraries/tools/abi-comparator/build.gradle.kts libraries/tools/kotlinp/build.gradle.kts libraries/tools/kotlinp/jvm/build.gradle.kts plugins/kapt3/kapt3-compiler/build.gradle.kts settings.gradle ^KT-62340 --- .space/CODEOWNERS | 3 +- build.gradle.kts | 2 +- .../tools/abi-comparator/build.gradle.kts | 2 +- libraries/tools/kotlinp/build.gradle.kts | 49 ------------ libraries/tools/kotlinp/jvm/build.gradle.kts | 64 +++++++++++++++ .../jetbrains/kotlin/kotlinp/JvmKotlinp.kt | 0 .../kotlin/kotlinp/KotlinpException.kt | 0 .../src/org/jetbrains/kotlin/kotlinp/Main.kt | 0 .../src/org/jetbrains/kotlin/kotlinp/utils.kt | 0 .../kotlinp/test/AbstractK1KotlinpTest.kt | 0 .../kotlinp/test/AbstractK2KotlinpTest.kt | 0 .../kotlinp/test/AbstractKotlinpTest.kt | 0 .../kotlinp/test/GenerateKotlinpTests.kt | 2 +- .../kotlinp/test/K1KotlinpTestGenerated.java | 78 +++++++++--------- .../kotlinp/test/K2KotlinpTestGenerated.java | 80 +++++++++---------- .../test/KotlinpCompilerTestDataTest.kt | 0 .../kotlin/kotlinp/test/KotlinpTestUtils.kt | 0 .../{ => jvm}/testData/Annotations.fir.txt | 0 .../kotlinp/{ => jvm}/testData/Annotations.kt | 0 .../{ => jvm}/testData/Annotations.txt | 0 .../kotlinp/{ => jvm}/testData/Constants.kt | 0 .../kotlinp/{ => jvm}/testData/Constants.txt | 0 .../{ => jvm}/testData/ContextReceivers.kt | 0 .../{ => jvm}/testData/ContextReceivers.txt | 0 .../kotlinp/{ => jvm}/testData/Contracts.kt | 0 .../kotlinp/{ => jvm}/testData/Contracts.txt | 0 .../kotlinp/{ => jvm}/testData/Delegation.kt | 0 .../kotlinp/{ => jvm}/testData/Delegation.txt | 0 .../kotlinp/{ => jvm}/testData/EnumEntries.kt | 0 .../{ => jvm}/testData/EnumEntries.txt | 0 .../{ => jvm}/testData/FunInterface.kt | 0 .../{ => jvm}/testData/FunInterface.txt | 0 ...TypeInLambdaLiteralAndDelegatedProperty.kt | 0 ...ypeInLambdaLiteralAndDelegatedProperty.txt | 0 .../kotlinp/{ => jvm}/testData/Lambda.kt | 0 .../kotlinp/{ => jvm}/testData/Lambda.txt | 0 .../testData/LocalDelegatedProperties.kt | 0 .../testData/LocalDelegatedProperties.txt | 0 .../{ => jvm}/testData/MultiFileClass.kt | 0 .../{ => jvm}/testData/MultiFileClass.txt | 0 .../{ => jvm}/testData/NestedClasses.kt | 0 .../{ => jvm}/testData/NestedClasses.txt | 0 .../testData/NotEnumWithEnumEntriesEnabled.kt | 0 .../NotEnumWithEnumEntriesEnabled.txt | 0 .../{ => jvm}/testData/OptionalAnnotation.kt | 0 .../{ => jvm}/testData/OptionalAnnotation.txt | 0 .../{ => jvm}/testData/PlatformType.kt | 0 .../{ => jvm}/testData/PlatformType.txt | 0 .../kotlinp/{ => jvm}/testData/Properties.kt | 0 .../kotlinp/{ => jvm}/testData/Properties.txt | 0 .../kotlinp/{ => jvm}/testData/SimpleClass.kt | 0 .../{ => jvm}/testData/SimpleClass.txt | 0 .../{ => jvm}/testData/SimplePackage.fir.txt | 0 .../{ => jvm}/testData/SimplePackage.kt | 0 .../{ => jvm}/testData/SimplePackage.txt | 0 .../{ => jvm}/testData/SyntheticClass.kt | 0 .../{ => jvm}/testData/SyntheticClass.txt | 0 .../{ => jvm}/testData/TypeAlias.fir.txt | 0 .../kotlinp/{ => jvm}/testData/TypeAlias.kt | 0 .../kotlinp/{ => jvm}/testData/TypeAlias.txt | 0 .../{ => jvm}/testData/TypeParameters.kt | 0 .../{ => jvm}/testData/TypeParameters.txt | 0 .../kotlinp/{ => jvm}/testData/ValueClass.kt | 0 .../kotlinp/{ => jvm}/testData/ValueClass.txt | 0 .../{ => jvm}/testData/VarargInAnnotation.kt | 0 .../{ => jvm}/testData/VarargInAnnotation.txt | 0 .../{ => jvm}/testData/VersionRequirement.kt | 0 .../{ => jvm}/testData/VersionRequirement.txt | 0 .../{ => jvm}/testData/jvmDefault/All.kt | 0 .../{ => jvm}/testData/jvmDefault/All.txt | 0 .../testData/jvmDefault/AllCompatibility.kt | 0 .../testData/jvmDefault/AllCompatibility.txt | 0 .../testData/jvmDefault/withCompatibility.kt | 0 .../testData/jvmDefault/withCompatibility.txt | 0 .../jvmDefault/withoutCompatibility.kt | 0 .../jvmDefault/withoutCompatibility.txt | 0 .../testData/localClasses/AnonymousObject.kt | 0 .../testData/localClasses/AnonymousObject.txt | 0 .../localClasses/DeepInnerLocalChain.kt | 0 .../localClasses/DeepInnerLocalChain.txt | 0 .../LocalClassInConstructor.fir.txt | 0 .../localClasses/LocalClassInConstructor.kt | 0 .../localClasses/LocalClassInConstructor.txt | 0 .../localClasses/LocalClassInSignature.kt | 0 .../localClasses/LocalClassInSignature.txt | 0 .../{ => jvm}/testData/scriptSimple.kts | 0 .../{ => jvm}/testData/scriptSimple.txt | 0 plugins/kapt3/kapt3-compiler/build.gradle.kts | 2 +- settings.gradle | 2 + 89 files changed, 151 insertions(+), 133 deletions(-) create mode 100644 libraries/tools/kotlinp/jvm/build.gradle.kts rename libraries/tools/kotlinp/{ => jvm}/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/src/org/jetbrains/kotlin/kotlinp/Main.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/src/org/jetbrains/kotlin/kotlinp/utils.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt (87%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java (63%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java (63%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Annotations.fir.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Annotations.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Annotations.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Constants.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Constants.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/ContextReceivers.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/ContextReceivers.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Contracts.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Contracts.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Delegation.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Delegation.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/EnumEntries.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/EnumEntries.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/FunInterface.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/FunInterface.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Lambda.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Lambda.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/LocalDelegatedProperties.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/LocalDelegatedProperties.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/MultiFileClass.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/MultiFileClass.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/NestedClasses.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/NestedClasses.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/NotEnumWithEnumEntriesEnabled.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/NotEnumWithEnumEntriesEnabled.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/OptionalAnnotation.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/OptionalAnnotation.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/PlatformType.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/PlatformType.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Properties.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/Properties.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SimpleClass.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SimpleClass.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SimplePackage.fir.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SimplePackage.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SimplePackage.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SyntheticClass.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/SyntheticClass.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/TypeAlias.fir.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/TypeAlias.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/TypeAlias.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/TypeParameters.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/TypeParameters.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/ValueClass.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/ValueClass.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/VarargInAnnotation.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/VarargInAnnotation.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/VersionRequirement.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/VersionRequirement.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/All.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/All.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/AllCompatibility.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/AllCompatibility.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/withCompatibility.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/withCompatibility.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/withoutCompatibility.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/jvmDefault/withoutCompatibility.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/AnonymousObject.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/AnonymousObject.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/DeepInnerLocalChain.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/DeepInnerLocalChain.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/LocalClassInConstructor.fir.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/LocalClassInConstructor.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/LocalClassInConstructor.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/LocalClassInSignature.kt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/localClasses/LocalClassInSignature.txt (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/scriptSimple.kts (100%) rename libraries/tools/kotlinp/{ => jvm}/testData/scriptSimple.txt (100%) diff --git a/.space/CODEOWNERS b/.space/CODEOWNERS index ceca964bea9..d629d1c5ca6 100644 --- a/.space/CODEOWNERS +++ b/.space/CODEOWNERS @@ -343,7 +343,8 @@ /libraries/tools/kotlin-test-js-runner/ "Kotlin JS" /libraries/tools/kotlin-tooling-core/ "Kotlin Build Tools" /libraries/tools/kotlin-tooling-metadata/ "Kotlin Build Tools" -/libraries/tools/kotlinp/ "Kotlin JVM" +/libraries/tools/kotlinp/ "Kotlin JVM" "Kotlin Common Backend" +/libraries/tools/kotlinp/jvm/ "Kotlin JVM" /libraries/tools/maven-archetypes/ "Kotlin Build Tools" /libraries/tools/mutability-annotations-compat/ "Kotlin Libraries" /libraries/tools/script-runtime/ "Kotlin Compiler Core" diff --git a/build.gradle.kts b/build.gradle.kts index 266f17a443a..e08c60dfe5d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -901,7 +901,7 @@ tasks { } register("toolsTest") { - dependsOn(":tools:kotlinp:test") + dependsOn(":tools:kotlinp-jvm:test") dependsOn(":native:kotlin-klib-commonizer:test") dependsOn(":native:kotlin-klib-commonizer-api:test") dependsOn(":kotlin-tooling-core:check") diff --git a/libraries/tools/abi-comparator/build.gradle.kts b/libraries/tools/abi-comparator/build.gradle.kts index 8fe959d8273..b9d4a1d6a14 100644 --- a/libraries/tools/abi-comparator/build.gradle.kts +++ b/libraries/tools/abi-comparator/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { implementation(commonDependency("org.jetbrains.intellij.deps:asm-all")) implementation(commonDependency("org.apache.commons:commons-text")) - implementation(project(":tools:kotlinp")) + implementation(project(":tools:kotlinp-jvm")) implementation(project(":kotlinx-metadata-jvm")) implementation(project(":kotlinx-metadata")) diff --git a/libraries/tools/kotlinp/build.gradle.kts b/libraries/tools/kotlinp/build.gradle.kts index 23f0a3feb17..1b3f9c509c0 100644 --- a/libraries/tools/kotlinp/build.gradle.kts +++ b/libraries/tools/kotlinp/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - description = "kotlinp" plugins { @@ -7,57 +5,10 @@ plugins { id("jps-compatible") } -val kotlinpAsmVersion = "9.0" -val shadows by configurations.creating - dependencies { compileOnly(project(":kotlinx-metadata")) - compileOnly(project(":kotlinx-metadata-jvm")) - - implementation("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion") - - testApi(intellijCore()) - - testCompileOnly(project(":kotlinx-metadata")) - testCompileOnly(project(":kotlinx-metadata-jvm")) - - testImplementation(libs.junit4) - testImplementation(projectTests(":compiler:tests-common")) - testImplementation(projectTests(":generators:test-generator")) - - testRuntimeOnly(project(":kotlinx-metadata-jvm")) - - shadows(project(":kotlinx-metadata-jvm")) - shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion") } sourceSets { "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - workingDir = rootDir -} - -val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt") - -val shadowJar by task { - archiveClassifier.set("shadow") - archiveVersion.set("") - configurations = listOf(shadows) - from(mainSourceSet.output) - manifest { - attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.Main" - } -} - -tasks { - "assemble" { - dependsOn(shadowJar) - } - "test" { - // These dependencies are needed because ForTestCompileRuntime loads jars from dist - dependsOn(rootProject.tasks.named("dist")) - } } diff --git a/libraries/tools/kotlinp/jvm/build.gradle.kts b/libraries/tools/kotlinp/jvm/build.gradle.kts new file mode 100644 index 00000000000..8e4ccaf2bde --- /dev/null +++ b/libraries/tools/kotlinp/jvm/build.gradle.kts @@ -0,0 +1,64 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +description = "kotlinp-jvm" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +val kotlinpAsmVersion = "9.0" +val shadows by configurations.creating + +dependencies { + compileOnly(project(":kotlinx-metadata")) + compileOnly(project(":kotlinx-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")) + + testImplementation(libs.junit4) + testImplementation(projectTests(":compiler:tests-common")) + testImplementation(projectTests(":generators:test-generator")) + + testRuntimeOnly(project(":kotlinx-metadata-jvm")) + + shadows(project(":kotlinx-metadata-jvm")) + shadows("org.jetbrains.intellij.deps:asm-all:$kotlinpAsmVersion") +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir +} + +val generateTests by generator("org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt") + +val shadowJar by task { + archiveClassifier.set("shadow") + archiveVersion.set("") + configurations = listOf(shadows) + from(mainSourceSet.output) + manifest { + attributes["Main-Class"] = "org.jetbrains.kotlin.kotlinp.Main" + } +} + +tasks { + "assemble" { + dependsOn(shadowJar) + } + "test" { + // These dependencies are needed because ForTestCompileRuntime loads jars from dist + dependsOn(rootProject.tasks.named("dist")) + } +} diff --git a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt similarity index 100% rename from libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/JvmKotlinp.kt diff --git a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt similarity index 100% rename from libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/KotlinpException.kt diff --git a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/Main.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/Main.kt similarity index 100% rename from libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/Main.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/Main.kt diff --git a/libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/utils.kt b/libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/utils.kt similarity index 100% rename from libraries/tools/kotlinp/src/org/jetbrains/kotlin/kotlinp/utils.kt rename to libraries/tools/kotlinp/jvm/src/org/jetbrains/kotlin/kotlinp/utils.kt diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt similarity index 100% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK1KotlinpTest.kt diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt similarity index 100% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractK2KotlinpTest.kt diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt similarity index 100% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/AbstractKotlinpTest.kt diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt similarity index 87% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt index 8bd33522d25..a8f1974deb0 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/GenerateKotlinpTests.kt @@ -11,7 +11,7 @@ fun main(args: Array) { System.setProperty("java.awt.headless", "true") generateTestGroupSuite(args) { - testGroup("libraries/tools/kotlinp/test", "libraries/tools/kotlinp/testData") { + testGroup("libraries/tools/kotlinp/jvm/test", "libraries/tools/kotlinp/jvm/testData") { testClass { model("") } diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java similarity index 63% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java index 24b66f8eb2a..676bf16bc1e 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K1KotlinpTestGenerated.java @@ -15,9 +15,9 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.kotlinp.jvm.test.GenerateKotlinpTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("libraries/tools/kotlinp/testData") +@TestMetadata("libraries/tools/kotlinp/jvm/testData") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class K1KotlinpTestGenerated extends AbstractK1KotlinpTest { @@ -26,130 +26,130 @@ public class K1KotlinpTestGenerated extends AbstractK1KotlinpTest { } public void testAllFilesPresentInTestData() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("Annotations.kt") public void testAnnotations() throws Exception { - runTest("libraries/tools/kotlinp/testData/Annotations.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Annotations.kt"); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - runTest("libraries/tools/kotlinp/testData/Constants.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Constants.kt"); } @TestMetadata("ContextReceivers.kt") public void testContextReceivers() throws Exception { - runTest("libraries/tools/kotlinp/testData/ContextReceivers.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/ContextReceivers.kt"); } @TestMetadata("Contracts.kt") public void testContracts() throws Exception { - runTest("libraries/tools/kotlinp/testData/Contracts.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Contracts.kt"); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - runTest("libraries/tools/kotlinp/testData/Delegation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Delegation.kt"); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - runTest("libraries/tools/kotlinp/testData/EnumEntries.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/EnumEntries.kt"); } @TestMetadata("FunInterface.kt") public void testFunInterface() throws Exception { - runTest("libraries/tools/kotlinp/testData/FunInterface.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/FunInterface.kt"); } @TestMetadata("IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt") public void testIntersectionTypeInLambdaLiteralAndDelegatedProperty() throws Exception { - runTest("libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt"); } @TestMetadata("Lambda.kt") public void testLambda() throws Exception { - runTest("libraries/tools/kotlinp/testData/Lambda.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Lambda.kt"); } @TestMetadata("LocalDelegatedProperties.kt") public void testLocalDelegatedProperties() throws Exception { - runTest("libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.kt"); } @TestMetadata("MultiFileClass.kt") public void testMultiFileClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/MultiFileClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/MultiFileClass.kt"); } @TestMetadata("NestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("libraries/tools/kotlinp/testData/NestedClasses.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/NestedClasses.kt"); } @TestMetadata("NotEnumWithEnumEntriesEnabled.kt") public void testNotEnumWithEnumEntriesEnabled() throws Exception { - runTest("libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.kt"); } @TestMetadata("OptionalAnnotation.kt") public void testOptionalAnnotation() throws Exception { - runTest("libraries/tools/kotlinp/testData/OptionalAnnotation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.kt"); } @TestMetadata("PlatformType.kt") public void testPlatformType() throws Exception { - runTest("libraries/tools/kotlinp/testData/PlatformType.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/PlatformType.kt"); } @TestMetadata("Properties.kt") public void testProperties() throws Exception { - runTest("libraries/tools/kotlinp/testData/Properties.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Properties.kt"); } @TestMetadata("SimpleClass.kt") public void testSimpleClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/SimpleClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SimpleClass.kt"); } @TestMetadata("SimplePackage.kt") public void testSimplePackage() throws Exception { - runTest("libraries/tools/kotlinp/testData/SimplePackage.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SimplePackage.kt"); } @TestMetadata("SyntheticClass.kt") public void testSyntheticClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/SyntheticClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SyntheticClass.kt"); } @TestMetadata("TypeAlias.kt") public void testTypeAlias() throws Exception { - runTest("libraries/tools/kotlinp/testData/TypeAlias.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/TypeAlias.kt"); } @TestMetadata("TypeParameters.kt") public void testTypeParameters() throws Exception { - runTest("libraries/tools/kotlinp/testData/TypeParameters.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/TypeParameters.kt"); } @TestMetadata("ValueClass.kt") public void testValueClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/ValueClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/ValueClass.kt"); } @TestMetadata("VarargInAnnotation.kt") public void testVarargInAnnotation() throws Exception { - runTest("libraries/tools/kotlinp/testData/VarargInAnnotation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.kt"); } @TestMetadata("VersionRequirement.kt") public void testVersionRequirement() throws Exception { - runTest("libraries/tools/kotlinp/testData/VersionRequirement.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/VersionRequirement.kt"); } - @TestMetadata("libraries/tools/kotlinp/testData/jvmDefault") + @TestMetadata("libraries/tools/kotlinp/jvm/testData/jvmDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class JvmDefault extends AbstractK1KotlinpTest { @@ -159,30 +159,30 @@ public class K1KotlinpTestGenerated extends AbstractK1KotlinpTest { @TestMetadata("All.kt") public void testAll() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/All.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/All.kt"); } @TestMetadata("AllCompatibility.kt") public void testAllCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.kt"); } public void testAllFilesPresentInJvmDefault() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData/jvmDefault"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData/jvmDefault"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("withCompatibility.kt") public void testWithCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.kt"); } @TestMetadata("withoutCompatibility.kt") public void testWithoutCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.kt"); } } - @TestMetadata("libraries/tools/kotlinp/testData/localClasses") + @TestMetadata("libraries/tools/kotlinp/jvm/testData/localClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class LocalClasses extends AbstractK1KotlinpTest { @@ -191,27 +191,27 @@ public class K1KotlinpTestGenerated extends AbstractK1KotlinpTest { } public void testAllFilesPresentInLocalClasses() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData/localClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData/localClasses"), Pattern.compile("^(.+)\\.kt$"), null, true); } @TestMetadata("AnonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.kt"); } @TestMetadata("DeepInnerLocalChain.kt") public void testDeepInnerLocalChain() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.kt"); } @TestMetadata("LocalClassInConstructor.kt") public void testLocalClassInConstructor() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.kt"); } @TestMetadata("LocalClassInSignature.kt") public void testLocalClassInSignature() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.kt"); } } } diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java similarity index 63% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java index ef0e76b59a8..de5e3658262 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java +++ b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/K2KotlinpTestGenerated.java @@ -15,9 +15,9 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.kotlin.kotlinp.test.GenerateKotlinpTestsKt}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.kotlinp.jvm.test.GenerateKotlinpTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("libraries/tools/kotlinp/testData") +@TestMetadata("libraries/tools/kotlinp/jvm/testData") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public class K2KotlinpTestGenerated extends AbstractK2KotlinpTest { @@ -26,135 +26,135 @@ public class K2KotlinpTestGenerated extends AbstractK2KotlinpTest { } public void testAllFilesPresentInTestData() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData"), Pattern.compile("^(.*)\\.kts?$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData"), Pattern.compile("^(.*)\\.kts?$"), null, true); } @TestMetadata("Annotations.kt") public void testAnnotations() throws Exception { - runTest("libraries/tools/kotlinp/testData/Annotations.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Annotations.kt"); } @TestMetadata("Constants.kt") public void testConstants() throws Exception { - runTest("libraries/tools/kotlinp/testData/Constants.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Constants.kt"); } @TestMetadata("ContextReceivers.kt") public void testContextReceivers() throws Exception { - runTest("libraries/tools/kotlinp/testData/ContextReceivers.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/ContextReceivers.kt"); } @TestMetadata("Contracts.kt") public void testContracts() throws Exception { - runTest("libraries/tools/kotlinp/testData/Contracts.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Contracts.kt"); } @TestMetadata("Delegation.kt") public void testDelegation() throws Exception { - runTest("libraries/tools/kotlinp/testData/Delegation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Delegation.kt"); } @TestMetadata("EnumEntries.kt") public void testEnumEntries() throws Exception { - runTest("libraries/tools/kotlinp/testData/EnumEntries.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/EnumEntries.kt"); } @TestMetadata("FunInterface.kt") public void testFunInterface() throws Exception { - runTest("libraries/tools/kotlinp/testData/FunInterface.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/FunInterface.kt"); } @TestMetadata("IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt") public void testIntersectionTypeInLambdaLiteralAndDelegatedProperty() throws Exception { - runTest("libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt"); } @TestMetadata("Lambda.kt") public void testLambda() throws Exception { - runTest("libraries/tools/kotlinp/testData/Lambda.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Lambda.kt"); } @TestMetadata("LocalDelegatedProperties.kt") public void testLocalDelegatedProperties() throws Exception { - runTest("libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.kt"); } @TestMetadata("MultiFileClass.kt") public void testMultiFileClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/MultiFileClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/MultiFileClass.kt"); } @TestMetadata("NestedClasses.kt") public void testNestedClasses() throws Exception { - runTest("libraries/tools/kotlinp/testData/NestedClasses.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/NestedClasses.kt"); } @TestMetadata("NotEnumWithEnumEntriesEnabled.kt") public void testNotEnumWithEnumEntriesEnabled() throws Exception { - runTest("libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.kt"); } @TestMetadata("OptionalAnnotation.kt") public void testOptionalAnnotation() throws Exception { - runTest("libraries/tools/kotlinp/testData/OptionalAnnotation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.kt"); } @TestMetadata("PlatformType.kt") public void testPlatformType() throws Exception { - runTest("libraries/tools/kotlinp/testData/PlatformType.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/PlatformType.kt"); } @TestMetadata("Properties.kt") public void testProperties() throws Exception { - runTest("libraries/tools/kotlinp/testData/Properties.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/Properties.kt"); } @TestMetadata("scriptSimple.kts") public void testScriptSimple() throws Exception { - runTest("libraries/tools/kotlinp/testData/scriptSimple.kts"); + runTest("libraries/tools/kotlinp/jvm/testData/scriptSimple.kts"); } @TestMetadata("SimpleClass.kt") public void testSimpleClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/SimpleClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SimpleClass.kt"); } @TestMetadata("SimplePackage.kt") public void testSimplePackage() throws Exception { - runTest("libraries/tools/kotlinp/testData/SimplePackage.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SimplePackage.kt"); } @TestMetadata("SyntheticClass.kt") public void testSyntheticClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/SyntheticClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/SyntheticClass.kt"); } @TestMetadata("TypeAlias.kt") public void testTypeAlias() throws Exception { - runTest("libraries/tools/kotlinp/testData/TypeAlias.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/TypeAlias.kt"); } @TestMetadata("TypeParameters.kt") public void testTypeParameters() throws Exception { - runTest("libraries/tools/kotlinp/testData/TypeParameters.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/TypeParameters.kt"); } @TestMetadata("ValueClass.kt") public void testValueClass() throws Exception { - runTest("libraries/tools/kotlinp/testData/ValueClass.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/ValueClass.kt"); } @TestMetadata("VarargInAnnotation.kt") public void testVarargInAnnotation() throws Exception { - runTest("libraries/tools/kotlinp/testData/VarargInAnnotation.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.kt"); } @TestMetadata("VersionRequirement.kt") public void testVersionRequirement() throws Exception { - runTest("libraries/tools/kotlinp/testData/VersionRequirement.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/VersionRequirement.kt"); } - @TestMetadata("libraries/tools/kotlinp/testData/jvmDefault") + @TestMetadata("libraries/tools/kotlinp/jvm/testData/jvmDefault") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class JvmDefault extends AbstractK2KotlinpTest { @@ -164,30 +164,30 @@ public class K2KotlinpTestGenerated extends AbstractK2KotlinpTest { @TestMetadata("All.kt") public void testAll() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/All.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/All.kt"); } @TestMetadata("AllCompatibility.kt") public void testAllCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.kt"); } public void testAllFilesPresentInJvmDefault() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData/jvmDefault"), Pattern.compile("^(.*)\\.kts?$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData/jvmDefault"), Pattern.compile("^(.*)\\.kts?$"), null, true); } @TestMetadata("withCompatibility.kt") public void testWithCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.kt"); } @TestMetadata("withoutCompatibility.kt") public void testWithoutCompatibility() throws Exception { - runTest("libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.kt"); } } - @TestMetadata("libraries/tools/kotlinp/testData/localClasses") + @TestMetadata("libraries/tools/kotlinp/jvm/testData/localClasses") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class LocalClasses extends AbstractK2KotlinpTest { @@ -196,27 +196,27 @@ public class K2KotlinpTestGenerated extends AbstractK2KotlinpTest { } public void testAllFilesPresentInLocalClasses() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/testData/localClasses"), Pattern.compile("^(.*)\\.kts?$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("libraries/tools/kotlinp/jvm/testData/localClasses"), Pattern.compile("^(.*)\\.kts?$"), null, true); } @TestMetadata("AnonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.kt"); } @TestMetadata("DeepInnerLocalChain.kt") public void testDeepInnerLocalChain() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.kt"); } @TestMetadata("LocalClassInConstructor.kt") public void testLocalClassInConstructor() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.kt"); } @TestMetadata("LocalClassInSignature.kt") public void testLocalClassInSignature() throws Exception { - runTest("libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.kt"); + runTest("libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.kt"); } } } diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt similarity index 100% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt b/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt similarity index 100% rename from libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt rename to libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt diff --git a/libraries/tools/kotlinp/testData/Annotations.fir.txt b/libraries/tools/kotlinp/jvm/testData/Annotations.fir.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Annotations.fir.txt rename to libraries/tools/kotlinp/jvm/testData/Annotations.fir.txt diff --git a/libraries/tools/kotlinp/testData/Annotations.kt b/libraries/tools/kotlinp/jvm/testData/Annotations.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Annotations.kt rename to libraries/tools/kotlinp/jvm/testData/Annotations.kt diff --git a/libraries/tools/kotlinp/testData/Annotations.txt b/libraries/tools/kotlinp/jvm/testData/Annotations.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Annotations.txt rename to libraries/tools/kotlinp/jvm/testData/Annotations.txt diff --git a/libraries/tools/kotlinp/testData/Constants.kt b/libraries/tools/kotlinp/jvm/testData/Constants.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Constants.kt rename to libraries/tools/kotlinp/jvm/testData/Constants.kt diff --git a/libraries/tools/kotlinp/testData/Constants.txt b/libraries/tools/kotlinp/jvm/testData/Constants.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Constants.txt rename to libraries/tools/kotlinp/jvm/testData/Constants.txt diff --git a/libraries/tools/kotlinp/testData/ContextReceivers.kt b/libraries/tools/kotlinp/jvm/testData/ContextReceivers.kt similarity index 100% rename from libraries/tools/kotlinp/testData/ContextReceivers.kt rename to libraries/tools/kotlinp/jvm/testData/ContextReceivers.kt diff --git a/libraries/tools/kotlinp/testData/ContextReceivers.txt b/libraries/tools/kotlinp/jvm/testData/ContextReceivers.txt similarity index 100% rename from libraries/tools/kotlinp/testData/ContextReceivers.txt rename to libraries/tools/kotlinp/jvm/testData/ContextReceivers.txt diff --git a/libraries/tools/kotlinp/testData/Contracts.kt b/libraries/tools/kotlinp/jvm/testData/Contracts.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Contracts.kt rename to libraries/tools/kotlinp/jvm/testData/Contracts.kt diff --git a/libraries/tools/kotlinp/testData/Contracts.txt b/libraries/tools/kotlinp/jvm/testData/Contracts.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Contracts.txt rename to libraries/tools/kotlinp/jvm/testData/Contracts.txt diff --git a/libraries/tools/kotlinp/testData/Delegation.kt b/libraries/tools/kotlinp/jvm/testData/Delegation.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Delegation.kt rename to libraries/tools/kotlinp/jvm/testData/Delegation.kt diff --git a/libraries/tools/kotlinp/testData/Delegation.txt b/libraries/tools/kotlinp/jvm/testData/Delegation.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Delegation.txt rename to libraries/tools/kotlinp/jvm/testData/Delegation.txt diff --git a/libraries/tools/kotlinp/testData/EnumEntries.kt b/libraries/tools/kotlinp/jvm/testData/EnumEntries.kt similarity index 100% rename from libraries/tools/kotlinp/testData/EnumEntries.kt rename to libraries/tools/kotlinp/jvm/testData/EnumEntries.kt diff --git a/libraries/tools/kotlinp/testData/EnumEntries.txt b/libraries/tools/kotlinp/jvm/testData/EnumEntries.txt similarity index 100% rename from libraries/tools/kotlinp/testData/EnumEntries.txt rename to libraries/tools/kotlinp/jvm/testData/EnumEntries.txt diff --git a/libraries/tools/kotlinp/testData/FunInterface.kt b/libraries/tools/kotlinp/jvm/testData/FunInterface.kt similarity index 100% rename from libraries/tools/kotlinp/testData/FunInterface.kt rename to libraries/tools/kotlinp/jvm/testData/FunInterface.kt diff --git a/libraries/tools/kotlinp/testData/FunInterface.txt b/libraries/tools/kotlinp/jvm/testData/FunInterface.txt similarity index 100% rename from libraries/tools/kotlinp/testData/FunInterface.txt rename to libraries/tools/kotlinp/jvm/testData/FunInterface.txt diff --git a/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt b/libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt similarity index 100% rename from libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt rename to libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.kt diff --git a/libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.txt b/libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.txt similarity index 100% rename from libraries/tools/kotlinp/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.txt rename to libraries/tools/kotlinp/jvm/testData/IntersectionTypeInLambdaLiteralAndDelegatedProperty.txt diff --git a/libraries/tools/kotlinp/testData/Lambda.kt b/libraries/tools/kotlinp/jvm/testData/Lambda.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Lambda.kt rename to libraries/tools/kotlinp/jvm/testData/Lambda.kt diff --git a/libraries/tools/kotlinp/testData/Lambda.txt b/libraries/tools/kotlinp/jvm/testData/Lambda.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Lambda.txt rename to libraries/tools/kotlinp/jvm/testData/Lambda.txt diff --git a/libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt b/libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.kt similarity index 100% rename from libraries/tools/kotlinp/testData/LocalDelegatedProperties.kt rename to libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.kt diff --git a/libraries/tools/kotlinp/testData/LocalDelegatedProperties.txt b/libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.txt similarity index 100% rename from libraries/tools/kotlinp/testData/LocalDelegatedProperties.txt rename to libraries/tools/kotlinp/jvm/testData/LocalDelegatedProperties.txt diff --git a/libraries/tools/kotlinp/testData/MultiFileClass.kt b/libraries/tools/kotlinp/jvm/testData/MultiFileClass.kt similarity index 100% rename from libraries/tools/kotlinp/testData/MultiFileClass.kt rename to libraries/tools/kotlinp/jvm/testData/MultiFileClass.kt diff --git a/libraries/tools/kotlinp/testData/MultiFileClass.txt b/libraries/tools/kotlinp/jvm/testData/MultiFileClass.txt similarity index 100% rename from libraries/tools/kotlinp/testData/MultiFileClass.txt rename to libraries/tools/kotlinp/jvm/testData/MultiFileClass.txt diff --git a/libraries/tools/kotlinp/testData/NestedClasses.kt b/libraries/tools/kotlinp/jvm/testData/NestedClasses.kt similarity index 100% rename from libraries/tools/kotlinp/testData/NestedClasses.kt rename to libraries/tools/kotlinp/jvm/testData/NestedClasses.kt diff --git a/libraries/tools/kotlinp/testData/NestedClasses.txt b/libraries/tools/kotlinp/jvm/testData/NestedClasses.txt similarity index 100% rename from libraries/tools/kotlinp/testData/NestedClasses.txt rename to libraries/tools/kotlinp/jvm/testData/NestedClasses.txt diff --git a/libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.kt b/libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.kt similarity index 100% rename from libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.kt rename to libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.kt diff --git a/libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.txt b/libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.txt similarity index 100% rename from libraries/tools/kotlinp/testData/NotEnumWithEnumEntriesEnabled.txt rename to libraries/tools/kotlinp/jvm/testData/NotEnumWithEnumEntriesEnabled.txt diff --git a/libraries/tools/kotlinp/testData/OptionalAnnotation.kt b/libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.kt similarity index 100% rename from libraries/tools/kotlinp/testData/OptionalAnnotation.kt rename to libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.kt diff --git a/libraries/tools/kotlinp/testData/OptionalAnnotation.txt b/libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.txt similarity index 100% rename from libraries/tools/kotlinp/testData/OptionalAnnotation.txt rename to libraries/tools/kotlinp/jvm/testData/OptionalAnnotation.txt diff --git a/libraries/tools/kotlinp/testData/PlatformType.kt b/libraries/tools/kotlinp/jvm/testData/PlatformType.kt similarity index 100% rename from libraries/tools/kotlinp/testData/PlatformType.kt rename to libraries/tools/kotlinp/jvm/testData/PlatformType.kt diff --git a/libraries/tools/kotlinp/testData/PlatformType.txt b/libraries/tools/kotlinp/jvm/testData/PlatformType.txt similarity index 100% rename from libraries/tools/kotlinp/testData/PlatformType.txt rename to libraries/tools/kotlinp/jvm/testData/PlatformType.txt diff --git a/libraries/tools/kotlinp/testData/Properties.kt b/libraries/tools/kotlinp/jvm/testData/Properties.kt similarity index 100% rename from libraries/tools/kotlinp/testData/Properties.kt rename to libraries/tools/kotlinp/jvm/testData/Properties.kt diff --git a/libraries/tools/kotlinp/testData/Properties.txt b/libraries/tools/kotlinp/jvm/testData/Properties.txt similarity index 100% rename from libraries/tools/kotlinp/testData/Properties.txt rename to libraries/tools/kotlinp/jvm/testData/Properties.txt diff --git a/libraries/tools/kotlinp/testData/SimpleClass.kt b/libraries/tools/kotlinp/jvm/testData/SimpleClass.kt similarity index 100% rename from libraries/tools/kotlinp/testData/SimpleClass.kt rename to libraries/tools/kotlinp/jvm/testData/SimpleClass.kt diff --git a/libraries/tools/kotlinp/testData/SimpleClass.txt b/libraries/tools/kotlinp/jvm/testData/SimpleClass.txt similarity index 100% rename from libraries/tools/kotlinp/testData/SimpleClass.txt rename to libraries/tools/kotlinp/jvm/testData/SimpleClass.txt diff --git a/libraries/tools/kotlinp/testData/SimplePackage.fir.txt b/libraries/tools/kotlinp/jvm/testData/SimplePackage.fir.txt similarity index 100% rename from libraries/tools/kotlinp/testData/SimplePackage.fir.txt rename to libraries/tools/kotlinp/jvm/testData/SimplePackage.fir.txt diff --git a/libraries/tools/kotlinp/testData/SimplePackage.kt b/libraries/tools/kotlinp/jvm/testData/SimplePackage.kt similarity index 100% rename from libraries/tools/kotlinp/testData/SimplePackage.kt rename to libraries/tools/kotlinp/jvm/testData/SimplePackage.kt diff --git a/libraries/tools/kotlinp/testData/SimplePackage.txt b/libraries/tools/kotlinp/jvm/testData/SimplePackage.txt similarity index 100% rename from libraries/tools/kotlinp/testData/SimplePackage.txt rename to libraries/tools/kotlinp/jvm/testData/SimplePackage.txt diff --git a/libraries/tools/kotlinp/testData/SyntheticClass.kt b/libraries/tools/kotlinp/jvm/testData/SyntheticClass.kt similarity index 100% rename from libraries/tools/kotlinp/testData/SyntheticClass.kt rename to libraries/tools/kotlinp/jvm/testData/SyntheticClass.kt diff --git a/libraries/tools/kotlinp/testData/SyntheticClass.txt b/libraries/tools/kotlinp/jvm/testData/SyntheticClass.txt similarity index 100% rename from libraries/tools/kotlinp/testData/SyntheticClass.txt rename to libraries/tools/kotlinp/jvm/testData/SyntheticClass.txt diff --git a/libraries/tools/kotlinp/testData/TypeAlias.fir.txt b/libraries/tools/kotlinp/jvm/testData/TypeAlias.fir.txt similarity index 100% rename from libraries/tools/kotlinp/testData/TypeAlias.fir.txt rename to libraries/tools/kotlinp/jvm/testData/TypeAlias.fir.txt diff --git a/libraries/tools/kotlinp/testData/TypeAlias.kt b/libraries/tools/kotlinp/jvm/testData/TypeAlias.kt similarity index 100% rename from libraries/tools/kotlinp/testData/TypeAlias.kt rename to libraries/tools/kotlinp/jvm/testData/TypeAlias.kt diff --git a/libraries/tools/kotlinp/testData/TypeAlias.txt b/libraries/tools/kotlinp/jvm/testData/TypeAlias.txt similarity index 100% rename from libraries/tools/kotlinp/testData/TypeAlias.txt rename to libraries/tools/kotlinp/jvm/testData/TypeAlias.txt diff --git a/libraries/tools/kotlinp/testData/TypeParameters.kt b/libraries/tools/kotlinp/jvm/testData/TypeParameters.kt similarity index 100% rename from libraries/tools/kotlinp/testData/TypeParameters.kt rename to libraries/tools/kotlinp/jvm/testData/TypeParameters.kt diff --git a/libraries/tools/kotlinp/testData/TypeParameters.txt b/libraries/tools/kotlinp/jvm/testData/TypeParameters.txt similarity index 100% rename from libraries/tools/kotlinp/testData/TypeParameters.txt rename to libraries/tools/kotlinp/jvm/testData/TypeParameters.txt diff --git a/libraries/tools/kotlinp/testData/ValueClass.kt b/libraries/tools/kotlinp/jvm/testData/ValueClass.kt similarity index 100% rename from libraries/tools/kotlinp/testData/ValueClass.kt rename to libraries/tools/kotlinp/jvm/testData/ValueClass.kt diff --git a/libraries/tools/kotlinp/testData/ValueClass.txt b/libraries/tools/kotlinp/jvm/testData/ValueClass.txt similarity index 100% rename from libraries/tools/kotlinp/testData/ValueClass.txt rename to libraries/tools/kotlinp/jvm/testData/ValueClass.txt diff --git a/libraries/tools/kotlinp/testData/VarargInAnnotation.kt b/libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.kt similarity index 100% rename from libraries/tools/kotlinp/testData/VarargInAnnotation.kt rename to libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.kt diff --git a/libraries/tools/kotlinp/testData/VarargInAnnotation.txt b/libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.txt similarity index 100% rename from libraries/tools/kotlinp/testData/VarargInAnnotation.txt rename to libraries/tools/kotlinp/jvm/testData/VarargInAnnotation.txt diff --git a/libraries/tools/kotlinp/testData/VersionRequirement.kt b/libraries/tools/kotlinp/jvm/testData/VersionRequirement.kt similarity index 100% rename from libraries/tools/kotlinp/testData/VersionRequirement.kt rename to libraries/tools/kotlinp/jvm/testData/VersionRequirement.kt diff --git a/libraries/tools/kotlinp/testData/VersionRequirement.txt b/libraries/tools/kotlinp/jvm/testData/VersionRequirement.txt similarity index 100% rename from libraries/tools/kotlinp/testData/VersionRequirement.txt rename to libraries/tools/kotlinp/jvm/testData/VersionRequirement.txt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/All.kt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/All.kt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/All.kt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/All.kt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/All.txt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/All.txt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/All.txt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/All.txt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.kt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.kt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.kt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.kt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.txt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.txt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/AllCompatibility.txt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/AllCompatibility.txt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.kt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.kt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.kt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.txt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.txt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/withCompatibility.txt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/withCompatibility.txt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.kt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.kt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.kt diff --git a/libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.txt b/libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.txt similarity index 100% rename from libraries/tools/kotlinp/testData/jvmDefault/withoutCompatibility.txt rename to libraries/tools/kotlinp/jvm/testData/jvmDefault/withoutCompatibility.txt diff --git a/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt b/libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.kt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/AnonymousObject.kt rename to libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.kt diff --git a/libraries/tools/kotlinp/testData/localClasses/AnonymousObject.txt b/libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.txt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/AnonymousObject.txt rename to libraries/tools/kotlinp/jvm/testData/localClasses/AnonymousObject.txt diff --git a/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt b/libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.kt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.kt rename to libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.kt diff --git a/libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.txt b/libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.txt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/DeepInnerLocalChain.txt rename to libraries/tools/kotlinp/jvm/testData/localClasses/DeepInnerLocalChain.txt diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.fir.txt b/libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.fir.txt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.fir.txt rename to libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.fir.txt diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt b/libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.kt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.kt rename to libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.kt diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.txt b/libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.txt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/LocalClassInConstructor.txt rename to libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInConstructor.txt diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.kt b/libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.kt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.kt rename to libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.kt diff --git a/libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.txt b/libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.txt similarity index 100% rename from libraries/tools/kotlinp/testData/localClasses/LocalClassInSignature.txt rename to libraries/tools/kotlinp/jvm/testData/localClasses/LocalClassInSignature.txt diff --git a/libraries/tools/kotlinp/testData/scriptSimple.kts b/libraries/tools/kotlinp/jvm/testData/scriptSimple.kts similarity index 100% rename from libraries/tools/kotlinp/testData/scriptSimple.kts rename to libraries/tools/kotlinp/jvm/testData/scriptSimple.kts diff --git a/libraries/tools/kotlinp/testData/scriptSimple.txt b/libraries/tools/kotlinp/jvm/testData/scriptSimple.txt similarity index 100% rename from libraries/tools/kotlinp/testData/scriptSimple.txt rename to libraries/tools/kotlinp/jvm/testData/scriptSimple.txt diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 8e6d0f6deb7..5115255c0ec 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -45,7 +45,7 @@ dependencies { embedded(project(":kotlin-annotation-processing-cli")) { isTransitive = false } embedded(project(":kotlin-annotation-processing-base")) { isTransitive = false } - testApi(project(":tools:kotlinp")) + testApi(project(":tools:kotlinp-jvm")) testApi(project(":kotlinx-metadata-jvm")) } diff --git a/settings.gradle b/settings.gradle index 8b1d4fb393e..b8c2cd53e10 100644 --- a/settings.gradle +++ b/settings.gradle @@ -199,6 +199,7 @@ include ":kotlin-imports-dumper-compiler-plugin", ":generators:test-generator", ":generators:tree-generator-common", ":tools:kotlinp", + ":tools:kotlinp-jvm", ":kotlin-build-tools-enum-compat", ":kotlin-gradle-compiler-types", ":kotlin-gradle-plugin-api", @@ -759,6 +760,7 @@ project(':kotlin-assignment-compiler-plugin.cli').projectDir = "$rootDir/plugins project(':kotlin-assignment-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/assign-plugin/assign-plugin.embeddable" as File project(':tools:kotlinp').projectDir = "$rootDir/libraries/tools/kotlinp" as File +project(':tools:kotlinp-jvm').projectDir = "$rootDir/libraries/tools/kotlinp/jvm" as File project(":kotlin-build-tools-enum-compat").projectDir = "$rootDir/libraries/tools/kotlin-build-tools-enum-compat" as File project(':kotlin-gradle-compiler-types').projectDir = "$rootDir/libraries/tools/kotlin-gradle-compiler-types" as File project(':kotlin-gradle-plugin-api').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-api" as File