From 8caafa874e789ccd69e8b3fe1ac0d2d5f257d0db Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 30 May 2019 19:14:10 +0300 Subject: [PATCH] Advance Kotlin versions in some Gradle Tests Those versions have been resolved from -dev repository, which got cleared and those tests started to fail. In long term, it would be nice to not use fixed Kotlin versions in tests, but for now we just advance it to prevent tests from failing. --- .../gradle/configurator/changeFeatureSupport/build.gradle | 2 +- .../configurator/changeFeatureSupport/build.gradle.after | 2 +- .../gradle/configurator/disableFeatureSupport/build.gradle | 2 +- .../configurator/disableFeatureSupport/build.gradle.after | 2 +- .../gradle/configurator/enableFeatureSupport/build.gradle | 2 +- .../configurator/enableFeatureSupport/build.gradle.after | 2 +- .../enableFeatureSupportToExistentArguments/build.gradle | 2 +- .../build.gradle.after | 2 +- .../gradleFacetImportTest/noFriendPathsAreShown/build.gradle | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle b/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle index e6e094a610e..d1085457277 100644 --- a/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle +++ b/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle.after b/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle.after index d2907b757d5..5578bf0dec7 100644 --- a/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle.after +++ b/idea/testData/gradle/configurator/changeFeatureSupport/build.gradle.after @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle b/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle index 1dd1b7bfde2..d4337c64230 100644 --- a/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle +++ b/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle.after b/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle.after index e6e094a610e..d1085457277 100644 --- a/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle.after +++ b/idea/testData/gradle/configurator/disableFeatureSupport/build.gradle.after @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle b/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle index 1dd1b7bfde2..d4337c64230 100644 --- a/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle +++ b/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle.after b/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle.after index d2907b757d5..5578bf0dec7 100644 --- a/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle.after +++ b/idea/testData/gradle/configurator/enableFeatureSupport/build.gradle.after @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle b/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle index 921a8e27472..b6369c0c289 100644 --- a/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle +++ b/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle.after b/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle.after index 8491200434a..259e03c0bda 100644 --- a/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle.after +++ b/idea/testData/gradle/configurator/enableFeatureSupportToExistentArguments/build.gradle.after @@ -5,7 +5,7 @@ buildscript { maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' } } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-6" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11" } } apply plugin: "kotlin" diff --git a/idea/testData/gradle/gradleFacetImportTest/noFriendPathsAreShown/build.gradle b/idea/testData/gradle/gradleFacetImportTest/noFriendPathsAreShown/build.gradle index e285e390b8f..91cac41e1ee 100644 --- a/idea/testData/gradle/gradleFacetImportTest/noFriendPathsAreShown/build.gradle +++ b/idea/testData/gradle/gradleFacetImportTest/noFriendPathsAreShown/build.gradle @@ -7,7 +7,7 @@ url 'https://dl.bintray.com/kotlin/kotlin-dev' } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.70-eap-4") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11") } } @@ -21,5 +21,5 @@ repositories { } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.70-eap-4" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.11" }