From 8102e512d3c2353dc02f945fd00530f430d6507c Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 25 Jun 2018 20:55:31 +0300 Subject: [PATCH] For bootstrapping on 1.3-M1: compile parts that can be used in .gradle.kts scripts with 1.2 language version --- compiler/cli/build.gradle.kts | 8 ++++++++ libraries/tools/kotlin-allopen/build.gradle | 6 ++++++ libraries/tools/kotlin-gradle-plugin-api/build.gradle | 6 ++++++ libraries/tools/kotlin-gradle-plugin/build.gradle | 3 +++ libraries/tools/kotlin-noarg/build.gradle | 6 ++++++ libraries/tools/kotlin-sam-with-receiver/build.gradle | 6 ++++++ 6 files changed, 35 insertions(+) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 125053b9e94..7244a876719 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -41,6 +41,14 @@ sourceSets { "test" { } } +tasks.withType> { + kotlinOptions { + languageVersion = "1.2" + apiVersion = "1.2" + freeCompilerArgs += "-Xskip-metadata-version-check" + } +} + testsJar {} projectTest { diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle index 684bd677aae..73953e96f43 100644 --- a/libraries/tools/kotlin-allopen/build.gradle +++ b/libraries/tools/kotlin-allopen/build.gradle @@ -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) diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle b/libraries/tools/kotlin-gradle-plugin-api/build.gradle index 856e661f5e5..08a73272481 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle @@ -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 diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index d6b9e573ed9..da3d82c2471 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -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 diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 19335f1391f..d5a86c701a4 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -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) diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 0480fcf2c7b..e5a8b931eea 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -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)