Remove explicit jar specification from ide modules build scripts

They often change between ide versions and difficult to maintain
This commit is contained in:
Vyacheslav Gerasimov
2018-04-05 15:50:58 +03:00
parent 95684b9ecb
commit 7c02d55b23
19 changed files with 63 additions and 100 deletions
+3 -3
View File
@@ -17,9 +17,9 @@ 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", "extensions") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijDep())
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
compileOnly(intellijPluginDep("gradle"))
}
sourceSets {
@@ -19,9 +19,9 @@ dependencies {
compile(project(":idea:idea-gradle"))
compile(project(":plugins:android-extensions-compiler"))
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common", "sdk-tools") }
compileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }
compileOnly(intellijDep()) { includeJars("extensions", "openapi", "util", "idea", "android-base-common", rootProject = rootProject) }
compileOnly(intellijPluginDep("android"))
compileOnly(intellijPluginDep("Groovy"))
compileOnly(intellijDep())
testCompile(project(":compiler:tests-common"))
testCompile(project(":compiler:cli"))
@@ -34,9 +34,9 @@ dependencies {
testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompile(commonDep("junit:junit"))
testRuntime(projectDist(":kotlin-reflect"))
testCompile(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common", "sdk-tools") }
testCompile(intellijPluginDep("Groovy")) { includeJars("Groovy") }
testCompile(intellijDep()) { includeJars("extensions") }
testCompile(intellijPluginDep("android"))
testCompile(intellijPluginDep("Groovy"))
testCompile(intellijDep())
testRuntime(project(":idea:idea-jvm"))
testRuntime(project(":plugins:android-extensions-jps"))
@@ -15,9 +15,9 @@ dependencies {
compile(project(":idea:idea-jps-common"))
compile(project(":idea:idea-gradle"))
compile(project(":idea:idea-maven"))
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "jdom", "util") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
compileOnly(intellijPluginDep("gradle"))
compileOnly(intellijDep())
}
sourceSets {
+3 -3
View File
@@ -12,9 +12,9 @@ dependencies {
compile(project(":idea")) { isTransitive = false }
compile(project(":idea:kotlin-gradle-tooling"))
compile(project(":kotlin-annotation-processing"))
compileOnly(intellijDep()) { includeJars("openapi", "external-system-rt", "util") }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-core", "gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools") }
compileOnly(intellijDep())
compileOnly(intellijPluginDep("gradle"))
compileOnly(intellijPluginDep("android"))
}
sourceSets {
+2 -6
View File
@@ -13,12 +13,8 @@ dependencies {
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")) {
includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools",
"repository", "lombok-ast", "layoutlib-api", "kxml2", rootProject = rootProject)
}
compileOnly(intellijDep())
compileOnly(intellijPluginDep("android"))
}
sourceSets {
+3 -3
View File
@@ -18,9 +18,9 @@ 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", "extensions") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijDep())
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) }
compileOnly(intellijPluginDep("gradle"))
}
sourceSets {
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":compiler:frontend.java"))
compile(project(":idea:ide-common"))
compile(project(":plugins:uast-kotlin"))
compileOnly(intellijDep()) { includeJars("openapi", "util") }
compileOnly(intellijDep())
}
sourceSets {