diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml index 13c79f6a8f0..e55df28b918 100644 --- a/.idea/kotlinTestDataPluginTestDataPaths.xml +++ b/.idea/kotlinTestDataPluginTestDataPaths.xml @@ -63,7 +63,7 @@ - \ No newline at end of file + diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 9a3256eff90..cbc0dcc2692 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -402,7 +402,7 @@ fun main(args: Array) { } } - testGroup("plugins/allopen/allopen-cli/tests-gen", "plugins/allopen/allopen-cli/testData") { + testGroup("plugins/allopen/tests-gen", "plugins/allopen/testData") { testClass { model("bytecodeListing", excludedPattern = excludedFirTestdataPattern) } diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts deleted file mode 100644 index 74829005588..00000000000 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ /dev/null @@ -1,56 +0,0 @@ -description = "Kotlin AllOpen Compiler Plugin" - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - compileOnly(project(":compiler:plugin-api")) - compileOnly(project(":compiler:frontend")) - - compileOnly(project(":compiler:fir:cones")) - compileOnly(project(":compiler:fir:tree")) - compileOnly(project(":compiler:fir:resolve")) - compileOnly(project(":compiler:fir:checkers")) - compileOnly(project(":compiler:ir.backend.common")) - compileOnly(project(":compiler:fir:entrypoint")) - - compileOnly(intellijCore()) - - runtimeOnly(kotlinStdlib()) - - testApi(project(":compiler:backend")) - testApi(project(":compiler:cli")) - - testApi(intellijCore()) - - testApiJUnit5() - testApi(projectTests(":compiler:tests-common-new")) - testApi(projectTests(":compiler:test-infrastructure")) - testApi(projectTests(":compiler:test-infrastructure-utils")) - testApi(project(":compiler:fir:checkers")) - testRuntimeOnly(project(":compiler:fir:fir-serialization")) - - testCompileOnly(project(":kotlin-reflect-api")) - testRuntimeOnly(project(":kotlin-reflect")) - testRuntimeOnly(project(":core:descriptors.runtime")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - projectDefault() - generatedTestDir() - } -} - -runtimeJar() -sourcesJar() -javadocJar() -testsJar() - -projectTest(parallel = true) { - workingDir = rootDir - useJUnitPlatform() -} diff --git a/plugins/allopen/allopen.cli/build.gradle.kts b/plugins/allopen/allopen.cli/build.gradle.kts new file mode 100644 index 00000000000..a338871ca7a --- /dev/null +++ b/plugins/allopen/allopen.cli/build.gradle.kts @@ -0,0 +1,33 @@ +description = "Kotlin AllOpen Compiler Plugin (CLI)" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + implementation(project(":kotlin-allopen-compiler-plugin.k1")) + implementation(project(":kotlin-allopen-compiler-plugin.k2")) + compileOnly(project(":compiler:plugin-api")) + compileOnly(project(":compiler:frontend")) + + compileOnly(project(":compiler:fir:cones")) + compileOnly(project(":compiler:fir:tree")) + compileOnly(project(":compiler:fir:resolve")) + compileOnly(project(":compiler:fir:checkers")) + compileOnly(project(":compiler:ir.backend.common")) + compileOnly(project(":compiler:fir:entrypoint")) + + compileOnly(intellijCore()) + + runtimeOnly(kotlinStdlib()) +} + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} + +runtimeJar() +sourcesJar() +javadocJar() diff --git a/plugins/allopen/allopen-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/allopen/allopen.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor similarity index 100% rename from plugins/allopen/allopen-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor rename to plugins/allopen/allopen.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor diff --git a/plugins/allopen/allopen-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar b/plugins/allopen/allopen.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar similarity index 100% rename from plugins/allopen/allopen-cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar rename to plugins/allopen/allopen.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar diff --git a/plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/AllOpenPlugin.kt b/plugins/allopen/allopen.cli/src/org/jetbrains/kotlin/allopen/AllOpenPlugin.kt similarity index 100% rename from plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/AllOpenPlugin.kt rename to plugins/allopen/allopen.cli/src/org/jetbrains/kotlin/allopen/AllOpenPlugin.kt diff --git a/plugins/allopen/allopen.k1/build.gradle.kts b/plugins/allopen/allopen.k1/build.gradle.kts new file mode 100644 index 00000000000..f559cee99c6 --- /dev/null +++ b/plugins/allopen/allopen.k1/build.gradle.kts @@ -0,0 +1,23 @@ +description = "Kotlin AllOpen Compiler Plugin (K1)" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compileOnly(project(":compiler:plugin-api")) + compileOnly(project(":compiler:frontend")) + + compileOnly(intellijCore()) + runtimeOnly(kotlinStdlib()) +} + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} + +runtimeJar() +sourcesJar() +javadocJar() diff --git a/plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/AllOpenDeclarationAttributeAltererExtension.kt b/plugins/allopen/allopen.k1/src/org/jetbrains/kotlin/allopen/AllOpenDeclarationAttributeAltererExtension.kt similarity index 100% rename from plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/AllOpenDeclarationAttributeAltererExtension.kt rename to plugins/allopen/allopen.k1/src/org/jetbrains/kotlin/allopen/AllOpenDeclarationAttributeAltererExtension.kt diff --git a/plugins/allopen/allopen.k2/build.gradle.kts b/plugins/allopen/allopen.k2/build.gradle.kts new file mode 100644 index 00000000000..7fc77b22e37 --- /dev/null +++ b/plugins/allopen/allopen.k2/build.gradle.kts @@ -0,0 +1,27 @@ +description = "Kotlin AllOpen Compiler Plugin (K2)" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compileOnly(project(":compiler:fir:cones")) + compileOnly(project(":compiler:fir:tree")) + compileOnly(project(":compiler:fir:resolve")) + compileOnly(project(":compiler:fir:checkers")) + compileOnly(project(":compiler:ir.backend.common")) + compileOnly(project(":compiler:fir:entrypoint")) + + compileOnly(intellijCore()) + runtimeOnly(kotlinStdlib()) +} + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} + +runtimeJar() +sourcesJar() +javadocJar() diff --git a/plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenExtensionRegistrar.kt b/plugins/allopen/allopen.k2/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenExtensionRegistrar.kt similarity index 100% rename from plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenExtensionRegistrar.kt rename to plugins/allopen/allopen.k2/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenExtensionRegistrar.kt diff --git a/plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenStatusTransformer.kt b/plugins/allopen/allopen.k2/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenStatusTransformer.kt similarity index 100% rename from plugins/allopen/allopen-cli/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenStatusTransformer.kt rename to plugins/allopen/allopen.k2/src/org/jetbrains/kotlin/allopen/fir/FirAllOpenStatusTransformer.kt diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts new file mode 100644 index 00000000000..43aa4c174a8 --- /dev/null +++ b/plugins/allopen/build.gradle.kts @@ -0,0 +1,50 @@ +description = "Kotlin AllOpen Compiler Plugin" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + embedded(project(":kotlin-allopen-compiler-plugin.cli")) { isTransitive = false } + embedded(project(":kotlin-allopen-compiler-plugin.k1")) { isTransitive = false } + embedded(project(":kotlin-allopen-compiler-plugin.k2")) { isTransitive = false } + + testImplementation(project(":kotlin-allopen-compiler-plugin")) + testImplementation(project(":kotlin-allopen-compiler-plugin.k1")) + testImplementation(project(":kotlin-allopen-compiler-plugin.k2")) + testImplementation(project(":kotlin-allopen-compiler-plugin.cli")) + testImplementation(project(":compiler:backend")) + testImplementation(project(":compiler:cli")) + + testImplementation(intellijCore()) + + testApiJUnit5() + testImplementation(projectTests(":compiler:tests-common-new")) + testImplementation(projectTests(":compiler:test-infrastructure")) + testImplementation(projectTests(":compiler:test-infrastructure-utils")) + testImplementation(project(":compiler:fir:checkers")) + testRuntimeOnly(project(":compiler:fir:fir-serialization")) + + testCompileOnly(project(":kotlin-reflect-api")) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) +} + +sourceSets { + "main" { none() } + "test" { + projectDefault() + generatedTestDir() + } +} + +runtimeJar() +sourcesJar() +javadocJar() +testsJar() + +projectTest(parallel = true) { + workingDir = rootDir + useJUnitPlatform() +} diff --git a/plugins/allopen/allopen-cli/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt similarity index 100% rename from plugins/allopen/allopen-cli/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt rename to plugins/allopen/test/org/jetbrains/kotlin/allopen/AbstractBytecodeListingTestForAllOpen.kt diff --git a/plugins/allopen/allopen-cli/test/org/jetbrains/kotlin/allopen/AllOpenEnvironmentConfigurator.kt b/plugins/allopen/test/org/jetbrains/kotlin/allopen/AllOpenEnvironmentConfigurator.kt similarity index 100% rename from plugins/allopen/allopen-cli/test/org/jetbrains/kotlin/allopen/AllOpenEnvironmentConfigurator.kt rename to plugins/allopen/test/org/jetbrains/kotlin/allopen/AllOpenEnvironmentConfigurator.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.kt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.kt rename to plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.txt rename to plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses_ir.txt b/plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses_ir.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses_ir.txt rename to plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses_ir.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.kt b/plugins/allopen/testData/bytecodeListing/alreadyOpen.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.kt rename to plugins/allopen/testData/bytecodeListing/alreadyOpen.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt b/plugins/allopen/testData/bytecodeListing/alreadyOpen.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.txt rename to plugins/allopen/testData/bytecodeListing/alreadyOpen.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.kt b/plugins/allopen/testData/bytecodeListing/annotationMembers.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.kt rename to plugins/allopen/testData/bytecodeListing/annotationMembers.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.txt b/plugins/allopen/testData/bytecodeListing/annotationMembers.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.txt rename to plugins/allopen/testData/bytecodeListing/annotationMembers.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.kt b/plugins/allopen/testData/bytecodeListing/anonymousObject.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.kt rename to plugins/allopen/testData/bytecodeListing/anonymousObject.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt b/plugins/allopen/testData/bytecodeListing/anonymousObject.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.txt rename to plugins/allopen/testData/bytecodeListing/anonymousObject.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject_ir.txt b/plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject_ir.txt rename to plugins/allopen/testData/bytecodeListing/anonymousObject_ir.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.kt b/plugins/allopen/testData/bytecodeListing/explicitFinal.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.kt rename to plugins/allopen/testData/bytecodeListing/explicitFinal.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt b/plugins/allopen/testData/bytecodeListing/explicitFinal.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.txt rename to plugins/allopen/testData/bytecodeListing/explicitFinal.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.kt b/plugins/allopen/testData/bytecodeListing/metaAnnotation.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.kt rename to plugins/allopen/testData/bytecodeListing/metaAnnotation.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.txt b/plugins/allopen/testData/bytecodeListing/metaAnnotation.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.txt rename to plugins/allopen/testData/bytecodeListing/metaAnnotation.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.kt b/plugins/allopen/testData/bytecodeListing/nestedClass.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.kt rename to plugins/allopen/testData/bytecodeListing/nestedClass.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.txt b/plugins/allopen/testData/bytecodeListing/nestedClass.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.txt rename to plugins/allopen/testData/bytecodeListing/nestedClass.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.kt b/plugins/allopen/testData/bytecodeListing/nestedInner.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.kt rename to plugins/allopen/testData/bytecodeListing/nestedInner.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt b/plugins/allopen/testData/bytecodeListing/nestedInner.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.txt rename to plugins/allopen/testData/bytecodeListing/nestedInner.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.kt b/plugins/allopen/testData/bytecodeListing/noAllOpen.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.kt rename to plugins/allopen/testData/bytecodeListing/noAllOpen.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt b/plugins/allopen/testData/bytecodeListing/noAllOpen.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.txt rename to plugins/allopen/testData/bytecodeListing/noAllOpen.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt b/plugins/allopen/testData/bytecodeListing/privateMembers.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt rename to plugins/allopen/testData/bytecodeListing/privateMembers.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt b/plugins/allopen/testData/bytecodeListing/privateMembers.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.txt rename to plugins/allopen/testData/bytecodeListing/privateMembers.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers_ir.txt b/plugins/allopen/testData/bytecodeListing/privateMembers_ir.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers_ir.txt rename to plugins/allopen/testData/bytecodeListing/privateMembers_ir.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.kt b/plugins/allopen/testData/bytecodeListing/sealed.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.kt rename to plugins/allopen/testData/bytecodeListing/sealed.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt b/plugins/allopen/testData/bytecodeListing/sealed.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.txt rename to plugins/allopen/testData/bytecodeListing/sealed.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.kt b/plugins/allopen/testData/bytecodeListing/severalAllOpen.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.kt rename to plugins/allopen/testData/bytecodeListing/severalAllOpen.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt b/plugins/allopen/testData/bytecodeListing/severalAllOpen.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.txt rename to plugins/allopen/testData/bytecodeListing/severalAllOpen.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.kt b/plugins/allopen/testData/bytecodeListing/simple.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/simple.kt rename to plugins/allopen/testData/bytecodeListing/simple.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt b/plugins/allopen/testData/bytecodeListing/simple.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/simple.txt rename to plugins/allopen/testData/bytecodeListing/simple.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.kt b/plugins/allopen/testData/bytecodeListing/springAnnotations.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.kt rename to plugins/allopen/testData/bytecodeListing/springAnnotations.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.txt b/plugins/allopen/testData/bytecodeListing/springAnnotations.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.txt rename to plugins/allopen/testData/bytecodeListing/springAnnotations.txt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.kt b/plugins/allopen/testData/bytecodeListing/superClassAnnotation.kt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.kt rename to plugins/allopen/testData/bytecodeListing/superClassAnnotation.kt diff --git a/plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt b/plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt similarity index 100% rename from plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.txt rename to plugins/allopen/testData/bytecodeListing/superClassAnnotation.txt diff --git a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java similarity index 62% rename from plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java index 31fc55c4943..00c433a10fd 100644 --- a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/BytecodeListingTestForAllOpenGenerated.java @@ -17,101 +17,101 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/allopen/allopen-cli/testData/bytecodeListing") +@TestMetadata("plugins/allopen/testData/bytecodeListing") @TestDataPath("$PROJECT_ROOT") public class BytecodeListingTestForAllOpenGenerated extends AbstractBytecodeListingTestForAllOpen { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/allopen-cli/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM, true); } @Test @TestMetadata("allOpenOnNotClasses.kt") public void testAllOpenOnNotClasses() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.kt"); + runTest("plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt"); } @Test @TestMetadata("alreadyOpen.kt") public void testAlreadyOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/alreadyOpen.kt"); } @Test @TestMetadata("annotationMembers.kt") public void testAnnotationMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/annotationMembers.kt"); } @Test @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.kt"); + runTest("plugins/allopen/testData/bytecodeListing/anonymousObject.kt"); } @Test @TestMetadata("explicitFinal.kt") public void testExplicitFinal() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.kt"); + runTest("plugins/allopen/testData/bytecodeListing/explicitFinal.kt"); } @Test @TestMetadata("metaAnnotation.kt") public void testMetaAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/metaAnnotation.kt"); } @Test @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedClass.kt"); } @Test @TestMetadata("nestedInner.kt") public void testNestedInner() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedInner.kt"); } @Test @TestMetadata("noAllOpen.kt") public void testNoAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/noAllOpen.kt"); } @Test @TestMetadata("privateMembers.kt") public void testPrivateMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/privateMembers.kt"); } @Test @TestMetadata("sealed.kt") public void testSealed() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.kt"); + runTest("plugins/allopen/testData/bytecodeListing/sealed.kt"); } @Test @TestMetadata("severalAllOpen.kt") public void testSeveralAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/severalAllOpen.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/simple.kt"); + runTest("plugins/allopen/testData/bytecodeListing/simple.kt"); } @Test @TestMetadata("springAnnotations.kt") public void testSpringAnnotations() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.kt"); + runTest("plugins/allopen/testData/bytecodeListing/springAnnotations.kt"); } @Test @TestMetadata("superClassAnnotation.kt") public void testSuperClassAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/superClassAnnotation.kt"); } } diff --git a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java similarity index 62% rename from plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java index ec971869394..0e7a8a073ed 100644 --- a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/FirBytecodeListingTestForAllOpenGenerated.java @@ -17,101 +17,101 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/allopen/allopen-cli/testData/bytecodeListing") +@TestMetadata("plugins/allopen/testData/bytecodeListing") @TestDataPath("$PROJECT_ROOT") public class FirBytecodeListingTestForAllOpenGenerated extends AbstractFirBytecodeListingTestForAllOpen { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/allopen-cli/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); } @Test @TestMetadata("allOpenOnNotClasses.kt") public void testAllOpenOnNotClasses() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.kt"); + runTest("plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt"); } @Test @TestMetadata("alreadyOpen.kt") public void testAlreadyOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/alreadyOpen.kt"); } @Test @TestMetadata("annotationMembers.kt") public void testAnnotationMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/annotationMembers.kt"); } @Test @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.kt"); + runTest("plugins/allopen/testData/bytecodeListing/anonymousObject.kt"); } @Test @TestMetadata("explicitFinal.kt") public void testExplicitFinal() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.kt"); + runTest("plugins/allopen/testData/bytecodeListing/explicitFinal.kt"); } @Test @TestMetadata("metaAnnotation.kt") public void testMetaAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/metaAnnotation.kt"); } @Test @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedClass.kt"); } @Test @TestMetadata("nestedInner.kt") public void testNestedInner() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedInner.kt"); } @Test @TestMetadata("noAllOpen.kt") public void testNoAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/noAllOpen.kt"); } @Test @TestMetadata("privateMembers.kt") public void testPrivateMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/privateMembers.kt"); } @Test @TestMetadata("sealed.kt") public void testSealed() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.kt"); + runTest("plugins/allopen/testData/bytecodeListing/sealed.kt"); } @Test @TestMetadata("severalAllOpen.kt") public void testSeveralAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/severalAllOpen.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/simple.kt"); + runTest("plugins/allopen/testData/bytecodeListing/simple.kt"); } @Test @TestMetadata("springAnnotations.kt") public void testSpringAnnotations() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.kt"); + runTest("plugins/allopen/testData/bytecodeListing/springAnnotations.kt"); } @Test @TestMetadata("superClassAnnotation.kt") public void testSuperClassAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/superClassAnnotation.kt"); } } diff --git a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java similarity index 62% rename from plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java rename to plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java index 66194dfa305..e3dd11a5dd9 100644 --- a/plugins/allopen/allopen-cli/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java +++ b/plugins/allopen/tests-gen/org/jetbrains/kotlin/allopen/IrBytecodeListingTestForAllOpenGenerated.java @@ -17,101 +17,101 @@ import java.util.regex.Pattern; /** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("plugins/allopen/allopen-cli/testData/bytecodeListing") +@TestMetadata("plugins/allopen/testData/bytecodeListing") @TestDataPath("$PROJECT_ROOT") public class IrBytecodeListingTestForAllOpenGenerated extends AbstractIrBytecodeListingTestForAllOpen { @Test public void testAllFilesPresentInBytecodeListing() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/allopen-cli/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/allopen/testData/bytecodeListing"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.fir\\.kts?$"), TargetBackend.JVM_IR, true); } @Test @TestMetadata("allOpenOnNotClasses.kt") public void testAllOpenOnNotClasses() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/allOpenOnNotClasses.kt"); + runTest("plugins/allopen/testData/bytecodeListing/allOpenOnNotClasses.kt"); } @Test @TestMetadata("alreadyOpen.kt") public void testAlreadyOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/alreadyOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/alreadyOpen.kt"); } @Test @TestMetadata("annotationMembers.kt") public void testAnnotationMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/annotationMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/annotationMembers.kt"); } @Test @TestMetadata("anonymousObject.kt") public void testAnonymousObject() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/anonymousObject.kt"); + runTest("plugins/allopen/testData/bytecodeListing/anonymousObject.kt"); } @Test @TestMetadata("explicitFinal.kt") public void testExplicitFinal() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/explicitFinal.kt"); + runTest("plugins/allopen/testData/bytecodeListing/explicitFinal.kt"); } @Test @TestMetadata("metaAnnotation.kt") public void testMetaAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/metaAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/metaAnnotation.kt"); } @Test @TestMetadata("nestedClass.kt") public void testNestedClass() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedClass.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedClass.kt"); } @Test @TestMetadata("nestedInner.kt") public void testNestedInner() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/nestedInner.kt"); + runTest("plugins/allopen/testData/bytecodeListing/nestedInner.kt"); } @Test @TestMetadata("noAllOpen.kt") public void testNoAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/noAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/noAllOpen.kt"); } @Test @TestMetadata("privateMembers.kt") public void testPrivateMembers() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/privateMembers.kt"); + runTest("plugins/allopen/testData/bytecodeListing/privateMembers.kt"); } @Test @TestMetadata("sealed.kt") public void testSealed() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/sealed.kt"); + runTest("plugins/allopen/testData/bytecodeListing/sealed.kt"); } @Test @TestMetadata("severalAllOpen.kt") public void testSeveralAllOpen() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/severalAllOpen.kt"); + runTest("plugins/allopen/testData/bytecodeListing/severalAllOpen.kt"); } @Test @TestMetadata("simple.kt") public void testSimple() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/simple.kt"); + runTest("plugins/allopen/testData/bytecodeListing/simple.kt"); } @Test @TestMetadata("springAnnotations.kt") public void testSpringAnnotations() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/springAnnotations.kt"); + runTest("plugins/allopen/testData/bytecodeListing/springAnnotations.kt"); } @Test @TestMetadata("superClassAnnotation.kt") public void testSuperClassAnnotation() throws Exception { - runTest("plugins/allopen/allopen-cli/testData/bytecodeListing/superClassAnnotation.kt"); + runTest("plugins/allopen/testData/bytecodeListing/superClassAnnotation.kt"); } } diff --git a/settings.gradle b/settings.gradle index c0c36ab76c3..210bcb2dbf7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -186,9 +186,14 @@ include ":benchmarks", ":dependencies:intellij-core", ":plugins:android-extensions-compiler", ":kotlin-android-extensions", - ":kotlin-android-extensions-runtime", - ":kotlin-allopen-compiler-plugin", - ":kotlin-noarg-compiler-plugin", + ":kotlin-android-extensions-runtime" + +include ":kotlin-allopen-compiler-plugin", + ":kotlin-allopen-compiler-plugin.cli", + ":kotlin-allopen-compiler-plugin.k1", + ":kotlin-allopen-compiler-plugin.k2" + +include ":kotlin-noarg-compiler-plugin", ":kotlin-sam-with-receiver-compiler-plugin", ":kotlin-imports-dumper-compiler-plugin", ":kotlin-script-runtime", @@ -673,7 +678,10 @@ project(':plugins:android-extensions-compiler').projectDir = "$rootDir/plugins/a project(':kotlin-android-extensions').projectDir = "$rootDir/prepare/android-extensions-compiler-gradle" as File project(':kotlin-parcelize-compiler').projectDir = "$rootDir/prepare/parcelize-compiler-gradle" as File project(':kotlin-android-extensions-runtime').projectDir = "$rootDir/plugins/android-extensions/android-extensions-runtime" as File -project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File +project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen" as File +project(':kotlin-allopen-compiler-plugin.cli').projectDir = "$rootDir/plugins/allopen/allopen.cli" as File +project(':kotlin-allopen-compiler-plugin.k1').projectDir = "$rootDir/plugins/allopen/allopen.k1" as File +project(':kotlin-allopen-compiler-plugin.k2').projectDir = "$rootDir/plugins/allopen/allopen.k2" as File project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg/noarg-cli" as File project(':kotlin-sam-with-receiver-compiler-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-cli" as File project(':tools:kotlinp').projectDir = "$rootDir/libraries/tools/kotlinp" as File