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:
@@ -41,6 +41,14 @@ sourceSets {
|
|||||||
"test" { }
|
"test" { }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
|
||||||
|
kotlinOptions {
|
||||||
|
languageVersion = "1.2"
|
||||||
|
apiVersion = "1.2"
|
||||||
|
freeCompilerArgs += "-Xskip-metadata-version-check"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
testsJar {}
|
testsJar {}
|
||||||
|
|
||||||
projectTest {
|
projectTest {
|
||||||
|
|||||||
@@ -24,6 +24,12 @@ dependencies {
|
|||||||
|
|
||||||
evaluationDependsOn(":kotlin-allopen-compiler-plugin")
|
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 {
|
jar {
|
||||||
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.classesDirs)
|
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.classesDirs)
|
||||||
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.resourcesDir)
|
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.resourcesDir)
|
||||||
|
|||||||
@@ -21,6 +21,12 @@ dependencies {
|
|||||||
compileOnly 'com.android.tools.build:gradle:0.4.2'
|
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 {
|
artifacts {
|
||||||
archives sourcesJar
|
archives sourcesJar
|
||||||
archives javadocJar
|
archives javadocJar
|
||||||
|
|||||||
@@ -86,6 +86,9 @@ dependencies {
|
|||||||
|
|
||||||
tasks.withType(project.compileKotlin.class) {
|
tasks.withType(project.compileKotlin.class) {
|
||||||
kotlinOptions.jdkHome = JDK_18
|
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
|
sourceSets.main.java.srcDirs += sourceSets.main.kotlin.srcDirs
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ dependencies {
|
|||||||
|
|
||||||
evaluationDependsOn(":kotlin-noarg-compiler-plugin")
|
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 {
|
jar {
|
||||||
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.classesDirs)
|
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.classesDirs)
|
||||||
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.resourcesDir)
|
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.resourcesDir)
|
||||||
|
|||||||
@@ -30,6 +30,12 @@ dependencies {
|
|||||||
|
|
||||||
evaluationDependsOn(":kotlin-sam-with-receiver-compiler-plugin")
|
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 {
|
jar {
|
||||||
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.classesDirs)
|
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.classesDirs)
|
||||||
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.resourcesDir)
|
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.resourcesDir)
|
||||||
|
|||||||
Reference in New Issue
Block a user