diff --git a/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected b/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected
index 3977f5a2854..a1349b956cb 100644
--- a/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected
+++ b/compiler/testData/integration/ant/jvm/languageVersion/build.log.expected
@@ -3,6 +3,7 @@ Buildfile: [TestData]/build.xml
build:
[kotlinc] Compiling [[TestData]/main.kt] => [[Temp]/hello.jar]
+ [kotlinc] warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin
[kotlinc] [TestData]/main.kt:4:21: error: 'break' and 'continue' are not allowed in 'when' statements. Consider using labels to continue/break from the outer loop
[kotlinc] true -> break
[kotlinc] ^
diff --git a/compiler/testData/integration/ant/jvm/verbose/build.log.expected b/compiler/testData/integration/ant/jvm/verbose/build.log.expected
index 663032953a2..66a43fb0592 100644
--- a/compiler/testData/integration/ant/jvm/verbose/build.log.expected
+++ b/compiler/testData/integration/ant/jvm/verbose/build.log.expected
@@ -4,7 +4,7 @@ Buildfile: [TestData]/build.xml
build:
[kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar]
[kotlinc] logging: using Kotlin home directory [KotlinProjectHome]/dist/kotlinc
- [kotlinc] logging: using old JVM backend
+ [kotlinc] logging: using JVM IR backend
[kotlinc] logging: configuring the compilation environment
[kotlinc] logging: configure scripting: Added template org.jetbrains.kotlin.mainKts.MainKtsScript from [[CompilerLib]/kotlin-main-kts.jar, [CompilerLib]/kotlin-reflect.jar, [CompilerLib]/kotlin-script-runtime.jar, [CompilerLib]/kotlin-stdlib.jar]
diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CustomCliTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/CustomCliTest.kt
index 202af8b98fb..d97f3601d27 100644
--- a/compiler/tests/org/jetbrains/kotlin/cli/CustomCliTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/cli/CustomCliTest.kt
@@ -16,7 +16,7 @@ private const val EMPTY_MAIN_FUN = "fun main() {}"
class CustomCliTest : TestCaseWithTmpdir() {
fun testArgfileWithNonTrivialWhitespaces() {
- val text = "-include-runtime\r\n\t\t-language-version\n\t1.2\r\n-version"
+ val text = "-include-runtime\r\n\t\t-language-version\n\t1.5\r\n-version"
val argfile = File(tmpdir, "argfile").apply { writeText(text, Charsets.UTF_8) }
CompilerTestUtil.executeCompilerAssertSuccessful(K2JVMCompiler(), listOf("@" + argfile.absolutePath))
}
diff --git a/idea/testData/highlighter/DelegatingCtor.kt b/idea/testData/highlighter/DelegatingCtor.kt
index 8d795a2dba9..c99e4456a96 100644
--- a/idea/testData/highlighter/DelegatingCtor.kt
+++ b/idea/testData/highlighter/DelegatingCtor.kt
@@ -1,18 +1,18 @@
// IGNORE_FIR
-open class Foo {
- constructor(i: Int)
+open class Foo {
+ constructor(i: Int)
}
-class Bar : Foo {
- constructor(s: String)
+class Bar : Foo {
+ constructor(s: String)
}
-class F(foo: String) {
- constructor() {}
+class F(foo: String) {
+ constructor() {}
}
-enum class E(val a: String) {
- A;
- constructor()
-}
\ No newline at end of file
+enum class E(val a: String) {
+ A;
+ constructor()
+}
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
index 2d432cdf16f..28b46b667f4 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
@@ -458,7 +458,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
assertEquals(1, myProject.modules.size)
val module = myProject.modules.first()
val args = module.kotlinCompilerArguments
- args.apiVersion = "1.2"
+ args.apiVersion = "1.4"
myProject.kotlinCommonCompilerArguments = args
buildAllModules().assertSuccessful()
diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
index 605d85bce34..82625bda9cf 100644
--- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
+++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201
@@ -458,7 +458,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() {
assertEquals(1, myProject.modules.size)
val module = myProject.modules.first()
val args = module.kotlinCompilerArguments
- args.apiVersion = "1.2"
+ args.apiVersion = "1.4"
myProject.kotlinCommonCompilerArguments = args
buildAllModules().assertSuccessful()
diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
index 3ebb848ec74..4d083a238d5 100644
--- a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
+++ b/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt
@@ -6,14 +6,14 @@ interface KotlinCommonOptions : org.jetbrains.kotlin.gradle.dsl.KotlinCommonToo
/**
* Allow using declarations only from the specified version of bundled libraries
- * Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)", "1.6 (EXPERIMENTAL)"
+ * Possible values: "1.3 (DEPRECATED)", "1.4", "1.5", "1.6 (EXPERIMENTAL)"
* Default value: null
*/
var apiVersion: kotlin.String?
/**
* Provide source compatibility with the specified version of Kotlin
- * Possible values: "1.2 (DEPRECATED)", "1.3", "1.4", "1.5 (EXPERIMENTAL)", "1.6 (EXPERIMENTAL)"
+ * Possible values: "1.3 (DEPRECATED)", "1.4", "1.5", "1.6 (EXPERIMENTAL)"
* Default value: null
*/
var languageVersion: kotlin.String?
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 52152745c0e..2811bef9603 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
@@ -467,18 +467,18 @@ class KotlinGradleIT : BaseGradleIT() {
}
// check the arguments are always passed if specified explicitly
- updateBuildGradle("1.2", "1.2")
+ updateBuildGradle("1.4", "1.4")
project.build("clean", "compileKotlin") {
assertSuccessful()
- assertContains("-language-version 1.2")
- assertContains("-api-version 1.2")
+ assertContains("-language-version 1.4")
+ assertContains("-api-version 1.4")
}
- updateBuildGradle("1.3", "1.3")
+ updateBuildGradle("1.5", "1.5")
project.build("clean", "compileKotlin") {
assertSuccessful()
- assertContains("-language-version 1.3")
- assertContains("-api-version 1.3")
+ assertContains("-language-version 1.5")
+ assertContains("-api-version 1.5")
}
}
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 d1519f0d513..4dbf47c60c1 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.3'", "'1.2'", "null"
+ "null", "'1.5'", "'1.4'", "null"
)
)
}
@@ -22,7 +22,7 @@ class UpToDateIT : BaseGradleIT() {
testMutations(
*propertyMutationChain(
"compileKotlin.kotlinOptions.apiVersion",
- "null", "'1.3'", "'1.2'", "null"
+ "null", "'1.5'", "'1.4'", "null"
)
)
}