From c3e20bffd7ab1de3a6bf1d6d155a104f4dbecaf6 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 13 Apr 2020 22:19:34 +0700 Subject: [PATCH] Fix launching Gradle import test from master No need to depend on org.jetbrains.kotlin:kotlin-native-utils artifact. It's already packed inside of kotlin-compiler.jar --- .../gradle/MultiplePluginVersionGradleImportingTestCase.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt index 1ac0e2ba664..b150490b024 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt @@ -74,15 +74,13 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes fun repositories(useKts: Boolean, useMaster: Boolean): String { val flatDirs = arrayOf( - "libraries/tools/kotlin-gradle-plugin/build/libs", "libraries/tools/kotlin-gradle-plugin/build/libs", "prepare/compiler-client-embeddable/build/libs", "prepare/compiler-embeddable/build/libs", "libraries/tools/kotlin-gradle-plugin-api/build/libs", "compiler/compiler-runner/build/libs", "libraries/tools/kotlin-gradle-plugin-model/build/libs", - "plugins/scripting/scripting-compiler-embeddable/build/libs", - "konan/utils/build/libs" + "plugins/scripting/scripting-compiler-embeddable/build/libs" ) val customRepositories = arrayOf("https://dl.bintray.com/kotlin/kotlin-dev", "http://dl.bintray.com/kotlin/kotlin-eap") val customMavenRepositories = customRepositories.map { if (useKts) "maven(\"$it\")" else "maven { url '$it' } " }.joinToString("\n") @@ -116,7 +114,6 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin-api:$gradleKotlinPluginVersion") - classpath("org.jetbrains.kotlin:kotlin-native-utils:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-compiler-runner:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-compiler-client-embeddable:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin-model:$gradleKotlinPluginVersion")