diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/compiler.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/compiler.xml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/compiler.xml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/compiler.xml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/copyright/profiles_settings.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/copyright/profiles_settings.xml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/copyright/profiles_settings.xml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/copyright/profiles_settings.xml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/libraries/KotlinJavaRuntime.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/libraries/KotlinJavaRuntime.xml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/libraries/KotlinJavaRuntime.xml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/misc.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/misc.xml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/misc.xml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/misc.xml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/modules.xml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/modules.xml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/.idea/modules.xml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/.idea/modules.xml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/lib/kotlin-runtime.jar b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/lib/kotlin-runtime.jar new file mode 100644 index 00000000000..a4ef023c369 Binary files /dev/null and b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/lib/kotlin-runtime.jar differ diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/module.iml b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/module.iml similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/module.iml rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/module.iml diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/src/foo.kt b/idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/src/foo.kt similarity index 100% rename from idea/testData/configuration/kotlincExistsNoSettingsRuntime11/src/foo.kt rename to idea/testData/configuration/kotlincExistsNoSettingsLatestRuntime/src/foo.kt diff --git a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/lib/kotlin-runtime.jar b/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/lib/kotlin-runtime.jar deleted file mode 100644 index 24854eff673..00000000000 Binary files a/idea/testData/configuration/kotlincExistsNoSettingsRuntime11/lib/kotlin-runtime.jar and /dev/null differ diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt index 3603cd865e7..a7557408ff5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInTempDirTest.kt @@ -56,11 +56,11 @@ class ConfigureKotlinInTempDirTest : AbstractConfigureKotlinTest() { Assert.assertTrue(project.baseDir.findFileByRelativePath(".idea/kotlinc.xml") != null) } - fun testKotlincExistsNoSettingsRuntime11() { + fun testKotlincExistsNoSettingsLatestRuntime() { val application = ApplicationManager.getApplication() as ApplicationImpl application.doNotSave(false) - Assert.assertEquals(LanguageVersion.KOTLIN_1_1, myProject.getLanguageVersionSettings(null).languageVersion) - Assert.assertEquals(LanguageVersion.KOTLIN_1_1, module.languageVersionSettings.languageVersion) + Assert.assertEquals(LanguageVersion.LATEST_STABLE, myProject.getLanguageVersionSettings(null).languageVersion) + Assert.assertEquals(LanguageVersion.LATEST_STABLE, module.languageVersionSettings.languageVersion) application.saveAll() Assert.assertTrue(project.baseDir.findFileByRelativePath(".idea/kotlinc.xml") == null) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index 490b8b7cdcf..ce782e00879 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java @@ -142,8 +142,8 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testProjectWithoutFacetWithRuntime11WithoutLanguageLevel() { - assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); - assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); + assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); + assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); } public void testProjectWithoutFacetWithRuntime11WithLanguageLevel10() { @@ -152,7 +152,7 @@ public class ConfigureKotlinTest extends AbstractConfigureKotlinTest { } public void testProjectWithFacetWithRuntime11WithLanguageLevel10() { - assertEquals(LanguageVersion.KOTLIN_1_1, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); + assertEquals(LanguageVersion.LATEST_STABLE, PlatformKt.getLanguageVersionSettings(myProject, null).getLanguageVersion()); assertEquals(LanguageVersion.KOTLIN_1_0, PlatformKt.getLanguageVersionSettings(getModule()).getLanguageVersion()); }