azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix launching Gradle import test from master

Browse Source 
No need to depend on org.jetbrains.kotlin:kotlin-native-utils artifact.
It's already packed inside of kotlin-compiler.jar
This commit is contained in:
Dmitriy Dolovov
2020-04-13 22:19:34 +07:00
parent c35420eaf6
commit c3e20bffd7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/MultiplePluginVersionGradleImportingTestCase.kt
+1 -4
View File
@@ -74,15 +74,13 @@ abstract class MultiplePluginVersionGradleImportingTestCase : GradleImportingTes
fun repositories(useKts: Boolean, useMaster: Boolean): String { fun repositories(useKts: Boolean, useMaster: Boolean): String {
val flatDirs = arrayOf( val flatDirs = arrayOf(
"libraries/tools/kotlin-gradle-plugin/build/libs",
"libraries/tools/kotlin-gradle-plugin/build/libs", "libraries/tools/kotlin-gradle-plugin/build/libs",
"prepare/compiler-client-embeddable/build/libs", "prepare/compiler-client-embeddable/build/libs",
"prepare/compiler-embeddable/build/libs", "prepare/compiler-embeddable/build/libs",
"libraries/tools/kotlin-gradle-plugin-api/build/libs", "libraries/tools/kotlin-gradle-plugin-api/build/libs",
"compiler/compiler-runner/build/libs", "compiler/compiler-runner/build/libs",
"libraries/tools/kotlin-gradle-plugin-model/build/libs", "libraries/tools/kotlin-gradle-plugin-model/build/libs",
"plugins/scripting/scripting-compiler-embeddable/build/libs", "plugins/scripting/scripting-compiler-embeddable/build/libs"
"konan/utils/build/libs"
) )
val customRepositories = arrayOf("https://dl.bintray.com/kotlin/kotlin-dev", "http://dl.bintray.com/kotlin/kotlin-eap") 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") 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-gradle-plugin:$gradleKotlinPluginVersion")
classpath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-compiler-embeddable:$gradleKotlinPluginVersion")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin-api:$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-runner:$gradleKotlinPluginVersion")
classpath("org.jetbrains.kotlin:kotlin-compiler-client-embeddable:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-compiler-client-embeddable:$gradleKotlinPluginVersion")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin-model:$gradleKotlinPluginVersion") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin-model:$gradleKotlinPluginVersion")