Continue switching projects to improved dsl: sourceSets and test running

This commit is contained in:
Ilya Chernikov
2017-08-21 20:53:48 +02:00
parent 336e24b837
commit deda50dbbb
76 changed files with 372 additions and 614 deletions
+5 -13
View File
@@ -1,7 +1,6 @@
import org.gradle.api.tasks.compile.JavaCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.File
buildscript {
repositories {
@@ -20,16 +19,6 @@ apply {
plugin("com.github.johnrengelman.shadow")
}
configure<JavaPluginConvention> {
sourceSets.getByName("main")?.apply {
val srcs = listOf(File(rootDir, "core/reflection.jvm/src"))
java.setSrcDirs(srcs)
}
sourceSets.getByName("test").apply {
java.setSrcDirs(emptyList<File>())
}
}
dependencies {
val compile by configurations
compile(project(":core:builtins"))
@@ -37,6 +26,11 @@ dependencies {
compile(protobufLite())
}
sourceSets {
"main" { projectDefault() }
"test" {}
}
tasks.withType<JavaCompile> {
dependsOn(protobufLiteTask)
}
@@ -44,5 +38,3 @@ tasks.withType<JavaCompile> {
tasks.withType<KotlinCompile> {
dependsOn(protobufLiteTask)
}