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

Modify dependencies for 192 branch: more dependencies to full java plugin

Browse Source
This commit is contained in:
Nikolay Krasko
2019-06-24 17:36:56 +03:00
parent 6ea1d92841
commit b7c12014ee
20 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/build.gradle.kts
+2 -3
View File
@@ -100,9 +100,8 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntime(intellijPluginDep("java"))
}
idea/fir-view/build.gradle.kts
+1 -1
View File
@@ -23,7 +23,7 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("gradle"))
idea/formatter/build.gradle.kts
+1 -1
View File
@@ -9,7 +9,7 @@ dependencies {
compile(project(":compiler:frontend"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijPluginDep("java"))
}
}
idea/idea-core/build.gradle.kts
+1 -6
View File
@@ -24,12 +24,7 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars(
"java-api", "java-impl",
"external-system-rt", "external-system-impl"
)
}
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("gradle"))
idea/idea-gradle-native/build.gradle.kts
+1 -1
View File
@@ -33,7 +33,7 @@ dependencies {
testCompileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("external-system-rt", "external-system-impl") }
compileOnly(intellijPluginDep("java"))
}
testRuntime(project(":kotlin-reflect"))
idea/idea-gradle/build.gradle.kts
+2 -8
View File
@@ -23,14 +23,8 @@ dependencies {
compileOnly(intellijPluginDep("testng"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
testCompileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
idea/idea-j2k/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
}
idea/idea-jvm/build.gradle.kts
+2 -4
View File
@@ -8,14 +8,12 @@ dependencies {
compile(project(":idea"))
compile(project(":compiler:light-classes"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:backend.jvm")) // TODO: fix import (workaround for jps build)
compile(project(":compiler:backend.jvm"))
compileOnly(intellijDep())
compileOnly(commonDep("com.google.code.findbugs", "jsr305"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl")
}
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("junit"))
idea/idea-maven/build.gradle.kts
+2 -2
View File
@@ -20,8 +20,8 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
compileOnly(intellijPluginDep("java"))
testCompileOnly(intellijPluginDep("java"))
testRuntime(intellijPluginDep("java"))
}
idea/idea-native/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compile(project(":compiler:frontend"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
compile(project(":kotlin-native:kotlin-native-library-reader"))
idea/idea-test-framework/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
testCompile(commonDep("junit:junit"))
testCompileOnly(intellijDep())
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl", "external-system-rt", "external-system-impl") }
testCompileOnly(intellijPluginDep("java"))
}
}
idea/jvm-debugger/jvm-debugger-core/build.gradle.kts
+1 -1
View File
@@ -15,7 +15,7 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("stream-debugger"))
idea/jvm-debugger/jvm-debugger-evaluation/build.gradle.kts
+1 -1
View File
@@ -11,7 +11,7 @@ dependencies {
compile(project(":idea:jvm-debugger:jvm-debugger-util"))
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijDep())
idea/jvm-debugger/jvm-debugger-sequence/build.gradle.kts
+1 -1
View File
@@ -10,7 +10,7 @@ dependencies {
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("stream-debugger"))
idea/jvm-debugger/jvm-debugger-util/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijDep())
j2k/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ dependencies {
testCompileOnly(intellijDep())
Platform[192].orHigher {
testCompileOnly(intellijPluginDep("java")) { includeJars("java-api", "java-impl") }
testCompileOnly(intellijPluginDep("java"))
testRuntimeOnly(intellijPluginDep("java"))
}
jps-plugin/build.gradle.kts
+6 -12
View File
@@ -25,17 +25,7 @@ dependencies {
includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject)
}
}
Platform[191].orLower {
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
}
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(intellijPluginDep("java")) { includeJars("jps-builders", "jps-builders-6") }
testRuntimeOnly(intellijPluginDep("java"))
}
compileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(project(":compiler:incremental-compilation-impl"))
testCompile(projectTests(":compiler:tests-common"))
@@ -43,7 +33,7 @@ dependencies {
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(projectTests(":kotlin-build-common"))
testCompileOnly(jpsStandalone()) { includeJars("jps-builders", "jps-builders-6") }
Ide.IJ {
testCompile(intellijDep("devkit"))
}
@@ -55,6 +45,10 @@ dependencies {
testRuntime(project(it))
}
Platform[192].orHigher {
testRuntimeOnly(intellijPluginDep("java"))
}
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-script-runtime"))
}
plugins/kapt3/kapt3-compiler/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ dependencies {
}
Platform[192].orHigher {
testRuntime(intellijCoreDep()) { includeJars("intellij-core") }
testRuntime(intellijPluginDep("java"))
}
compile(project(":compiler:util"))
plugins/kapt3/kapt3-idea/build.gradle.kts
+1 -3
View File
@@ -13,9 +13,7 @@ dependencies {
compile(project(":idea:idea-gradle"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijPluginDep("java")) {
includeJars("external-system-rt", "external-system-impl")
}
compileOnly(intellijPluginDep("java"))
}
compileOnly(intellijPluginDep("gradle"))
compileOnly(intellijPluginDep("android"))
plugins/uast-kotlin-idea/build.gradle.kts
+1 -1
View File
@@ -14,7 +14,7 @@ dependencies {
compile(project(":plugins:uast-kotlin"))
compileOnly(intellijDep())
Platform[192].orHigher {
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
compileOnly(intellijPluginDep("java"))
}
}