Fix project structure after rebase on master

This commit is contained in:
Ilya Chernikov
2017-08-19 18:13:26 +02:00
parent d0b8767536
commit 336e24b837
16 changed files with 38 additions and 18 deletions
+1 -2
View File
@@ -11,8 +11,7 @@ dependencies {
compile(project(":idea:idea-core"))
compile(project(":idea:idea-android"))
compile(project(":plugins:uast-kotlin"))
compile(preloadedDeps("uast-common", "uast-java"))
compile(ideaPluginDeps("android", "android-common", "common", "sdk-common", "sdklib", "sdk-tools", "repository", "lombok-ast", "kxml2", plugin = "android"))
compile(ideaPluginDeps("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "repository", "lombok-ast", "kxml2", plugin = "android"))
compile(ideaSdkCoreDeps("intellij-core", "util"))
compile(ideaSdkDeps("guava"))
}
@@ -9,7 +9,6 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":idea:ide-common"))
compile(project(":plugins:uast-kotlin"))
compile(preloadedDeps("uast-common", "uast-java"))
buildVersion()
}
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:light-classes"))
compile(preloadedDeps("uast-common", "uast-java"))
compileOnly(ideaSdkDeps("openapi", "idea"))
buildVersion()
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":compiler.tests-common"))