Extract versions and remove unnecessary '.jar' extensions

This commit is contained in:
Vyacheslav Gerasimov
2018-01-24 22:43:28 +03:00
parent 3e34b95610
commit 89a07ded1c
22 changed files with 54 additions and 29 deletions
@@ -20,9 +20,9 @@ dependencies {
compile(project(":idea:idea-gradle"))
compile(project(":plugins:android-extensions-compiler"))
compileOnly(project(":kotlin-android-extensions-runtime"))
compileOnly(intellijPluginDep("android")) { includeJars("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }
compileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy.jar") }
compileOnly(intellijDep()) { includeJars("extensions.jar", "openapi.jar", "util.jar", "idea.jar", "android-base-common.jar", rootProject = rootProject) }
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) }
testCompile(project(":compiler:tests-common"))
testCompile(project(":compiler:cli"))
@@ -12,9 +12,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.jar", "maven-server-api.jar") } }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "jdom", "util") }
}
sourceSets {
+2 -2
View File
@@ -12,10 +12,10 @@ dependencies {
compile(project(":idea:idea-android"))
compile(project(":plugins:uast-kotlin"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("util", "guava-21.0", "openapi", "idea", "asm-all") }
compileOnly(intellijDep()) { includeJars("util", "guava", "openapi", "idea", "asm-all", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) {
includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools",
"repository", "lombok-ast-0.2.3", "layoutlib-api", "kxml2-2.3.0")
"repository", "lombok-ast", "layoutlib-api", "kxml2", rootProject = rootProject)
}
}
+2 -2
View File
@@ -15,8 +15,8 @@ dependencies {
compile(project(":idea"))
compile(project(":idea:idea-jps-common"))
compile(project(":plugins:annotation-based-compiler-plugins-ide-support"))
compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar") } }
compileOnly(intellijDep()) { includeJars("openapi", "idea") }
excludeInAndroidStudio(rootProject) { compileOnly(intellijPluginDep("maven")) { includeJars("maven") } }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}