Fixes to make the project compile when using Pill

This commit is contained in:
Yan Zhulanow
2018-02-14 23:59:28 +03:00
parent 8dad2d30f5
commit a0c105adbe
7 changed files with 23 additions and 15 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
compile(project(":idea:idea-jvm"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep()) { includeJars("openapi", "idea", "util") }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}
+1
View File
@@ -12,6 +12,7 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":idea:idea-android"))
compile(project(":plugins:uast-kotlin"))
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("util", "guava", "openapi", "idea", "asm-all", "annotations", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) {
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
compile(project(":idea"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep()) { includeJars("openapi", "idea", "util") }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}