From c2276e2ccb769f31216c3e8d55c4050c4bfaa9de Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 16 Oct 2017 19:17:32 +0200 Subject: [PATCH] Rename module ':compiler.tests-common' -> ':compiler:tests-common' --- build-common/build.gradle.kts | 4 +- compiler/android-tests/build.gradle.kts | 2 +- compiler/build.gradle.kts | 2 +- .../build.gradle.kts | 2 +- .../tests-common}/build.gradle.kts | 6 +- .../intellij/testFramework/TestDataFile.java | 0 .../intellij/testFramework/TestDataPath.java | 0 .../kotlin/asJava/LightClassTestCommon.kt | 0 .../checkers/AbstractDiagnosticsTest.kt | 0 .../kotlin/checkers/BaseDiagnosticsTest.kt | 0 .../checkers/KotlinMultiFileTestWithJava.java | 0 .../kotlin/checkers/LazyOperationsLog.kt | 0 .../kotlin/checkers/LoggingStorageManager.kt | 0 .../kotlin/checkers/TestCheckerUtil.java | 0 .../AbstractDiagnosticsUsingJavacTest.kt | 0 .../javac/AbstractJavacDiagnosticsTest.kt | 0 .../javac/AbstractJavacFieldResolutionTest.kt | 0 .../codegen/AbstractBlackBoxCodegenTest.java | 0 .../codegen/AbstractBytecodeListingTest.kt | 0 .../codegen/AbstractBytecodeTextTest.kt | 0 .../AbstractCheckLocalVariablesTableTest.java | 0 ...actCompileKotlinAgainstInlineKotlinTest.kt | 0 ...bstractCompileKotlinAgainstKotlinTest.java | 0 .../codegen/AbstractDumpDeclarationsTest.kt | 0 .../codegen/AbstractLightAnalysisModeTest.kt | 0 .../codegen/AbstractLineNumberTest.java | 0 .../codegen/AbstractScriptCodegenTest.java | 0 ...AbstractTopLevelMembersInvocationTest.java | 0 .../kotlin/codegen/CodegenTestCase.java | 0 .../kotlin/codegen/CodegenTestFiles.java | 0 .../kotlin/codegen/CodegenTestUtil.java | 0 .../jetbrains/kotlin/codegen/DxChecker.java | 0 .../kotlin/codegen/GenerationUtils.kt | 0 .../kotlin/codegen/InlineTestUtil.kt | 0 .../jetbrains/kotlin/codegen/SMAPTestUtil.kt | 0 ...bstractDefaultArgumentsReflectionTest.java | 0 .../codegen/flags/AbstractWriteFlagsTest.java | 0 .../forTestCompile/ForTestCompileRuntime.java | 0 .../ir/AbstractIrBlackBoxCodegenTest.java | 0 .../ir/AbstractIrBlackBoxInlineCodegenTest.kt | 0 ...tIrCompileKotlinAgainstInlineKotlinTest.kt | 0 .../org/jetbrains/kotlin/codegen/testUtils.kt | 0 .../jetbrains/kotlin/daemon/LogCheckUtil.kt | 0 .../integration/AbstractAntTaskTest.java | 0 .../KotlinIntegrationTestBase.java | 0 .../jvm/compiler/AbstractLoadJavaTest.java | 0 ...bstractLoadJavaWithFastClassReadingTest.kt | 0 .../DeserializedScopeValidationVisitor.kt | 0 .../jvm/compiler/ExpectedLoadErrorsUtil.java | 0 .../jvm/compiler/LoadDescriptorUtil.java | 0 .../javac/AbstractLoadJavaUsingJavacTest.kt | 0 .../AbstractJvmRuntimeDescriptorLoaderTest.kt | 0 .../AbstractDescriptorRendererTest.kt | 0 .../kotlin/resolve/AbstractResolveTest.java | 0 .../kotlin/resolve/ExpectedResolveData.java | 0 .../resolve/ExpectedResolveDataUtil.java | 0 .../resolve/ExtensibleResolveTestCase.java | 0 ...stractAnnotationDescriptorResolveTest.java | 0 .../AbstractAnnotationParameterTest.kt | 0 ...ractEnhancedSignaturesResolvedCallsTest.kt | 0 .../calls/AbstractResolvedCallsTest.kt | 0 ...ResolvedConstructorDelegationCallsTests.kt | 0 ...bstractCompileTimeConstantEvaluatorTest.kt | 0 .../AbstractConstraintSystemTest.kt | 0 .../ConstraintSystemTestData.kt | 0 .../kotlin/resolve/lazy/JvmResolveUtil.kt | 0 .../resolve/lazy/lazyResolveTestUtils.kt | 0 .../kotlin/test/ConfigurationKind.kt | 0 .../kotlin/test/InTextDirectivesUtils.java | 0 .../kotlin/test/JUnit3RunnerWithInners.java | 0 .../kotlin/test/KotlinTestUtils.java | 0 .../test/KotlinTestWithEnvironment.java | 0 .../KotlinTestWithEnvironmentManagement.java | 0 .../jetbrains/kotlin/test/MockLibraryUtil.kt | 0 .../jetbrains/kotlin/test/TargetBackend.java | 0 .../kotlin/test/TestCaseWithTmpdir.java | 0 .../jetbrains/kotlin/test/TestJdkKind.java | 0 .../jetbrains/kotlin/test/TestMetadata.java | 0 .../kotlin/test/testFramework/EdtTestUtil.kt | 0 .../test/testFramework/KtParsingTestCase.java | 0 .../testFramework/KtPlatformLiteFixture.java | 0 .../testFramework/KtPlatformTestUtil.java | 0 .../test/testFramework/KtUsefulTestCase.java | 0 .../kotlin/test/testFramework/MockProjects.kt | 0 .../test/testFramework/TestRunnerUtil.java | 0 .../test/testFramework/VfsTestUtil.java | 0 .../mock/KtMockFileTypeManager.java | 0 .../mock/KtMockLanguageFileType.java | 0 .../mock/MockEditorEventMulticaster.java | 0 .../testFramework/mock/MockEditorFactory.java | 0 .../testFramework/mock/MockFileManager.java | 0 .../mock/MockPsiDocumentManager.java | 0 .../testFramework/mock/MockPsiManager.java | 0 .../kotlin/test/testFramework/util.kt | 0 .../kotlin/test/util/DescriptorValidator.java | 0 .../util/RecursiveDescriptorComparator.java | 0 .../util/RecursiveDescriptorProcessor.java | 0 .../kotlin/test/util/jetTestUtils.kt | 0 .../jetbrains/kotlin/tests/di/injection.kt | 0 .../CompilerTestLanguageVersionSettings.kt | 0 compiler/tests-java8/build.gradle.kts | 2 +- generators/build.gradle.kts | 2 +- gradle/project-schema.json | 70 +++++++++---------- idea/build.gradle.kts | 2 +- idea/idea-android/build.gradle.kts | 2 +- idea/idea-maven/build.gradle.kts | 2 +- idea/idea-test-framework/build.gradle.kts | 2 +- j2k/build.gradle.kts | 2 +- jps-plugin/build.gradle.kts | 2 +- js/js.tests/build.gradle.kts | 2 +- .../android-extensions-idea/build.gradle.kts | 2 +- plugins/kapt3/build.gradle.kts | 2 +- plugins/plugins-tests/build.gradle.kts | 2 +- .../source-sections-compiler/build.gradle.kts | 2 +- plugins/uast-kotlin/build.gradle.kts | 2 +- settings.gradle | 2 +- ultimate/build.gradle.kts | 2 +- 117 files changed, 58 insertions(+), 60 deletions(-) rename {compiler.tests-common => compiler/tests-common}/build.gradle.kts (86%) rename compiler/tests-common/{ => src}/com/intellij/testFramework/TestDataFile.java (100%) rename compiler/tests-common/{ => src}/com/intellij/testFramework/TestDataPath.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/TestCheckerUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/javac/AbstractJavacDiagnosticsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/checkers/javac/AbstractJavacFieldResolutionTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/CodegenTestCase.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/CodegenTestFiles.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/CodegenTestUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/DxChecker.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/GenerationUtils.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/InlineTestUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/codegen/testUtils.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/daemon/LogCheckUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/compiler/javac/AbstractLoadJavaUsingJavacTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/AbstractResolveTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/ExpectedResolveData.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/calls/AbstractEnhancedSignaturesResolvedCallsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/ConfigurationKind.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/InTextDirectivesUtils.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/KotlinTestUtils.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/MockLibraryUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/TargetBackend.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/TestJdkKind.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/TestMetadata.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/MockProjects.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/testFramework/util.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/util/DescriptorValidator.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/test/util/jetTestUtils.kt (100%) rename compiler/tests-common/{ => src}/org/jetbrains/kotlin/tests/di/injection.kt (100%) rename compiler/tests-common/{ => tests}/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt (100%) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 43ccbff7f5e..8867bc86e88 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compileOnly(project(":js:js.frontend")) compileOnly(ideaSdkDeps("util")) testCompile(commonDep("junit:junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(protobufFull()) testRuntime(projectDist(":kotlin-stdlib")) testRuntime(projectDist(":kotlin-reflect")) @@ -31,4 +31,4 @@ testsJar() projectTest() -publish() \ No newline at end of file +publish() diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 9d83ef762f0..778e39078eb 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -6,7 +6,7 @@ jvmTarget = "1.6" dependencies { compile(project(":compiler:util")) compile(project(":compiler:cli")) - compile(project(":compiler.tests-common")) + compile(project(":compiler:tests-common")) compile(project(":compiler:frontend")) compile(project(":compiler:backend")) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index efbb199e2b1..f542b242db3 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -43,7 +43,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm")) testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:tests-common-jvm6")) testCompile(project(":compiler:ir.ir2cfg")) testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index b479a4149c0..cbb40f726ba 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compile(project(":compiler:cli")) compile(project(":kotlin-build-common")) testCompile(commonDep("junit:junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(projectDist(":kotlin-stdlib")) testCompile(projectTests(":kotlin-build-common")) diff --git a/compiler.tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts similarity index 86% rename from compiler.tests-common/build.gradle.kts rename to compiler/tests-common/build.gradle.kts index 41b9d7e94db..01070ed7442 100644 --- a/compiler.tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -1,6 +1,4 @@ -// Have to stay in the separate dir: attempt to move it to the source root dir lead to invalid import into IDEA - apply { plugin("kotlin") } dependencies { @@ -31,6 +29,6 @@ dependencies { } sourceSets { - "main" { java.srcDir("../compiler/tests-common") } - "test" {} + "main" { projectDefault() } + "test" { } } diff --git a/compiler/tests-common/com/intellij/testFramework/TestDataFile.java b/compiler/tests-common/src/com/intellij/testFramework/TestDataFile.java similarity index 100% rename from compiler/tests-common/com/intellij/testFramework/TestDataFile.java rename to compiler/tests-common/src/com/intellij/testFramework/TestDataFile.java diff --git a/compiler/tests-common/com/intellij/testFramework/TestDataPath.java b/compiler/tests-common/src/com/intellij/testFramework/TestDataPath.java similarity index 100% rename from compiler/tests-common/com/intellij/testFramework/TestDataPath.java rename to compiler/tests-common/src/com/intellij/testFramework/TestDataPath.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/src/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/TestCheckerUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/TestCheckerUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/TestCheckerUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/TestCheckerUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractJavacDiagnosticsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractJavacDiagnosticsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractJavacDiagnosticsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractJavacDiagnosticsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractJavacFieldResolutionTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractJavacFieldResolutionTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractJavacFieldResolutionTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/checkers/javac/AbstractJavacFieldResolutionTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestCase.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestCase.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestFiles.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestFiles.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/CodegenTestUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/DxChecker.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/DxChecker.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/DxChecker.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/DxChecker.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/GenerationUtils.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/GenerationUtils.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/InlineTestUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/InlineTestUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/testUtils.kt b/compiler/tests-common/src/org/jetbrains/kotlin/codegen/testUtils.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/codegen/testUtils.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/codegen/testUtils.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/daemon/LogCheckUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/daemon/LogCheckUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/daemon/LogCheckUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/daemon/LogCheckUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/src/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java rename to compiler/tests-common/src/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaWithFastClassReadingTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/javac/AbstractLoadJavaUsingJavacTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/javac/AbstractLoadJavaUsingJavacTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/javac/AbstractLoadJavaUsingJavacTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/compiler/javac/AbstractLoadJavaUsingJavacTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/AbstractResolveTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/AbstractResolveTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/AbstractResolveTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/AbstractResolveTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveData.java b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExpectedResolveData.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveData.java rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExpectedResolveData.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractEnhancedSignaturesResolvedCallsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractEnhancedSignaturesResolvedCallsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractEnhancedSignaturesResolvedCallsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractEnhancedSignaturesResolvedCallsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt b/compiler/tests-common/src/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/ConfigurationKind.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/ConfigurationKind.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/InTextDirectivesUtils.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/InTextDirectivesUtils.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/InTextDirectivesUtils.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestUtils.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestUtils.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/MockLibraryUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/MockLibraryUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/MockLibraryUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/MockLibraryUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/TargetBackend.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/TargetBackend.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/TargetBackend.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/TargetBackend.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/TestJdkKind.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/TestJdkKind.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/TestJdkKind.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/TestJdkKind.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/TestMetadata.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/TestMetadata.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/TestMetadata.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/TestMetadata.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/MockProjects.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/MockProjects.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/MockProjects.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/MockProjects.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/util.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/util.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/testFramework/util.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/testFramework/util.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/DescriptorValidator.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/util/DescriptorValidator.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/util/DescriptorValidator.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/util/DescriptorValidator.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java b/compiler/tests-common/src/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java rename to compiler/tests-common/src/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt b/compiler/tests-common/src/org/jetbrains/kotlin/test/util/jetTestUtils.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/test/util/jetTestUtils.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests-common/src/org/jetbrains/kotlin/tests/di/injection.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/tests/di/injection.kt rename to compiler/tests-common/src/org/jetbrains/kotlin/tests/di/injection.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt similarity index 100% rename from compiler/tests-common/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt rename to compiler/tests-common/tests/org/jetbrains/kotlin/checkers/CompilerTestLanguageVersionSettings.kt diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 9cb903a996c..dfbcdbbfaa2 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":core")) testCompile(project(":compiler:util")) testCompile(project(":compiler:backend")) diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index d3dab71a72f..c7531237957 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { compile(projectTests(":plugins:uast-kotlin")) compile(projectTests(":js:js.tests")) compile(ideaSdkDeps("jps-build-test", subdir = "jps/test")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) diff --git a/gradle/project-schema.json b/gradle/project-schema.json index 242d3b13a4d..bb809f0514d 100644 --- a/gradle/project-schema.json +++ b/gradle/project-schema.json @@ -102,41 +102,6 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, - ":compiler.tests-common": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, ":core": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", @@ -2779,6 +2744,41 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, + ":compiler:tests-common": { + "conventions": { + "base": "org.gradle.api.plugins.BasePluginConvention", + "java": "org.gradle.api.plugins.JavaPluginConvention" + }, + "configurations": [ + "apiElements", + "archives", + "compile", + "compileClasspath", + "compileOnly", + "default", + "implementation", + "kapt", + "kaptTest", + "runtime", + "runtimeClasspath", + "runtimeElements", + "runtimeOnly", + "testCompile", + "testCompileClasspath", + "testCompileOnly", + "testImplementation", + "testRuntime", + "testRuntimeClasspath", + "testRuntimeOnly" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", + "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", + "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "reporting": "org.gradle.api.reporting.ReportingExtension" + } + }, ":compiler:tests-common-jvm6": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 41c43687ac6..9eb2091aa5c 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { compile(preloadedDeps("markdown", "kotlinx-coroutines-core")) testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false } testCompile(project(":idea:idea-gradle")) { isTransitive = false } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index e31c039ea98..3553ef80655 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compile(preloadedDeps("dx", subdir = "android-5.0/lib")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index c5cf7063439..fed88f282d4 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -18,7 +18,7 @@ dependencies { compile(project(":idea:idea-jps-common")) testCompile(projectTests(":idea")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) testCompileOnly(ideaSdkDeps("openapi", "idea", "gson")) testCompileOnly(ideaPluginDeps("maven", "maven-server-api", plugin = "maven")) diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index 62efc257f95..c332ac88b92 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -4,7 +4,7 @@ apply { plugin("kotlin") } dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.script")) - compile(project(":compiler.tests-common")) + compile(project(":compiler:tests-common")) compile(project(":idea")) compile(project(":idea:idea-core")) compile(project(":idea:idea-jps-common")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 23a1f3362a3..be2e5db5bfb 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { testCompile(project(":compiler:light-classes")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index f6234121184..4aa2ebbffed 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compile(projectRuntimeJar(":kotlin-preloader")) compile(project(":idea:idea-jps-common")) compile(ideaSdkDeps("jps-builders", "jps-builders-6", subdir = "jps")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:incremental-compilation-impl")) testCompileOnly(ideaSdkDeps("jps-build-test", subdir = "jps/test")) diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 95f0255e0c1..f83f40cbc2e 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -3,7 +3,7 @@ apply { plugin("kotlin") } dependencies { testCompile(protobufFull()) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompileOnly(project(":compiler:frontend")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":compiler:util")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 6fe3c03f88a..fdd37b3914d 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { compile(project(":plugins:android-extensions-compiler")) compile(ideaPluginDeps("android", "android-common", "sdk-tools", "sdk-common", plugin = "android")) compile(ideaPluginDeps("Groovy", plugin = "Groovy")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:frontend.java")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } diff --git a/plugins/kapt3/build.gradle.kts b/plugins/kapt3/build.gradle.kts index 50d1fd50fa7..ae3a8609ac1 100644 --- a/plugins/kapt3/build.gradle.kts +++ b/plugins/kapt3/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:plugin-api")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) } diff --git a/plugins/plugins-tests/build.gradle.kts b/plugins/plugins-tests/build.gradle.kts index 0fb2e6c693e..152b7135eb2 100644 --- a/plugins/plugins-tests/build.gradle.kts +++ b/plugins/plugins-tests/build.gradle.kts @@ -5,7 +5,7 @@ dependencies { testCompile(project(":compiler:util")) testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":plugins:android-extensions-compiler")) testCompile(project(":plugins:android-extensions-ide")) testCompile(project(":kotlin-android-extensions-runtime")) diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index 631c904cac1..9951df68ca6 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { testCompile(project(":compiler:frontend")) testCompile(project(":compiler:frontend.script")) testCompile(project(":compiler:plugin-api")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:util")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:cli-common")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 1a247db9ed9..3cf30762635 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compile(project(":compiler:light-classes")) compileOnly(ideaSdkDeps("openapi", "idea")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompile(project(":compiler.tests-common")) + testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(project(":compiler:util")) testCompile(project(":compiler:cli")) diff --git a/settings.gradle b/settings.gradle index 0310c303b19..8325faeefe4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,7 @@ include ":kotlin-build-common", ":compiler:cli", ":compiler:incremental-compilation-impl", ":compiler:android-tests", - ":compiler.tests-common", + ":compiler:tests-common", ":compiler:tests-common-jvm6", ":js:js.ast", ":js:js.serializer", diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index 0b16e411ce1..6ce9361c0b3 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { compile(ideaUltimatePluginDeps("*.jar", plugin = "JavaScriptDebugger")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) - testCompile(project(":compiler.tests-common")) { isTransitive = false } + testCompile(project(":compiler:tests-common")) { isTransitive = false } testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } testCompile(project(":idea:idea-jvm")) { isTransitive = false }