From c2da0bf797e9558576c0648ebc3c3874b39c1d49 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Sat, 8 Sep 2018 11:36:44 +0300 Subject: [PATCH] Add native dependencies to J2K module tests --- j2k/build.gradle.kts | 4 ++++ j2k/build.gradle.kts.173 | 4 ++++ j2k/build.gradle.kts.as31 | 4 ++++ j2k/build.gradle.kts.as32 | 4 ++++ j2k/build.gradle.kts.as33 | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 2ce8d42437a..7fb209611a6 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -20,7 +20,11 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } + 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(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 index 6a8d98a8891..782febf4dd4 100644 --- a/j2k/build.gradle.kts.173 +++ b/j2k/build.gradle.kts.173 @@ -19,7 +19,11 @@ dependencies { testCompile(project(":compiler:light-classes")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) 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(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 index d77ea3b2d40..9732a3c0306 100644 --- a/j2k/build.gradle.kts.as31 +++ b/j2k/build.gradle.kts.as31 @@ -19,7 +19,11 @@ dependencies { testCompile(project(":compiler:light-classes")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) 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(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 44487701b26..3c277c0eea0 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -20,7 +20,11 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("idea") } + 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(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) diff --git a/j2k/build.gradle.kts.as33 b/j2k/build.gradle.kts.as33 index a451bf19268..ae9762ef03a 100644 --- a/j2k/build.gradle.kts.as33 +++ b/j2k/build.gradle.kts.as33 @@ -20,7 +20,11 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } + 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(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android"))