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

Extract versions and remove unnecessary '.jar' extensions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
testCompile(project(":compiler:frontend.java"))
testCompile(projectTests(":jps-plugin"))
testCompile(commonDep("junit:junit"))
testCompile(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "groovy-all-2.4.12", "jps-builders") }
testCompile(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "groovy-all", "jps-builders", rootProject = rootProject) }
testCompile(intellijDep("jps-standalone")) { includeJars("jps-model") }
testCompile(intellijDep("jps-build-test"))
}
compiler/backend/build.gradle.kts
+1 -1
View File
@@ -12,7 +12,7 @@ dependencies {
compile(project(":compiler:ir.psi2ir"))
compile(project(":compiler:serialization"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/frontend.java/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/frontend/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compile(projectDist(":kotlin-script-runtime"))
compile(commonDep("io.javaslang","javaslang"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "guava", rootProject = rootProject) }
jflexPath(commonDep("org.jetbrains.intellij.deps.jflex", "jflex"))
}
compiler/incremental-compilation-impl/build.gradle.kts
+1 -1
View File
@@ -13,7 +13,7 @@ dependencies {
compile(project(":compiler:cli"))
compile(project(":kotlin-build-common"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations.jar") }
compileOnly(intellijDep()) { includeJars("annotations") }
testCompile(commonDep("junit:junit"))
testCompile(projectDist(":kotlin-test:kotlin-test-junit"))
compiler/light-classes/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -28,7 +28,7 @@ dependencies {
testCompile(androidDxJar()) { isTransitive = false }
testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false }
testCompile(intellijDep()) {
includeJars("openapi", "idea", "idea_rt", "guava-21.0", "trove4j", "picocontainer", "asm-all")
includeJars("openapi", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", rootProject = rootProject)
isTransitive = false
}
}
idea/build.gradle.kts
+3 -3
View File
@@ -37,7 +37,7 @@ dependencies {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) {
includeJars("annotations", "openapi", "idea", "velocity", "boot", "gson", "log4j", "asm-all",
"swingx-core-1.6.2", "forms_rt", "util", "jdom", "trove4j", "guava-21.0", rootProject = rootProject)
"swingx-core", "forms_rt", "util", "jdom", "trove4j", "guava", rootProject = rootProject)
}
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("IntelliLang"))
@@ -79,9 +79,9 @@ dependencies {
testCompile(intellijPluginDep("copyright"))
testCompile(intellijPluginDep("properties"))
testCompile(intellijPluginDep("java-i18n"))
testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.12", "velocity", "gson-2.8.2", "idea_rt", "util", "log4j") }
testCompileOnly(intellijDep()) { includeJars("groovy-all", "velocity", "gson", "idea_rt", "util", "log4j", rootProject = rootProject) }
testCompileOnly(commonDep("com.google.code.findbugs", "jsr305"))
testCompileOnly(intellijPluginDep("gradle")) { includeJars("gradle-base-services-4.0", "gradle-tooling-extension-impl", "gradle-wrapper-4.0") }
testCompileOnly(intellijPluginDep("gradle")) { includeJars("gradle-base-services", "gradle-tooling-extension-impl", "gradle-wrapper", rootProject = rootProject) }
testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }
testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") }
idea/ide-common/build.gradle.kts
+1 -1
View File
@@ -8,7 +8,7 @@ dependencies {
compile(project(":js:js.frontend"))
compile(project(":js:js.serializer"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("annotations", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("annotations", "guava", rootProject = rootProject) }
}
sourceSets {
idea/idea-android/build.gradle.kts
+2 -2
View File
@@ -22,7 +22,7 @@ dependencies {
compile(androidDxJar())
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "util", "guava-21.0", "android-base-common", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "util", "guava", "android-base-common", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) {
includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api")
}
@@ -36,7 +36,7 @@ dependencies {
testCompile(projectTests(":idea:idea-gradle"))
testCompile(commonDep("junit:junit"))
testCompile(intellijDep()) { includeJars("gson-2.8.2") }
testCompile(intellijDep()) { includeJars("gson", rootProject = rootProject) }
testCompile(intellijPluginDep("properties"))
testCompileOnly(intellijPluginDep("android")) {
includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api")
idea/idea-android/idea-android-output-parser/build.gradle.kts
+1 -1
View File
@@ -4,7 +4,7 @@ apply { plugin("kotlin") }
dependencies {
compile(project(":compiler:util"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava-21.0", "android-base-common", rootProject = rootProject) }
compileOnly(intellijDep()) { includeJars("guava", "android-base-common", rootProject = rootProject) }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", rootProject = rootProject) }
compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common") }
}
idea/idea-core/build.gradle.kts
+1 -1
View File
@@ -18,7 +18,7 @@ dependencies {
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false }
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava", rootProject = rootProject) }
compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api", "gradle", rootProject = rootProject) }
}
idea/idea-gradle/build.gradle.kts
+1 -1
View File
@@ -27,7 +27,7 @@ dependencies {
testCompile(intellijPluginDep("gradle")) { includeJars("gradle-wrapper", "gradle-base-services", "gradle-tooling-extension-impl", "gradle-tooling-api", "gradle", rootProject = rootProject) }
testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") }
testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.12", "idea_rt") }
testCompileOnly(intellijDep()) { includeJars("groovy-all", "idea_rt", rootProject = rootProject) }
testRuntime(projectDist(":kotlin-reflect"))
testRuntime(project(":idea:idea-jvm"))
idea/idea-jvm/build.gradle.kts
+1 -1
View File
@@ -6,7 +6,7 @@ dependencies {
compile(project(":compiler:light-classes"))
compile(project(":compiler:frontend.java"))
compileOnly(intellijDep()) { includeJars("annotations", "openapi", "idea", "extensions", "util", "velocity", "boot", "gson",
"swingx-core-1.6.2", "forms_rt", "jdom", "log4j", "guava-21.0", "asm-all", rootProject = rootProject) }
"swingx-core", "forms_rt", "jdom", "log4j", "guava", "asm-all", rootProject = rootProject) }
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
compileOnly(intellijPluginDep("junit")) { includeJars("idea-junit") }
js/js.frontend/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compile(project(":js:js.parser"))
compile(project(":js:js.serializer"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("guava-21.0") }
compileOnly(intellijDep()) { includeJars("guava", rootProject = rootProject) }
}
sourceSets {
js/js.translator/build.gradle.kts
+1 -1
View File
@@ -17,7 +17,7 @@ dependencies {
compile(project(":js:js.frontend"))
compile(project(":js:js.parser"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijDep()) { includeJars("trove4j", "guava-21.0") }
compileOnly(intellijDep()) { includeJars("trove4j", "guava", rootProject = rootProject) }
}
sourceSets {
plugins/android-extensions/android-extensions-idea/build.gradle.kts
+3 -3
View File
@@ -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"))
plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts
+2 -2
View File
@@ -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 {
plugins/lint/build.gradle.kts
+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)
}
}
plugins/noarg/noarg-ide/build.gradle.kts
+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) }
}
ultimate/build.gradle.kts
+1 -1
View File
@@ -66,7 +66,7 @@ dependencies {
testCompile(projectTests(":generators:test-generator"))
testCompile(commonDep("junit:junit"))
if (intellijUltimateEnabled) {
testCompileOnly(intellijUltimateDep()) { includeJars("gson-2.8.2", "annotations", "trove4j", "openapi", "idea", "util", "jdom") }
testCompileOnly(intellijUltimateDep()) { includeJars("gson", "annotations", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) }
}
testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
versions.gradle.kts
+25
View File
@@ -36,6 +36,11 @@ when (platform) {
}
}
"173" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
for (jar in gradleJars) {
@@ -44,6 +49,11 @@ when (platform) {
extra["ignore.jar.lombok-ast-0.2.3"] = true
}
"172" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.6"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.2"
extra["versions.jar.gson"] = "2.5"
for (jar in gradleJars) {
@@ -51,6 +61,11 @@ when (platform) {
}
}
"171" -> {
extra["versions.jar.guava"] = "19.0"
extra["versions.jar.groovy-all"] = "2.4.6"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.2"
extra["versions.jar.gson"] = "2.5"
for (jar in gradleJars) {
@@ -58,6 +73,11 @@ when (platform) {
}
}
"AS30" -> {
extra["versions.jar.guava"] = "19.0"
extra["versions.jar.groovy-all"] = "2.4.6"
extra["versions.jar.lombok-ast"] = "0.2.3"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.2"
extra["versions.jar.gson"] = "2.5"
for (jar in gradleJars) {
@@ -67,6 +87,10 @@ when (platform) {
extra["ignore.jar.common"] = true
}
"AS31" -> {
extra["versions.jar.guava"] = "21.0"
extra["versions.jar.groovy-all"] = "2.4.12"
extra["versions.jar.swingx-core"] = "1.6.2"
extra["versions.jar.kxml2"] = "2.3.0"
extra["versions.jar.streamex"] = "0.6.5"
extra["versions.jar.gson"] = "2.8.2"
for (jar in gradleJars) {
@@ -74,6 +98,7 @@ when (platform) {
}
extra["ignore.jar.common"] = true
extra["ignore.jar.lombok-ast"] = true
}
}