From 724eda8fdbf4c12725fb418e8210d0fbed23ab97 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Thu, 30 Jan 2020 11:47:53 +0300 Subject: [PATCH] Advance explicit Kotlin versions in gradle integration tests 1.0 and 1.1 are no longer supported starting from 1.4, new errors break tests See KT-36146 --- .../jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 12 ++++++------ .../jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt | 4 ++-- .../testProject/languageVersion/build.gradle | 4 ++-- .../languageVersion/src/main/kotlin/helloWorld.kt | 10 +++++++--- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 76989a9a3cb..7fa8d603a8a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -451,18 +451,18 @@ class KotlinGradleIT : BaseGradleIT() { } // check the arguments are always passed if specified explicitly - updateBuildGradle("1.0", "1.0") + updateBuildGradle("1.2", "1.2") project.build("clean", "compileKotlin") { assertSuccessful() - assertContains("-language-version 1.0") - assertContains("-api-version 1.0") + assertContains("-language-version 1.2") + assertContains("-api-version 1.2") } - updateBuildGradle("1.1", "1.1") + updateBuildGradle("1.3", "1.3") project.build("clean", "compileKotlin") { assertSuccessful() - assertContains("-language-version 1.1") - assertContains("-api-version 1.1") + assertContains("-language-version 1.3") + assertContains("-api-version 1.3") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index 7594becf198..f30115534f1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -61,7 +61,7 @@ class SimpleKotlinGradleIT : BaseGradleIT() { fun testLanguageVersion() { Project("languageVersion").build("build") { assertFailed() - assertContains("This type is sealed") + assertContains("'break' and 'continue' are not allowed in 'when' statements") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt index 84f7d429946..b3a92624e27 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDateIT.kt @@ -12,7 +12,7 @@ class UpToDateIT : BaseGradleIT() { testMutations( *propertyMutationChain( "compileKotlin.kotlinOptions.languageVersion", - "null", "'1.1'", "'1.0'", "null" + "null", "'1.3'", "'1.2'", "null" ) ) } @@ -22,7 +22,7 @@ class UpToDateIT : BaseGradleIT() { testMutations( *propertyMutationChain( "compileKotlin.kotlinOptions.apiVersion", - "null", "'1.1'", "'1.0'", "null" + "null", "'1.3'", "'1.2'", "null" ) ) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/build.gradle index 1b2ea2be34a..a9b8b4679f9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/build.gradle @@ -17,7 +17,7 @@ repositories { compileKotlin { kotlinOptions { - languageVersion = "1.0" - apiVersion = "1.0" + languageVersion = "1.3" + apiVersion = "1.3" } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/src/main/kotlin/helloWorld.kt index a4c2f854f25..8afa658b814 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/src/main/kotlin/helloWorld.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/languageVersion/src/main/kotlin/helloWorld.kt @@ -1,3 +1,7 @@ -sealed class Base - -class Derived : Base() +fun breakInWhen() { + while (true) { + when { + true -> break + } + } +}