From f273edeb8ec0b18571af023fc667560b64e0b008 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 20 Sep 2020 17:01:02 +0200 Subject: [PATCH] Build: upgrade language to 1.3 in cli, compiler plugins and Gradle plugin The language/API version restriction here is to make sure the code works with Gradle of earlier versions, but all versions of Gradle that we support already depend on Kotlin 1.3+. --- compiler/cli/build.gradle.kts | 6 +++--- libraries/tools/kotlin-allopen/build.gradle | 8 ++++---- libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts | 8 ++++---- .../tools/kotlin-gradle-plugin-model/build.gradle.kts | 8 ++++---- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 7 +++---- libraries/tools/kotlin-noarg/build.gradle | 8 ++++---- libraries/tools/kotlin-sam-with-receiver/build.gradle | 8 ++++---- 7 files changed, 26 insertions(+), 27 deletions(-) diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index 3d9af4c9a25..5605a840822 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -55,9 +55,9 @@ sourceSets { tasks.withType> { kotlinOptions { - languageVersion = "1.2" - apiVersion = "1.2" - freeCompilerArgs += "-Xskip-metadata-version-check" + languageVersion = "1.3" + apiVersion = "1.3" + freeCompilerArgs += "-Xskip-prerelease-check" } } diff --git a/libraries/tools/kotlin-allopen/build.gradle b/libraries/tools/kotlin-allopen/build.gradle index 67ee59791f4..5800ffdd2d0 100644 --- a/libraries/tools/kotlin-allopen/build.gradle +++ b/libraries/tools/kotlin-allopen/build.gradle @@ -24,9 +24,9 @@ dependencies { } tasks.withType(project.compileKotlin.class) { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"] + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += ["-Xskip-prerelease-check"] } jar { @@ -52,4 +52,4 @@ pluginBundle { configurePluginMarkers(project) -test.executable = "${JDK_18}/bin/java" \ No newline at end of file +test.executable = "${JDK_18}/bin/java" diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 22b35e0b162..da346772e8b 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -23,12 +23,12 @@ pill { tasks { withType { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += listOf("-Xskip-metadata-version-check") + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check") } named("jar") { callGroovy("manifestAttributes", manifest, project) } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts index 04214b73db8..cd28b8da42a 100644 --- a/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-model/build.gradle.kts @@ -20,12 +20,12 @@ pill { tasks { withType { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += listOf("-Xskip-metadata-version-check") + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check") } named("jar") { callGroovy("manifestAttributes", manifest, project) } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 5bdd522d000..5ca2033411c 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -1,4 +1,3 @@ - import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.pill.PillExtension @@ -113,9 +112,9 @@ runtimeJar(rewriteDefaultJarDepsToShadedCompiler()).configure { tasks { withType { kotlinOptions.jdkHome = rootProject.extra["JDK_18"] as String - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += listOf("-Xskip-metadata-version-check") + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += listOf("-Xskip-prerelease-check") } named("processResources") { diff --git a/libraries/tools/kotlin-noarg/build.gradle b/libraries/tools/kotlin-noarg/build.gradle index 5e89e2bbb0c..9da1e8557c4 100644 --- a/libraries/tools/kotlin-noarg/build.gradle +++ b/libraries/tools/kotlin-noarg/build.gradle @@ -30,9 +30,9 @@ dependencies { } tasks.withType(project.compileKotlin.class) { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"] + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += ["-Xskip-prerelease-check"] } jar { @@ -58,4 +58,4 @@ pluginBundle { configurePluginMarkers(project) -test.executable = "${JDK_18}/bin/java" \ No newline at end of file +test.executable = "${JDK_18}/bin/java" diff --git a/libraries/tools/kotlin-sam-with-receiver/build.gradle b/libraries/tools/kotlin-sam-with-receiver/build.gradle index 55772318c14..cbcae347c6a 100644 --- a/libraries/tools/kotlin-sam-with-receiver/build.gradle +++ b/libraries/tools/kotlin-sam-with-receiver/build.gradle @@ -30,9 +30,9 @@ dependencies { } tasks.withType(project.compileKotlin.class) { - kotlinOptions.languageVersion = "1.2" - kotlinOptions.apiVersion = "1.2" - kotlinOptions.freeCompilerArgs += ["-Xskip-metadata-version-check"] + kotlinOptions.languageVersion = "1.3" + kotlinOptions.apiVersion = "1.3" + kotlinOptions.freeCompilerArgs += ["-Xskip-prerelease-check"] } jar { @@ -43,4 +43,4 @@ ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompil configureSourcesJar() configureJavadocJar() -test.executable = "${JDK_18}/bin/java" \ No newline at end of file +test.executable = "${JDK_18}/bin/java"