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

Clean most of the shared source roots conflicts

Browse Source
This commit is contained in:
Ilya Chernikov
2017-09-11 15:15:02 +02:00
parent e26b421e6c
commit a61facf3d1
8 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2
View File
@@ -104,6 +104,7 @@ extra["ideaCoreSdkJars"] = arrayOf("annotations", "asm-all", "guava", "intellij-
extra["compilerModules"] = arrayOf(":compiler:util",
":compiler:container",
":compiler:conditional-preprocessor",
":compiler:resolution",
":compiler:serialization",
":compiler:frontend",
@@ -111,6 +112,7 @@ extra["compilerModules"] = arrayOf(":compiler:util",
":compiler:frontend.script",
":compiler:cli-common",
":compiler:daemon-common",
":compiler:daemon",
":compiler:ir.tree",
":compiler:ir.psi2ir",
":compiler:backend-common",
compiler/build.gradle.kts
+32 -19
View File
@@ -1,5 +1,6 @@
import java.io.File
import org.gradle.api.tasks.bundling.Jar
apply { plugin("kotlin") }
@@ -9,14 +10,6 @@ val compilerModules: Array<String> by rootProject.extra
val otherCompilerModules = compilerModules.filter { it != path }
dependencies {
compileOnly(project(":compiler:cli"))
compileOnly(project(":compiler:daemon-common"))
compileOnly(project(":compiler:incremental-compilation-impl"))
compileOnly(project(":kotlin-build-common"))
compileOnly(ideaSdkCoreDeps(*(rootProject.extra["ideaCoreSdkJars"] as Array<String>)))
compileOnly(commonDep("org.fusesource.jansi", "jansi"))
compileOnly(commonDep("org.jline", "jline"))
testCompile(commonDep("junit:junit"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":kotlin-test:kotlin-test-junit"))
@@ -40,23 +33,43 @@ dependencies {
}
sourceSets {
"main" {
java.srcDirs("daemon/src",
"conditional-preprocessor/src")
resources.srcDir("../idea/src").apply {
include("META-INF/extensions/common.xml",
"META-INF/extensions/kotlin2jvm.xml",
"META-INF/extensions/kotlin2js.xml")
}
"main" {}
"test" {
projectDefault()
java.srcDir("tests-ir-jvm/tests")
}
}
val jar: Jar by tasks
jar.apply {
from(the<JavaPluginConvention>().sourceSets.getByName("main").output)
from("../idea/src").apply {
include("META-INF/extensions/common.xml",
"META-INF/extensions/kotlin2jvm.xml",
"META-INF/extensions/kotlin2js.xml")
}
"test" { projectDefault() }
}
testsJar {}
// TODO: it seems incomlete, find and add missing dependencies
val testDistProjects = listOf(
":prepare:mock-runtime-for-test",
":kotlin-compiler",
":kotlin-runtime",
":kotlin-script-runtime",
":kotlin-stdlib",
":kotlin-stdlib-jre7",
":kotlin-stdlib-jre8",
":kotlin-stdlib-js",
":kotlin-reflect",
":kotlin-test:kotlin-test-jvm",
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-js",
":kotlin-daemon-client")
projectTest {
dependsOnTaskIfExistsRec("dist", project = rootProject)
dependsOn(":prepare:mock-runtime-for-test:dist")
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
workingDir = rootDir
systemProperty("kotlin.test.script.classpath", the<JavaPluginConvention>().sourceSets.getByName("test").output.classesDirs.joinToString(File.pathSeparator))
}
compiler/conditional-preprocessor/build.gradle.kts
+20
View File
@@ -0,0 +1,20 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
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"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
compiler/daemon/build.gradle.kts
+20
View File
@@ -0,0 +1,20 @@
apply { plugin("kotlin") }
jvmTarget = "1.6"
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"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
idea/build.gradle.kts
+5 -3
View File
@@ -94,11 +94,13 @@ sourceSets {
"idea-completion/src",
"idea-live-templates/src",
"idea-repl/src")
resources.srcDir("idea-maven/resources")
}
"test" {
java.srcDirs("tests",
"idea-maven/test",
"idea-completion/tests")
projectDefault()
java.srcDirs("idea-maven/test",
"idea-completion/tests",
"idea-live-templates/tests")
}
}
jps-plugin/build.gradle.kts
+2 -1
View File
@@ -31,7 +31,8 @@ dependencies {
sourceSets {
"main" { projectDefault() }
"test" {
java.srcDirs("jps-tests/test")
java.srcDirs("jps-tests/test",
"kannotator-jps-plugin-test/test")
}
}
libraries/tools/kotlin-gradle-plugin/build.gradle
+1 -1
View File
@@ -35,7 +35,7 @@ dependencies {
compile project(':kotlin-build-common')
compile project(':compiler:compiler-runner')
compile project(":compiler:incremental-compilation-impl")
compile project(":compiler")
compile project(":compiler:daemon")
compile project(':kotlin-annotation-processing')
compileOnly 'com.android.tools.build:gradle:2.0.0'
settings.gradle
+2
View File
@@ -15,10 +15,12 @@ include ":kotlin-build-common",
":compiler",
":compiler:util",
":compiler:daemon-common",
":compiler:daemon",
":kotlin-daemon-client",
":kotlin-preloader",
":kotlin-runner",
":compiler:container",
":compiler:conditional-preprocessor",
":compiler:resolution",
":compiler:serialization",
":compiler:frontend",