Get rid of test-to-production dependencies as it's not supported in plain IDEA projects

generators/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
 }
 
 sourceSets {
-    "main" { projectDefault() }
+    "main" { }
     "test" { projectDefault() }
 }
 

idea/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
 
     testCompile(project(":kotlin-test:kotlin-test-junit"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm")) { isTransitive = false }
     testCompile(project(":idea:idea-gradle")) { isTransitive = false }
     testCompile(project(":idea:idea-maven")) { isTransitive = false }

idea/idea-android/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
     }
 
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:lint")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm"))
     testCompile(projectTests(":compiler:tests-common"))

idea/idea-gradle/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
     compileOnly(intellijPluginDep("junit")) { includeJars("idea-junit") }
 
     testCompile(projectTests(":idea"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompile(intellijPluginDep("gradle")) { includeJars("gradle-wrapper", "gradle-base-services", "gradle-tooling-extension-impl", "gradle-tooling-api", "gradle", rootProject = rootProject) }
     testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }

idea/idea-maven/build.gradle.kts

@@ -21,7 +21,7 @@ dependencies {
 
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
 
     testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "gson", "idea_rt", rootProject = rootProject) }
     testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") }

idea/idea-test-framework/build.gradle.kts

@@ -3,22 +3,22 @@ apply { plugin("kotlin") }
 apply { plugin("jps-compatible") }
 
 dependencies {
-    compile(project(":compiler:frontend"))
-    compile(project(":compiler:frontend.script"))
-    compile(projectTests(":compiler:tests-common"))
-    compile(project(":idea"))
-    compile(project(":idea:idea-jvm"))
-    compile(project(":idea:idea-core"))
-    compile(project(":idea:idea-jps-common"))
-    compile(project(":kotlin-test:kotlin-test-jvm"))
-    compileOnly(project(":kotlin-reflect-api"))
-    compile(commonDep("junit:junit"))
-    compileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
+    testCompile(project(":compiler:frontend"))
+    testCompile(project(":compiler:frontend.script"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(project(":idea"))
+    testCompile(project(":idea:idea-jvm"))
+    testCompile(project(":idea:idea-core"))
+    testCompile(project(":idea:idea-jps-common"))
+    testCompile(project(":kotlin-test:kotlin-test-jvm"))
+    testCompileOnly(project(":kotlin-reflect-api"))
+    testCompile(commonDep("junit:junit"))
+    testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") }
 }
 
 sourceSets {
-    "main" { projectDefault() }
-    "test" {}
+    "main" { }
+    "test" { projectDefault() }
 }
 
-
+testsJar()

j2k/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
 
     testCompile(project(":idea"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
     testCompile(project(":compiler:light-classes"))
     testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
     testCompile(commonDep("junit:junit"))

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:frontend.java"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:kapt3-idea"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea"))

plugins/uast-kotlin/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
-    testCompile(project(":idea:idea-test-framework"))
+    testCompile(projectTests(":idea:idea-test-framework"))
     testCompileOnly(intellijDep()) { includeJars("idea_rt") }
 
     testRuntime(projectDist(":kotlin-reflect"))

ultimate/build.gradle.kts

@@ -57,7 +57,7 @@ dependencies {
     }
 
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
+    testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:lint")) { isTransitive = false }
     testCompile(project(":idea:idea-jvm")) { isTransitive = false }
     testCompile(projectTests(":compiler:tests-common"))