For bootstrapping on 1.3-M1: compile parts that can be used in .gradle.kts scripts with 1.2 language version

This commit is contained in:
Ilya Gorbunov
2018-06-25 20:55:31 +03:00
parent b160561795
commit 8102e512d3
6 changed files with 35 additions and 0 deletions
+8
View File
@@ -41,6 +41,14 @@ sourceSets {
"test" { }
}
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
kotlinOptions {
languageVersion = "1.2"
apiVersion = "1.2"
freeCompilerArgs += "-Xskip-metadata-version-check"
}
}
testsJar {}
projectTest {
@@ -24,6 +24,12 @@ dependencies {
evaluationDependsOn(":kotlin-allopen-compiler-plugin")
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
kotlinOptions.apiVersion = "1.2"
kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
jar {
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.resourcesDir)
@@ -21,6 +21,12 @@ dependencies {
compileOnly 'com.android.tools.build:gradle:0.4.2'
}
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
kotlinOptions.apiVersion = "1.2"
kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
artifacts {
archives sourcesJar
archives javadocJar
@@ -86,6 +86,9 @@ dependencies {
tasks.withType(project.compileKotlin.class) {
kotlinOptions.jdkHome = JDK_18
kotlinOptions.languageVersion = "1.2"
kotlinOptions.apiVersion = "1.2"
kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
sourceSets.main.java.srcDirs += sourceSets.main.kotlin.srcDirs
@@ -30,6 +30,12 @@ dependencies {
evaluationDependsOn(":kotlin-noarg-compiler-plugin")
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
kotlinOptions.apiVersion = "1.2"
kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
jar {
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.resourcesDir)
@@ -30,6 +30,12 @@ dependencies {
evaluationDependsOn(":kotlin-sam-with-receiver-compiler-plugin")
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
kotlinOptions.apiVersion = "1.2"
kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"]
}
jar {
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.resourcesDir)