diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt index 0c2dd25fe9c..91a0d053f6e 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt @@ -38,7 +38,7 @@ class GradleInspectionTest : GradleImportingTestCase() { val problems = getInspectionResultFromTestDataProject() Assert.assertEquals(1, problems.size) - Assert.assertEquals("Plugin version (1.0.2) is not the same as library version (1.0.3)", problems.single()) + Assert.assertEquals("Plugin version (1.3.20) is not the same as library version (1.3.30)", problems.single()) } @Test @@ -46,7 +46,7 @@ class GradleInspectionTest : GradleImportingTestCase() { val problems = getInspectionResultFromTestDataProject() Assert.assertEquals(1, problems.size) - Assert.assertEquals("Plugin version (1.0.2) is not the same as library version (1.0.3)", problems.single()) + Assert.assertEquals("Plugin version (1.3.20) is not the same as library version (1.3.30)", problems.single()) } @Test @@ -70,7 +70,7 @@ class GradleInspectionTest : GradleImportingTestCase() { val problems = getInspectionResultFromTestDataProject() Assert.assertEquals(1, problems.size) - Assert.assertEquals("Plugin version (1.0.1) is not the same as library version (1.0.3)", problems.single()) + Assert.assertEquals("Plugin version (1.3.10) is not the same as library version (1.3.30)", problems.single()) } @Test @@ -81,18 +81,20 @@ class GradleInspectionTest : GradleImportingTestCase() { Assert.assertEquals(1, problems.size) Assert.assertEquals( - "Kotlin version that is used for building with Gradle (1.0.1) differs from the one bundled into the IDE plugin (\$PLUGIN_VERSION)", + "Kotlin version that is used for building with Gradle (1.3.0) differs from the one bundled into the IDE plugin (\$PLUGIN_VERSION)", problems.single() ) } @Test + @TargetVersions("4.9") fun testJreInOldVersion() { val problems = getInspectionResultFromTestDataProject() Assert.assertTrue("The inspection result should be empty but contains the following elements: [$problems].", problems.isEmpty()) } @Test + @TargetVersions("4.9") fun testJreIsDeprecated() { val problems = getInspectionResultFromTestDataProject() @@ -104,6 +106,7 @@ class GradleInspectionTest : GradleImportingTestCase() { } @Test + @TargetVersions("4.9") fun testJreIsDeprecatedWithImplementation() { val problems = getInspectionResultFromTestDataProject() @@ -114,7 +117,7 @@ class GradleInspectionTest : GradleImportingTestCase() { ) } - @TargetVersions("4.9+") + @TargetVersions("4.9") @Test fun testJreIsDeprecatedWithoutImplicitVersion() { val problems = getInspectionResultFromTestDataProject() @@ -141,6 +144,7 @@ class GradleInspectionTest : GradleImportingTestCase() { } @Test + @TargetVersions("4.9") fun testObsoleteCoroutinesUsage() { val problems = getInspectionResultFromTestDataProject() diff --git a/idea/testData/gradle/inspections/differentKotlinGradleVersion/gradle.properties b/idea/testData/gradle/inspections/differentKotlinGradleVersion/gradle.properties index 298b41a3e2f..7fdf4ff1ad6 100644 --- a/idea/testData/gradle/inspections/differentKotlinGradleVersion/gradle.properties +++ b/idea/testData/gradle/inspections/differentKotlinGradleVersion/gradle.properties @@ -1 +1 @@ -test=1.0.1 \ No newline at end of file +test=1.3.0 \ No newline at end of file diff --git a/idea/testData/gradle/inspections/differentStdlibGradleVersion/build.gradle b/idea/testData/gradle/inspections/differentStdlibGradleVersion/build.gradle index 16327230374..43b11608e27 100644 --- a/idea/testData/gradle/inspections/differentStdlibGradleVersion/build.gradle +++ b/idea/testData/gradle/inspections/differentStdlibGradleVersion/build.gradle @@ -9,12 +9,12 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20") } } apply plugin: 'kotlin' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:1.0.3" + compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.30" } diff --git a/idea/testData/gradle/inspections/differentStdlibGradleVersionWithImplementation/build.gradle b/idea/testData/gradle/inspections/differentStdlibGradleVersionWithImplementation/build.gradle index 8b1e99ca460..e22af5805e2 100644 --- a/idea/testData/gradle/inspections/differentStdlibGradleVersionWithImplementation/build.gradle +++ b/idea/testData/gradle/inspections/differentStdlibGradleVersionWithImplementation/build.gradle @@ -9,12 +9,12 @@ buildscript { } dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.2") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20") } } apply plugin: 'kotlin' dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:1.0.3" + implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.30" } diff --git a/idea/testData/gradle/inspections/differentStdlibGradleVersionWithVariables/gradle.properties b/idea/testData/gradle/inspections/differentStdlibGradleVersionWithVariables/gradle.properties index ca968b3c807..b489657e988 100644 --- a/idea/testData/gradle/inspections/differentStdlibGradleVersionWithVariables/gradle.properties +++ b/idea/testData/gradle/inspections/differentStdlibGradleVersionWithVariables/gradle.properties @@ -1,2 +1,2 @@ -kotlin=1.0.1 -lib_version=1.0.3 \ No newline at end of file +kotlin=1.3.10 +lib_version=1.3.30 \ No newline at end of file