From 21b9987a76293b876511f7e27c30605bab09c8ea Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Tue, 19 Nov 2019 18:23:24 +0300 Subject: [PATCH] Support Gradle 5.x in GradleMigrateTest --- .../codeInsight/gradle/GradleMigrateTest.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt index e408595bcd4..95c1474c0ce 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleMigrateTest.kt @@ -34,14 +34,14 @@ class GradleMigrateTest : GradleImportingTestCase() { mavenCentral() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40" } } apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.40" } """, @@ -53,14 +53,14 @@ class GradleMigrateTest : GradleImportingTestCase() { mavenCentral() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50" } } apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.0" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.50" } """ ) @@ -69,12 +69,12 @@ class GradleMigrateTest : GradleImportingTestCase() { Assert.assertEquals( MigrationInfo.create( - oldStdlibVersion = "1.1.0", - oldApiVersion = ApiVersion.KOTLIN_1_1, - oldLanguageVersion = LanguageVersion.KOTLIN_1_1, - newStdlibVersion = "1.2.0", - newApiVersion = ApiVersion.KOTLIN_1_2, - newLanguageVersion = LanguageVersion.KOTLIN_1_2 + oldStdlibVersion = "1.2.40", + oldApiVersion = ApiVersion.KOTLIN_1_2, + oldLanguageVersion = LanguageVersion.KOTLIN_1_2, + newStdlibVersion = "1.3.50", + newApiVersion = ApiVersion.KOTLIN_1_3, + newLanguageVersion = LanguageVersion.KOTLIN_1_3 ), migrateComponentState?.migrationInfo )