Remove some configuration duplication by using 'tasks.withType()'

Setup common options of java and kotlin compiler tasks.
This commit is contained in:
Ilya Gorbunov
2017-03-20 20:00:38 +03:00
parent d25b07fe23
commit 846b74885c
7 changed files with 23 additions and 36 deletions
-10
View File
@@ -48,17 +48,8 @@ artifacts {
archives javadocJar
}
[compileJava, compileBuiltinsJava].each { task ->
task.sourceCompatibility = 1.6
task.targetCompatibility = 1.6
task.options.fork = true
task.options.forkOptions.executable = "${JDK_16}/bin/javac"
}
compileBuiltinsKotlin {
compilerJarFile = bootstrapCompilerFile
kotlinOptions {
jdkHome = JDK_16
freeCompilerArgs = [
"-version",
"-Xallow-kotlin-package",
@@ -70,7 +61,6 @@ compileBuiltinsKotlin {
}
compileKotlin {
kotlinOptions {
jdkHome = JDK_16
freeCompilerArgs = [
"-version",
"-Xallow-kotlin-package",
-4
View File
@@ -33,10 +33,6 @@ compileKotlinCommon {
}
*/
compileKotlinCommon.compilerJarFile = bootstrapCompilerFile
jar {
baseName = project.name
manifest {
+5 -2
View File
@@ -31,8 +31,12 @@ artifacts {
archives javadocJar
}
compileKotlin {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = JDK_17
}
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
@@ -42,7 +46,6 @@ compileKotlin {
}
compileTestKotlin {
kotlinOptions.jdkHome = JDK_17
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
}
+4 -3
View File
@@ -32,9 +32,12 @@ artifacts {
archives javadocJar
}
compileKotlin {
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = JDK_18
kotlinOptions.jvmTarget = 1.8
}
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
@@ -44,8 +47,6 @@ compileKotlin {
}
compileTestKotlin {
kotlinOptions.jdkHome = JDK_18
kotlinOptions.jvmTarget = 1.8
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
}