Convert all compiler modules to intellij plugin

This commit is contained in:
Ilya Chernikov
2017-11-02 12:39:49 +01:00
committed by Vyacheslav Gerasimov
parent 6614695616
commit 74411d9b9c
10 changed files with 102 additions and 22 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ dependencies {
afterEvaluate {
dependencies {
compile(intellij { include("openapi.jar") })
testCompile(intellij { include("idea.jar", "idea-rt.jar", "groovy-all.jar", "jps-builders.jar") })
testCompile(intellij { include("idea.jar", "idea_rt.jar", "groovy-all-*.jar", "jps-builders.jar") })
testCompile(intellijExtra("jps-standalone") { include("jps-model.jar") })
testCompile(intellijExtra("jps-build-test"))
}
+11 -1
View File
@@ -3,6 +3,10 @@ apply { plugin("kotlin") }
jvmTarget = "1.8"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
@@ -17,7 +21,6 @@ dependencies {
compile(project(":js:js.translator"))
compile(project(":js:js.serializer"))
compile(project(":js:js.dce"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compile(commonDep("org.fusesource.jansi", "jansi"))
compile(commonDep("org.jline", "jline"))
compile(files("${System.getProperty("java.home")}/../lib/tools.jar"))
@@ -29,6 +32,13 @@ dependencies {
testCompile(commonDep("junit:junit"))
}
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
}
}
sourceSets {
"main" {
projectDefault()
+11 -1
View File
@@ -3,13 +3,23 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":core:util.runtime"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:frontend.script"))
compileOnly(project(":kotlin-reflect-api"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
}
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
}
}
sourceSets {
+11 -1
View File
@@ -3,17 +3,27 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
val compile by configurations
compile(project(":compiler:cli"))
compile(project(":compiler:daemon-common"))
compile(project(":compiler:incremental-compilation-impl"))
compile(project(":kotlin-build-common"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compile(commonDep("org.fusesource.jansi", "jansi"))
compile(commonDep("org.jline", "jline"))
}
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
+11 -1
View File
@@ -3,15 +3,25 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(project(":core:descriptors"))
compile(project(":core:descriptors.jvm"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compile(project(":kotlin-stdlib"))
}
afterEvaluate {
dependencies {
compile(intellijCoreJar())
compile(intellijCoreJarDependencies())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
+10 -2
View File
@@ -3,14 +3,22 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
compile(ideaSdkCoreDeps("intellij-core"))
compile(project(":compiler:util"))
compile(project(":compiler:frontend"))
}
afterEvaluate {
dependencies {
compile(intellijCoreJar())
}
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
+6 -2
View File
@@ -5,8 +5,12 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(ideaSdkDeps("asm-all"))
configureIntellijPlugin()
afterEvaluate {
dependencies {
compile(intellij { include("asm-all.jar") })
}
}
sourceSets {
+11 -2
View File
@@ -1,6 +1,10 @@
apply { plugin("kotlin") }
configureIntellijPlugin {
setExtraDependencies("intellij-core")
}
dependencies {
testCompile(project(":core:descriptors"))
testCompile(project(":core:descriptors.jvm"))
@@ -25,11 +29,16 @@ dependencies {
testCompile(projectTests(":compiler:tests-common-jvm6"))
testCompileOnly(project(":kotlin-reflect-api"))
testCompile(commonDep("junit:junit"))
testCompile(ideaSdkCoreDeps("intellij-core"))
testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
testCompile(preloadedDeps("dx", subdir = "android-5.0/lib"))
}
afterEvaluate {
dependencies {
testCompile(intellijCoreJar())
testCompile(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar") })
}
}
sourceSets {
"main" { }
"test" { projectDefault() }