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

201: openapi.jar is removed

Browse Source
This commit is contained in:
Nikolay Krasko
2020-01-28 21:55:03 +03:00
parent c26e1e9c1a
commit 162c2f3dc9
14 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/js-test/build.gradle.kts
+4 -1
View File
@@ -18,8 +18,11 @@ dependencies {
testCompile(project(":js:js.engines"))
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
testRuntimeOnly(intellijCoreDep()) { includeJars("intellij-core") }
Platform[193].orLower {
testRuntimeOnly(intellijDep()) { includeJars("openapi", rootProject = rootProject) }
}
testRuntimeOnly(intellijDep()) {
includeJars("openapi", "idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject)
includeJars("idea", "idea_rt", "log4j", "picocontainer", "guava", "jdom", rootProject = rootProject)
}
testRuntimeOnly(commonDep("org.jetbrains.intellij.deps", "trove4j"))
}
libraries/scripting/jvm-host-test/build.gradle.kts
+4 -1
View File
@@ -15,7 +15,10 @@ val embeddableTestRuntime by configurations.creating {
dependencies {
allTestsRuntime(commonDep("junit"))
allTestsRuntime(intellijCoreDep()) { includeJars("intellij-core") }
allTestsRuntime(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "log4j", "jna") }
Platform[193].orLower {
allTestsRuntime(intellijDep()) { includeJars("openapi") }
}
allTestsRuntime(intellijDep()) { includeJars("idea", "idea_rt", "log4j", "jna") }
testCompile(project(":kotlin-scripting-jvm-host"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(project(":kotlin-scripting-compiler"))
libraries/tools/kotlin-script-util/build.gradle.kts
+8 -2
View File
@@ -27,8 +27,14 @@ dependencies {
testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
testRuntime("org.sonatype.aether:aether-api:1.13.1")
testRuntime("org.apache.maven:maven-core:3.0.3")
compileOnly(intellijDep()) { includeJars("openapi", "util") }
testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") }
Platform[193].orLower {
compileOnly(intellijDep()) { includeJars("openapi") }
}
compileOnly(intellijDep()) { includeJars("util") }
Platform[193].orLower {
testCompile(intellijDep()) { includeJars("openapi") }
}
testCompile(intellijDep()) { includeJars("platform-api", "util") }
testCompile(intellijCoreDep()) { includeJars("intellij-core") }
}