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

Convert all compiler modules to intellij plugin

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
build-common/build.gradle.kts
+9 -1
View File
@@ -3,6 +3,8 @@ description = "Kotlin Build Common"
apply { plugin("kotlin") }
configureIntellijPlugin()
dependencies {
compileOnly(project(":core:util.runtime"))
compileOnly(project(":compiler:util"))
@@ -11,7 +13,6 @@ dependencies {
compileOnly(project(":js:js.serializer"))
compileOnly(project(":js:js.frontend"))
compileOnly(project(":kotlin-reflect-api"))
compileOnly(ideaSdkDeps("util"))
testCompileOnly(project(":compiler:cli-common"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(commonDep("junit:junit"))
@@ -21,6 +22,13 @@ dependencies {
testRuntime(projectDist(":kotlin-reflect"))
}
afterEvaluate {
dependencies {
compileOnly(intellij { include("util.jar") })
testCompileOnly(intellij { include("openapi.jar") })
}
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
compiler/android-tests/build.gradle.kts
+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"))
}
compiler/cli/build.gradle.kts
+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()
compiler/cli/cli-common/build.gradle.kts
+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 {
compiler/daemon/build.gradle.kts
+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" {}
compiler/daemon/daemon-common/build.gradle.kts
+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" {}
compiler/plugin-api/build.gradle.kts
+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" {}
}
compiler/preloader/build.gradle.kts
+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 {
compiler/tests-common/build.gradle.kts
+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() }
prepare/compiler/build.gradle.kts
+21 -10
View File
@@ -30,6 +30,8 @@ val compilerManifestClassPath =
"kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
val fatJarContents by configurations.creating
val fatJarContentsStripMetadata by configurations.creating
val fatJarContentsStripServices by configurations.creating
val fatSourcesJarContents by configurations.creating
val proguardLibraryJars by configurations.creating
val fatJar by configurations.creating
@@ -43,15 +45,16 @@ val outputJar = File(buildDir, "libs", "$compilerBaseName.jar")
val compilerModules: Array<String> by rootProject.extra
val ideaCoreSdkJars: Array<String> by rootProject.extra
val coreSdkJarsSimple = ideaCoreSdkJars.filterNot { it == "jdom" || it == "log4j" }.toTypedArray()
compilerModules.forEach { evaluationDependsOn(it) }
val compiledModulesSources = compilerModules.map {
project(it).the<JavaPluginConvention>().sourceSets.getByName("main").allSource
}
configureIntellijPlugin {
setExtraDependencies("intellij-core", "jps-standalone")
}
dependencies {
compilerModules.forEach {
fatJarContents(project(it)) { isTransitive = false }
@@ -61,8 +64,6 @@ dependencies {
}
fatJarContents(project(":core:builtins", configuration = "builtins"))
fatJarContents(ideaSdkCoreDeps(*coreSdkJarsSimple))
fatJarContents(ideaSdkDeps("jna-platform"))
fatJarContents(commonDep("javax.inject"))
fatJarContents(commonDep("org.jline", "jline"))
fatJarContents(commonDep("org.fusesource.jansi", "jansi"))
@@ -83,6 +84,17 @@ dependencies {
compile(project(":kotlin-reflect"))
}
afterEvaluate {
dependencies {
fatJarContents(intellijCoreJar())
fatJarContents(intellijCoreJarDependencies { exclude("jdom.jar", "log4j.jar") })
fatJarContents(intellij { include("jna-platform.jar") })
fatJarContentsStripServices(intellijExtra("jps-standalone") { include("jps-model.jar") })
fatJarContentsStripMetadata(intellij { include("oromatcher.jar", "jdom.jar", "log4j.jar") })
}
}
val packCompiler by task<ShadowJar> {
configurations = listOf(fatJar)
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -91,9 +103,10 @@ val packCompiler by task<ShadowJar> {
setupPublicJar("before-proguard")
from(fatJarContents)
ideaSdkDeps("jps-model.jar", subdir = "jps").forEach { from(zipTree(it)) { exclude("META-INF/services/**") } }
ideaSdkDeps("oromatcher").forEach { from(zipTree(it)) { exclude("META-INF/jb/** META-INF/LICENSE") } }
ideaSdkCoreDeps("jdom", "log4j").forEach { from(zipTree(it)) { exclude("META-INF/jb/** META-INF/LICENSE") } }
afterEvaluate {
fatJarContentsStripServices.files.forEach { from(zipTree(it)) { exclude("META-INF/services/**") } }
fatJarContentsStripMetadata.files.forEach { from(zipTree(it)) { exclude("META-INF/jb/** META-INF/LICENSE") } }
}
manifest.attributes.put("Class-Path", compilerManifestClassPath)
manifest.attributes.put("Main-Class", "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler")
@@ -120,8 +133,6 @@ val proguard by task<ProGuardTask> {
noDefaultJar()
cleanArtifacts()
val pack = if (shrink) proguard else packCompiler
dist(targetName = compilerBaseName + ".jar",