Convert the rest of the project to intellij repo prepared in buildSrc

This commit is contained in:
Ilya Chernikov
2017-12-08 23:19:21 +01:00
committed by Vyacheslav Gerasimov
parent e23b1529b3
commit 7e21573cf4
55 changed files with 451 additions and 997 deletions
+4 -12
View File
@@ -12,10 +12,6 @@ node {
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
val antLauncherJar by configurations.creating
dependencies {
@@ -24,12 +20,15 @@ dependencies {
testCompileOnly(project(":compiler:frontend"))
testCompileOnly(project(":compiler:cli"))
testCompileOnly(project(":compiler:util"))
testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") }
testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") }
testCompile(project(":js:js.translator"))
testCompile(project(":js:js.serializer"))
testCompile(project(":js:js.dce"))
testCompile(commonDep("junit:junit"))
testCompile(projectTests(":kotlin-build-common"))
testCompile(projectTests(":generators:test-generator"))
testRuntime(projectDist(":kotlin-stdlib"))
testRuntime(projectDist(":kotlin-stdlib-js"))
testRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
@@ -37,19 +36,12 @@ dependencies {
testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
testRuntime(intellijDep())
antLauncherJar(commonDep("org.apache.ant", "ant"))
antLauncherJar(files(toolsJar()))
}
afterEvaluate {
dependencies {
testCompileOnly(intellijCoreJar())
testCompileOnly(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "util.jar") })
testRuntime(intellij())
}
}
sourceSets {
"main" {}