Fix tests after rebasing and messing with the dependencies

plugins/allopen/allopen-cli/build.gradle.kts

@@ -4,6 +4,8 @@ description = "Kotlin AllOpen Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijDep())
+
     compileOnly(project(":compiler:plugin-api"))
     compileOnly(project(":compiler:frontend"))
     compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -16,8 +18,6 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-
-    testRuntime(intellijDep())
 }
 
 sourceSets {
@@ -40,4 +40,4 @@ ideaPlugin {
 
 projectTest {
     workingDir = rootDir
-}
+}

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

@@ -7,6 +7,8 @@ val robolectricClasspath by configurations.creating
 val androidJar by configurations.creating
 
 dependencies {
+    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+
     compile(project(":compiler:util"))
     compile(project(":compiler:plugin-api"))
     compile(project(":compiler:frontend"))
@@ -58,4 +60,4 @@ projectTest {
         systemProperty("robolectric.classpath", robolectricClasspath.asPath)
         systemProperty("android.jar", androidJar.singleFile.canonicalPath)
     }
-}
+}

plugins/kapt3/kapt3-compiler/build.gradle.kts

@@ -4,6 +4,10 @@ description = "Annotation Processor for Kotlin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijDep())
+    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
+    testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
+
     compile(project(":compiler:util"))
     compile(project(":compiler:cli"))
     compile(project(":compiler:backend"))
@@ -17,8 +21,6 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-    testCompile(intellijCoreDep()) { includeJars("intellij-core") }
-    testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi") }
     testCompile(project(":kotlin-annotation-processing-runtime"))
 }
 

plugins/noarg/noarg-cli/build.gradle.kts

@@ -4,6 +4,8 @@ description = "Kotlin NoArg Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijDep())
+
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:backend"))
@@ -19,8 +21,6 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-
-    testRuntime(intellijDep())
 }
 
 sourceSets {
@@ -43,4 +43,4 @@ ideaPlugin {
 
 projectTest {
     workingDir = rootDir
-}
+}

plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts

@@ -4,6 +4,9 @@ description = "Kotlin SamWithReceiver Compiler Plugin"
 apply { plugin("kotlin") }
 
 dependencies {
+    testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
+    testRuntime(intellijDep())
+
     compileOnly(project(":compiler:frontend"))
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":compiler:plugin-api"))
@@ -17,7 +20,6 @@ dependencies {
     testCompile(project(":compiler:tests-common"))
     testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
-    testRuntime(intellijDep())
 }
 
 sourceSets {
@@ -45,4 +47,4 @@ ideaPlugin {
 
 projectTest {
     workingDir = rootDir
-}
+}