From f909761974c9c0b71e31cb76bb505e6122580db7 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Sat, 8 Sep 2018 11:40:51 +0300 Subject: [PATCH] Add native dependencies to android-extensions-idea module tests --- .../android-extensions-idea/build.gradle.kts | 4 ++++ .../android-extensions-idea/build.gradle.kts.173 | 4 ++++ .../android-extensions-idea/build.gradle.kts.as31 | 4 ++++ .../android-extensions-idea/build.gradle.kts.as32 | 4 ++++ .../android-extensions-idea/build.gradle.kts.as33 | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 9b744e3001b..65792cbd1a1 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -32,6 +32,10 @@ dependencies { testCompile(projectTests(":idea:idea-android")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) + testCompile(project(":idea:idea-native")) { isTransitive = false } + testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) 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 b9f0b07c6a6..e73c73cc787 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.173 @@ -32,6 +32,10 @@ dependencies { testCompile(projectTests(":idea:idea-android")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) + testCompile(project(":idea:idea-native")) { isTransitive = false } + testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) 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 a8b3c41af97..3592cb5f6e5 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as31 @@ -32,6 +32,10 @@ dependencies { testCompile(projectTests(":idea:idea-android")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) + testCompile(project(":idea:idea-native")) { isTransitive = false } + testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) 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 a8b3c41af97..3592cb5f6e5 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as32 @@ -32,6 +32,10 @@ dependencies { testCompile(projectTests(":idea:idea-android")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) + testCompile(project(":idea:idea-native")) { isTransitive = false } + testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy")) diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 index dcb65979eb1..6f9024def2f 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts.as33 @@ -32,6 +32,10 @@ dependencies { testCompile(projectTests(":idea:idea-android")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) + testCompile(project(":idea:idea-native")) { isTransitive = false } + testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } + testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testCompile(intellijPluginDep("android")) testCompile(intellijPluginDep("Groovy"))