Remove some configuration duplication by using 'tasks.withType()'
Setup common options of java and kotlin compiler tasks.
This commit is contained in:
+14
-6
@@ -18,19 +18,22 @@ ext.bootstrapCompilerFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-
|
||||
ext.compilerPreloaderFile = project.file("${rootDir}/../dist/kotlinc/lib/kotlin-preloader.jar")
|
||||
|
||||
allprojects {
|
||||
apply plugin: 'maven'
|
||||
|
||||
group = 'org.jetbrains.kotlin'
|
||||
version = "$kotlin_version"
|
||||
}
|
||||
|
||||
subprojects {
|
||||
apply plugin: 'maven'
|
||||
apply plugin: 'signing'
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile) {
|
||||
compilerJarFile = bootstrapCompilerFile
|
||||
}
|
||||
|
||||
signing {
|
||||
required { project.ext.has('signing.keyId') }
|
||||
sign configurations.archives
|
||||
@@ -93,11 +96,16 @@ static def commonJvmProjectConfiguration(Project project) {
|
||||
from javadoc.destinationDir
|
||||
}
|
||||
|
||||
compileKotlin.compilerJarFile = bootstrapCompilerFile
|
||||
compileTestKotlin.compilerJarFile = bootstrapCompilerFile
|
||||
tasks.withType(JavaCompile) {
|
||||
sourceCompatibility = 1.6
|
||||
targetCompatibility = 1.6
|
||||
options.fork = true
|
||||
options.forkOptions.executable = "${JDK_16}/bin/javac"
|
||||
}
|
||||
|
||||
compileKotlin.kotlinOptions.jdkHome = JDK_16
|
||||
compileTestKotlin.kotlinOptions.jdkHome = JDK_16
|
||||
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
|
||||
kotlinOptions.jdkHome = JDK_16
|
||||
}
|
||||
|
||||
test {
|
||||
executable = "$JDK_16/bin/java"
|
||||
|
||||
@@ -18,9 +18,6 @@ sourceSets {
|
||||
|
||||
// common block
|
||||
|
||||
compileKotlinCommon.compilerJarFile = bootstrapCompilerFile
|
||||
|
||||
|
||||
|
||||
jar {
|
||||
baseName = project.name
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -33,10 +33,6 @@ compileKotlinCommon {
|
||||
}
|
||||
*/
|
||||
|
||||
compileKotlinCommon.compilerJarFile = bootstrapCompilerFile
|
||||
|
||||
|
||||
|
||||
jar {
|
||||
baseName = project.name
|
||||
manifest {
|
||||
|
||||
@@ -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"]
|
||||
}
|
||||
|
||||
|
||||
@@ -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"]
|
||||
}
|
||||
|
||||
|
||||
@@ -35,16 +35,8 @@ artifacts {
|
||||
archives javadocJar
|
||||
}
|
||||
|
||||
compileJava {
|
||||
sourceCompatibility = 1.6
|
||||
targetCompatibility = 1.6
|
||||
options.fork = true
|
||||
options.forkOptions.executable = "${JDK_16}/bin/javac"
|
||||
}
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions {
|
||||
jdkHome = JDK_16
|
||||
freeCompilerArgs = [
|
||||
"-Xallow-kotlin-package",
|
||||
"-Xdump-declarations-to", "${buildDir}/runtime-declarations.json",
|
||||
|
||||
Reference in New Issue
Block a user