From 7bff5e3ce764b1626f13e5018afce8a7f9320604 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 8 Jun 2018 09:12:38 +0200 Subject: [PATCH] Add missing tests dependencies on the renewed kotlin-scripting-idea plugin --- idea/build.gradle.kts | 2 ++ idea/build.gradle.kts.173 | 2 ++ idea/build.gradle.kts.as31 | 2 ++ idea/build.gradle.kts.as32 | 2 ++ idea/idea-android/build.gradle.kts | 1 + idea/idea-android/build.gradle.kts.173 | 1 + idea/idea-android/build.gradle.kts.as31 | 1 + idea/idea-android/build.gradle.kts.as32 | 1 + idea/idea-gradle/build.gradle.kts | 1 + idea/idea-gradle/build.gradle.kts.173 | 1 + idea/idea-gradle/build.gradle.kts.as31 | 1 + idea/idea-gradle/build.gradle.kts.as32 | 1 + idea/idea-maven/build.gradle.kts | 1 + idea/idea-maven/build.gradle.kts.173 | 1 + idea/idea-maven/build.gradle.kts.as31 | 1 + idea/idea-maven/build.gradle.kts.as32 | 1 + j2k/build.gradle.kts | 1 + j2k/build.gradle.kts.173 | 1 + j2k/build.gradle.kts.as31 | 1 + j2k/build.gradle.kts.as32 | 1 + .../android-extensions/android-extensions-idea/build.gradle.kts | 1 + .../android-extensions-idea/build.gradle.kts.173 | 1 + .../android-extensions-idea/build.gradle.kts.as31 | 1 + .../android-extensions-idea/build.gradle.kts.as32 | 1 + plugins/uast-kotlin/build.gradle.kts | 1 + plugins/uast-kotlin/build.gradle.kts.173 | 1 + ultimate/build.gradle.kts | 2 ++ ultimate/build.gradle.kts.173 | 2 ++ ultimate/build.gradle.kts.as31 | 2 ++ ultimate/build.gradle.kts.as32 | 2 ++ 30 files changed, 38 insertions(+) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 88a95e4c6cf..f51b576141a 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -70,6 +70,8 @@ dependencies { testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173 index bb167f20022..35f1c721c57 100644 --- a/idea/build.gradle.kts.173 +++ b/idea/build.gradle.kts.173 @@ -69,6 +69,8 @@ dependencies { testRuntime(project(":kotlin-allopen-compiler-plugin")) testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-noarg-compiler-plugin")) + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 index f8f768a0984..0d07b296762 100644 --- a/idea/build.gradle.kts.as31 +++ b/idea/build.gradle.kts.as31 @@ -69,6 +69,8 @@ dependencies { testRuntime(project(":kotlin-allopen-compiler-plugin")) testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-noarg-compiler-plugin")) + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testRuntime(project(":idea:idea-android")) { isTransitive = false } diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32 index f8f768a0984..2b4eddee8be 100644 --- a/idea/build.gradle.kts.as32 +++ b/idea/build.gradle.kts.as32 @@ -71,6 +71,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) testRuntime(project(":idea:idea-android")) { isTransitive = false } testRuntime(project(":plugins:lint")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index e6687e91a05..69801d502b9 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -45,6 +45,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-android/build.gradle.kts.173 b/idea/idea-android/build.gradle.kts.173 index c38cd036b85..789dbc65f6d 100644 --- a/idea/idea-android/build.gradle.kts.173 +++ b/idea/idea-android/build.gradle.kts.173 @@ -45,6 +45,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("copyright")) diff --git a/idea/idea-android/build.gradle.kts.as31 b/idea/idea-android/build.gradle.kts.as31 index 45a71962fdd..93fb59bc520 100644 --- a/idea/idea-android/build.gradle.kts.as31 +++ b/idea/idea-android/build.gradle.kts.as31 @@ -45,6 +45,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-android/build.gradle.kts.as32 b/idea/idea-android/build.gradle.kts.as32 index 45a71962fdd..93fb59bc520 100644 --- a/idea/idea-android/build.gradle.kts.as32 +++ b/idea/idea-android/build.gradle.kts.as32 @@ -45,6 +45,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 8a5a8721140..707dccf6d2b 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.173 b/idea/idea-gradle/build.gradle.kts.173 index 3dd687b9fe0..212fc8253f2 100644 --- a/idea/idea-gradle/build.gradle.kts.173 +++ b/idea/idea-gradle/build.gradle.kts.173 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 index 6ed9e321fad..a3ecc33d3eb 100644 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ b/idea/idea-gradle/build.gradle.kts.as31 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-gradle/build.gradle.kts.as32 b/idea/idea-gradle/build.gradle.kts.as32 index 6ed9e321fad..a3ecc33d3eb 100644 --- a/idea/idea-gradle/build.gradle.kts.as32 +++ b/idea/idea-gradle/build.gradle.kts.as32 @@ -37,6 +37,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) // TODO: the order of the plugins matters here, consider avoiding order-dependency testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index 967e05e9109..72400784259 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.173 b/idea/idea-maven/build.gradle.kts.173 index bd202c0bebf..b58bb1a063f 100644 --- a/idea/idea-maven/build.gradle.kts.173 +++ b/idea/idea-maven/build.gradle.kts.173 @@ -36,6 +36,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.as31 b/idea/idea-maven/build.gradle.kts.as31 index 953095ab0bc..233f74877ea 100644 --- a/idea/idea-maven/build.gradle.kts.as31 +++ b/idea/idea-maven/build.gradle.kts.as31 @@ -36,6 +36,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/idea/idea-maven/build.gradle.kts.as32 b/idea/idea-maven/build.gradle.kts.as32 index 953095ab0bc..233f74877ea 100644 --- a/idea/idea-maven/build.gradle.kts.as32 +++ b/idea/idea-maven/build.gradle.kts.as32 @@ -36,6 +36,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijDep()) // TODO: the order of the plugins matters here, consider avoiding order-dependency diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 3a64620313c..a6ede32a5c4 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -28,6 +28,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index 7a14b621ebd..ddd8acf4fc7 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -27,6 +27,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index 660235d8102..fe291ea7e61 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -27,6 +27,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index d08b0ae4b3c..d4468337383 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -28,6 +28,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(intellijPluginDep("properties")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 6f41bc0d7f6..1eba23251a1 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 index 340db2032d0..600b19df9ac 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 index fadabf53858..d669ed697ab 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 index fadabf53858..d669ed697ab 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 @@ -43,6 +43,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:lint")) testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 3c93d9440e0..1083fbe446f 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(intellijDep()) diff --git a/plugins/uast-kotlin/build.gradle.kts.173 b/plugins/uast-kotlin/build.gradle.kts.173 index 854fb20e8b4..698e4620866 100644 --- a/plugins/uast-kotlin/build.gradle.kts.173 +++ b/plugins/uast-kotlin/build.gradle.kts.173 @@ -29,6 +29,7 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":kotlin-scripting-idea")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(intellijDep()) diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index c61dc81295f..ab98b39b033 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -86,6 +86,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea")) diff --git a/ultimate/build.gradle.kts.173 b/ultimate/build.gradle.kts.173 index 21451894fb7..4c256b62fba 100644 --- a/ultimate/build.gradle.kts.173 +++ b/ultimate/build.gradle.kts.173 @@ -86,6 +86,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea")) diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index e72cee4208d..d9e45261654 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -88,6 +88,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea")) diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index 0f2e8af2dce..06eecb27623 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -88,6 +88,8 @@ dependencies { testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } + testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":plugins:uast-kotlin")) testRuntime(project(":plugins:uast-kotlin-idea"))