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
}
}