Rename module ':compiler.tests-common' -> ':compiler:tests-common'

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()
+publish()

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"))
 

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

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"))

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") }
+    "main" { projectDefault() }
-    "test" {}
+    "test" { }
 }