diff --git a/build.gradle.kts b/build.gradle.kts index 7deaf9ab474..ab24ecc1260 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -74,7 +74,7 @@ val kotlinVersion by extra( } ?: buildNumber ) -val kotlinLanguageVersion by extra("1.4") +val kotlinLanguageVersion by extra("1.5") allprojects { group = "org.jetbrains.kotlin" diff --git a/compiler/testData/cli/js/irApiVersionUnsupported.out b/compiler/testData/cli/js/irApiVersionUnsupported.out index b55e747994d..3d24845a16a 100644 --- a/compiler/testData/cli/js/irApiVersionUnsupported.out +++ b/compiler/testData/cli/js/irApiVersionUnsupported.out @@ -1,2 +1,3 @@ +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin error: IR backend cannot be used with language or API version below 1.4 COMPILATION_ERROR diff --git a/compiler/testData/cli/js/irLanguageVersionUnsupported.out b/compiler/testData/cli/js/irLanguageVersionUnsupported.out index b55e747994d..1aaec27e5df 100644 --- a/compiler/testData/cli/js/irLanguageVersionUnsupported.out +++ b/compiler/testData/cli/js/irLanguageVersionUnsupported.out @@ -1,2 +1,3 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin error: IR backend cannot be used with language or API version below 1.4 COMPILATION_ERROR diff --git a/compiler/testData/cli/js/languageVersion.out b/compiler/testData/cli/js/languageVersion.out index 11d240d323d..4414801d4cf 100644 --- a/compiler/testData/cli/js/languageVersion.out +++ b/compiler/testData/cli/js/languageVersion.out @@ -1,3 +1,4 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/js/languageVersion.kt:6:21: error: 'break' and 'continue' are not allowed in 'when' statements. Consider using labels to continue/break from the outer loop true -> break ^ diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args deleted file mode 100644 index 3d0218fd1c3..00000000000 --- a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args +++ /dev/null @@ -1,4 +0,0 @@ -$TESTDATA_DIR$/simple.kt --d -$TEMP_DIR$ --Xabi-stability=unstable diff --git a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out b/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out deleted file mode 100644 index 4383a3f6de4..00000000000 --- a/compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.out +++ /dev/null @@ -1,2 +0,0 @@ -error: -Xabi-stability=unstable is not supported in the old JVM backend -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out index 3865fd31ea8..58a0033b730 100644 --- a/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out +++ b/compiler/testData/cli/jvm/apiAndLanguageVersionsUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.2 or greater. +error: language version 1.1 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersion.args b/compiler/testData/cli/jvm/apiVersion.args index be2fe08ada2..404c9b50959 100644 --- a/compiler/testData/cli/jvm/apiVersion.args +++ b/compiler/testData/cli/jvm/apiVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/apiVersion.kt -d $TEMP_DIR$ -api-version -1.2 +1.3 diff --git a/compiler/testData/cli/jvm/apiVersion.out b/compiler/testData/cli/jvm/apiVersion.out index dfbbdc6df42..6a8dab0a7c0 100644 --- a/compiler/testData/cli/jvm/apiVersion.out +++ b/compiler/testData/cli/jvm/apiVersion.out @@ -1,8 +1,95 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:11:20: error: the feature "function types with big arity" is only available since API version 1.3 -fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { - ^ -compiler/testData/cli/jvm/apiVersion.kt:12:9: error: the feature "function types with big arity" is only available since API version 1.3 - bar(::foo) +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used +fun bar(x: Any) {} ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.args b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.args index 230810fe312..4ac04500264 100644 --- a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.args +++ b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/apiVersionAndSinceNewerKotlin.kt -d $TEMP_DIR$ -api-version -1.2 +1.3 diff --git a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt index f5186d4e0f1..0154fa922ba 100644 --- a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt +++ b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt @@ -1,5 +1,5 @@ -@SinceKotlin("1.2") +@SinceKotlin("1.3") fun old() {} -@SinceKotlin("1.3") +@SinceKotlin("1.4") fun new() {} diff --git a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out index 03b29a8f588..d4b8817fca4 100644 --- a/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out +++ b/compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.out @@ -1,5 +1,5 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:4:1: warning: the version is greater than the specified API version 1.2 -@SinceKotlin("1.3") +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersionAndSinceNewerKotlin.kt:4:1: warning: the version is greater than the specified API version 1.3 +@SinceKotlin("1.4") ^ OK diff --git a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out index a41ca754b6d..b75e3a994ea 100644 --- a/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out +++ b/compiler/testData/cli/jvm/apiVersionGreaterThanLanguage.out @@ -1,2 +1,3 @@ error: -api-version (1.4) cannot be greater than -language-version (1.3) +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionInvalid.out b/compiler/testData/cli/jvm/apiVersionInvalid.out index cd148e4175f..78dcfeeec87 100644 --- a/compiler/testData/cli/jvm/apiVersionInvalid.out +++ b/compiler/testData/cli/jvm/apiVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown API version: 239.42 -Supported API versions: 1.2 (DEPRECATED), 1.3, 1.4, 1.5 (EXPERIMENTAL), 1.6 (EXPERIMENTAL) +Supported API versions: 1.3 (DEPRECATED), 1.4, 1.5, 1.6 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.argfile b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.argfile index 93af1fd5987..4d4b695158b 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.argfile +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.argfile @@ -1 +1 @@ -$TESTDATA_DIR$/apiVersion.kt -d $TEMP_DIR$ -api-version 1.2 -language-version 1.3 +$TESTDATA_DIR$/apiVersion.kt -d $TEMP_DIR$ -api-version 1.3 -language-version 1.4 diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.args b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.args index 29ebce58cea..af95ae6168f 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.args +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.args @@ -2,6 +2,6 @@ $TESTDATA_DIR$/apiVersion.kt -d $TEMP_DIR$ -api-version -1.2 --language-version 1.3 +-language-version +1.4 diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out index dfbbdc6df42..6a8dab0a7c0 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguage.out @@ -1,8 +1,95 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:11:20: error: the feature "function types with big arity" is only available since API version 1.3 -fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { - ^ -compiler/testData/cli/jvm/apiVersion.kt:12:9: error: the feature "function types with big arity" is only available since API version 1.3 - bar(::foo) +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used +fun bar(x: Any) {} ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out b/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out index dfbbdc6df42..6a8dab0a7c0 100644 --- a/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out +++ b/compiler/testData/cli/jvm/apiVersionLessThanLanguageUsingArgfile.out @@ -1,8 +1,95 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:11:20: error: the feature "function types with big arity" is only available since API version 1.3 -fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { - ^ -compiler/testData/cli/jvm/apiVersion.kt:12:9: error: the feature "function types with big arity" is only available since API version 1.3 - bar(::foo) +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used +fun bar(x: Any) {} ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/apiVersionUnsupported.out b/compiler/testData/cli/jvm/apiVersionUnsupported.out index 3c2296a1edd..fefaea7f7bc 100644 --- a/compiler/testData/cli/jvm/apiVersionUnsupported.out +++ b/compiler/testData/cli/jvm/apiVersionUnsupported.out @@ -1,2 +1,2 @@ -error: API version 1.1 is no longer supported; please, use version 1.2 or greater. +error: API version 1.1 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/argfileWithEscaping.argfile b/compiler/testData/cli/jvm/argfileWithEscaping.argfile index 4eca3c7fec4..5be4a50a0b8 100644 --- a/compiler/testData/cli/jvm/argfileWithEscaping.argfile +++ b/compiler/testData/cli/jvm/argfileWithEscaping.argfile @@ -2,4 +2,4 @@ -X'single \" quote " escaped \' sequence \\' $TESTDATA_DIR$/apiVersion.kt -d -$TEMP_DIR$ -api-version 1.2 -language-version 1.3 +$TEMP_DIR$ -api-version 1.3 -language-version 1.4 diff --git a/compiler/testData/cli/jvm/argfileWithEscaping.out b/compiler/testData/cli/jvm/argfileWithEscaping.out index 221c87d086c..22f55863f57 100644 --- a/compiler/testData/cli/jvm/argfileWithEscaping.out +++ b/compiler/testData/cli/jvm/argfileWithEscaping.out @@ -1,10 +1,97 @@ warning: flag is not supported by this version of the compiler: -Xdouble ' quote ' escaped " sequence / warning: flag is not supported by this version of the compiler: -Xsingle " quote " escaped ' sequence / -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:11:20: error: the feature "function types with big arity" is only available since API version 1.3 -fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { - ^ -compiler/testData/cli/jvm/apiVersion.kt:12:9: error: the feature "function types with big arity" is only available since API version 1.3 - bar(::foo) +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used +fun bar(x: Any) {} ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/classAndFileClassClash.out b/compiler/testData/cli/jvm/classAndFileClassClash.out index d4619b71659..987019e90b6 100644 --- a/compiler/testData/cli/jvm/classAndFileClassClash.out +++ b/compiler/testData/cli/jvm/classAndFileClassClash.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/classAndFileClassClash.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo +compiler/testData/cli/jvm/classAndFileClassClash.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, Foo @file:JvmName("Foo") ^ -compiler/testData/cli/jvm/classAndFileClassClash.kt:6:1: error: duplicate JVM class name 'test/Foo' generated from: package-fragment test, Foo +compiler/testData/cli/jvm/classAndFileClassClash.kt:6:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, Foo class Foo {} ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/classAndOtherFileClassClash.out b/compiler/testData/cli/jvm/classAndOtherFileClassClash.out index e232f41cfba..461d0e939f8 100644 --- a/compiler/testData/cli/jvm/classAndOtherFileClassClash.out +++ b/compiler/testData/cli/jvm/classAndOtherFileClassClash.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test +compiler/testData/cli/jvm/classAndOtherFileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, Foo @file:JvmName("Foo") ^ -compiler/testData/cli/jvm/classAndOtherFileClassClash2.kt:3:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, package-fragment test +compiler/testData/cli/jvm/classAndOtherFileClassClash2.kt:3:1: error: duplicate JVM class name 'test/Foo' generated from: Foo, Foo class Foo ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/classAndPartClash.out b/compiler/testData/cli/jvm/classAndPartClash.out index d1cfe7b2bad..059073ec43b 100644 --- a/compiler/testData/cli/jvm/classAndPartClash.out +++ b/compiler/testData/cli/jvm/classAndPartClash.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt +compiler/testData/cli/jvm/classAndPartClash.kt:1:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: ClassAndPartClashKt, ClassAndPartClashKt package test ^ -compiler/testData/cli/jvm/classAndPartClash.kt:5:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: package-fragment test, ClassAndPartClashKt +compiler/testData/cli/jvm/classAndPartClash.kt:5:1: error: duplicate JVM class name 'test/ClassAndPartClashKt' generated from: ClassAndPartClashKt, ClassAndPartClashKt class ClassAndPartClashKt ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/classAndTraitClash.args b/compiler/testData/cli/jvm/classAndTraitClash.args index 725b9b150d7..a5a7cfcb7f4 100644 --- a/compiler/testData/cli/jvm/classAndTraitClash.args +++ b/compiler/testData/cli/jvm/classAndTraitClash.args @@ -1,3 +1,4 @@ $TESTDATA_DIR$/classAndTraitClash.kt -d $TEMP_DIR$ +-Xuse-old-backend diff --git a/compiler/testData/cli/jvm/deprecatedApiVersion.args b/compiler/testData/cli/jvm/deprecatedApiVersion.args index 69558a4e07d..3797012d319 100644 --- a/compiler/testData/cli/jvm/deprecatedApiVersion.args +++ b/compiler/testData/cli/jvm/deprecatedApiVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -api-version -1.2 +1.3 diff --git a/compiler/testData/cli/jvm/deprecatedApiVersion.out b/compiler/testData/cli/jvm/deprecatedApiVersion.out index 99993437fbd..f5a5aee1ea3 100644 --- a/compiler/testData/cli/jvm/deprecatedApiVersion.out +++ b/compiler/testData/cli/jvm/deprecatedApiVersion.out @@ -1,2 +1,2 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out index 3c2296a1edd..8a2d8464d6e 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out +++ b/compiler/testData/cli/jvm/deprecatedLanguageUnsupportedApi.out @@ -1,2 +1,2 @@ -error: API version 1.1 is no longer supported; please, use version 1.2 or greater. +error: language version 1.2 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/deprecatedLanguageVersion.args b/compiler/testData/cli/jvm/deprecatedLanguageVersion.args index d64e4c7b5cc..fa86087583c 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageVersion.args +++ b/compiler/testData/cli/jvm/deprecatedLanguageVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -language-version -1.2 +1.3 diff --git a/compiler/testData/cli/jvm/deprecatedLanguageVersion.out b/compiler/testData/cli/jvm/deprecatedLanguageVersion.out index 7d53695d487..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/deprecatedLanguageVersion.out +++ b/compiler/testData/cli/jvm/deprecatedLanguageVersion.out @@ -1,2 +1,2 @@ -warning: language version 1.2 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/fileClassAndMultifileClassClash.out b/compiler/testData/cli/jvm/fileClassAndMultifileClassClash.out index 20bc3ae1978..194828b65b5 100644 --- a/compiler/testData/cli/jvm/fileClassAndMultifileClassClash.out +++ b/compiler/testData/cli/jvm/fileClassAndMultifileClassClash.out @@ -1,7 +1,4 @@ -compiler/testData/cli/jvm/fileClassAndMultifileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test +compiler/testData/cli/jvm/fileClassAndMultifileClassClash1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: Util, Util @file:JvmName("Util") ^ -compiler/testData/cli/jvm/fileClassAndMultifileClassClash2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test -@file:JvmName("Util") -^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out b/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out index 982ea3b5a52..4aa58d5e670 100644 --- a/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out +++ b/compiler/testData/cli/jvm/fileClassClashMultipleFiles.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test +compiler/testData/cli/jvm/fileClassClashMultipleFiles1.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: Util, Util @file:JvmName("Util") ^ -compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: package-fragment test, package-fragment test +compiler/testData/cli/jvm/fileClassClashMultipleFiles2.kt:1:1: error: duplicate JVM class name 'test/Util' generated from: Util, Util @file:JvmName("Util") ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args index 55c6c5be4c4..5c91abf4594 100644 --- a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.args @@ -1,4 +1,4 @@ -$TESTDATA_DIR$/legacySmartCastsAfterTry.kt +$TESTDATA_DIR$/internalArgDisableLanguageFeature.kt -d $TEMP_DIR$ --XXLanguage\:-SoundSmartCastsAfterTry \ No newline at end of file +-XXLanguage\:-SealedInterfaces diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.kt b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.kt new file mode 100644 index 00000000000..a5c74a3f568 --- /dev/null +++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.kt @@ -0,0 +1 @@ +sealed interface A diff --git a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out index 91e4fcf215b..a3fd0e1c992 100644 --- a/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgDisableLanguageFeature.out @@ -1,13 +1,13 @@ warning: ATTENTION! This build uses unsafe internal compiler arguments: --XXLanguage:-SoundSmartCastsAfterTry +-XXLanguage:-SealedInterfaces This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -compiler/testData/cli/jvm/legacySmartCastsAfterTry.kt:2:25: warning: variable 'some' initializer is redundant - var some: String? = null - ^ -OK +compiler/testData/cli/jvm/internalArgDisableLanguageFeature.kt:1:1: error: modifier 'sealed' is not applicable to 'interface' +sealed interface A +^ +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args index ca111f84f4e..822c33b4864 100644 --- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args +++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.args @@ -2,5 +2,5 @@ $TESTDATA_DIR$/variableInWhenSubject.kt -d $TEMP_DIR$ -language-version -1.2 --XXLanguage\:+VariableDeclarationInWhenSubject \ No newline at end of file +1.3 +-XXLanguage\:+VariableDeclarationInWhenSubject diff --git a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out index 4fbe65494dc..f5e17f06e11 100644 --- a/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out +++ b/compiler/testData/cli/jvm/internalArgEnableLanguageFeature.out @@ -7,5 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 1.2 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out index d86bac9de59..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out +++ b/compiler/testData/cli/jvm/internalArgNoWarningForEnablingBugfix.out @@ -1 +1,2 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/irApiVersionUnsupported.args b/compiler/testData/cli/jvm/irApiVersionUnsupported.args index 07d5b8b2c85..ebfd56ee9dc 100644 --- a/compiler/testData/cli/jvm/irApiVersionUnsupported.args +++ b/compiler/testData/cli/jvm/irApiVersionUnsupported.args @@ -2,7 +2,7 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -language-version -1.3 +1.4 -api-version -1.2 +1.3 -Xuse-ir diff --git a/compiler/testData/cli/jvm/irApiVersionUnsupported.out b/compiler/testData/cli/jvm/irApiVersionUnsupported.out index 50862059811..f5a5aee1ea3 100644 --- a/compiler/testData/cli/jvm/irApiVersionUnsupported.out +++ b/compiler/testData/cli/jvm/irApiVersionUnsupported.out @@ -1,3 +1,2 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -warning: IR backend does not support language or API version lower than 1.3. This can lead to unexpected behavior or compilation failures +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/irLanguageVersionUnsupported.args b/compiler/testData/cli/jvm/irLanguageVersionUnsupported.args index 5fa29a50887..c23b1a7463c 100644 --- a/compiler/testData/cli/jvm/irLanguageVersionUnsupported.args +++ b/compiler/testData/cli/jvm/irLanguageVersionUnsupported.args @@ -2,5 +2,5 @@ $TESTDATA_DIR$/simple.kt -d $TEMP_DIR$ -language-version -1.2 +1.3 -Xuse-ir diff --git a/compiler/testData/cli/jvm/irLanguageVersionUnsupported.out b/compiler/testData/cli/jvm/irLanguageVersionUnsupported.out index 3f22a2135cc..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/irLanguageVersionUnsupported.out +++ b/compiler/testData/cli/jvm/irLanguageVersionUnsupported.out @@ -1,3 +1,2 @@ -warning: language version 1.2 is deprecated and its support will be removed in a future version of Kotlin -warning: IR backend does not support language or API version lower than 1.3. This can lead to unexpected behavior or compilation failures +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/irSupported.out b/compiler/testData/cli/jvm/irSupported.out index d86bac9de59..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/irSupported.out +++ b/compiler/testData/cli/jvm/irSupported.out @@ -1 +1,2 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/jvmIrByDefault1_5.out b/compiler/testData/cli/jvm/jvmIrByDefault1_5.out index 5be61f3d3c9..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/jvmIrByDefault1_5.out +++ b/compiler/testData/cli/jvm/jvmIrByDefault1_5.out @@ -1,2 +1 @@ -warning: language version 1.5 is experimental, there are no backwards compatibility guarantees for new language and library features OK diff --git a/compiler/testData/cli/jvm/jvmRecordOk.out b/compiler/testData/cli/jvm/jvmRecordOk.out index 06702215887..2e80331b53b 100644 --- a/compiler/testData/cli/jvm/jvmRecordOk.out +++ b/compiler/testData/cli/jvm/jvmRecordOk.out @@ -7,6 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 1.5 is experimental, there are no backwards compatibility guarantees for new language and library features info: using preview Java language features OK diff --git a/compiler/testData/cli/jvm/jvmRecordWrongTarget.out b/compiler/testData/cli/jvm/jvmRecordWrongTarget.out index ecb2e575bc2..99fcd0eba3a 100644 --- a/compiler/testData/cli/jvm/jvmRecordWrongTarget.out +++ b/compiler/testData/cli/jvm/jvmRecordWrongTarget.out @@ -7,7 +7,6 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 1.5 is experimental, there are no backwards compatibility guarantees for new language and library features compiler/testData/cli/jvm/jvmRecord.kt:1:1: error: using @JvmRecord is only allowed with -jvm-target 15 and -Xjvm-enable-preview flag enabled @JvmRecord ^ diff --git a/compiler/testData/cli/jvm/kt19628_12.args b/compiler/testData/cli/jvm/kt19628_12.args deleted file mode 100644 index cce5278e6ef..00000000000 --- a/compiler/testData/cli/jvm/kt19628_12.args +++ /dev/null @@ -1,5 +0,0 @@ -$TESTDATA_DIR$/kt19628_12.kt --language-version -1.2 --d -$TEMP_DIR$ \ No newline at end of file diff --git a/compiler/testData/cli/jvm/kt19628_12.kt b/compiler/testData/cli/jvm/kt19628_12.kt deleted file mode 100644 index 0c4067323b2..00000000000 --- a/compiler/testData/cli/jvm/kt19628_12.kt +++ /dev/null @@ -1,10 +0,0 @@ -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter - -@Suppress("ANNOTATION_TARGETS_NON_EXISTENT_ACCESSOR") -class Data( - @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class) - var value: String? -) { - @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class) - private val b: String = "" -} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/kt19628_12.out b/compiler/testData/cli/jvm/kt19628_12.out deleted file mode 100644 index 7d53695d487..00000000000 --- a/compiler/testData/cli/jvm/kt19628_12.out +++ /dev/null @@ -1,2 +0,0 @@ -warning: language version 1.2 is deprecated and its support will be removed in a future version of Kotlin -OK diff --git a/compiler/testData/cli/jvm/kt19628_13.out b/compiler/testData/cli/jvm/kt19628_13.out index d12d4f0b31b..a42779fc389 100644 --- a/compiler/testData/cli/jvm/kt19628_13.out +++ b/compiler/testData/cli/jvm/kt19628_13.out @@ -1,3 +1,4 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/kt19628_13.kt:5:29: error: unresolved reference: CollapsedStringAdapter @get:XmlJavaTypeAdapter(CollapsedStringAdapter::class) ^ diff --git a/compiler/testData/cli/jvm/languageVersion.args b/compiler/testData/cli/jvm/languageVersion.args index 1d9b4e2ce42..fdffb1d1e7b 100644 --- a/compiler/testData/cli/jvm/languageVersion.args +++ b/compiler/testData/cli/jvm/languageVersion.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/languageVersion.kt -d $TEMP_DIR$ -language-version -1.3 +1.4 diff --git a/compiler/testData/cli/jvm/languageVersion.out b/compiler/testData/cli/jvm/languageVersion.out index f32b75ce232..d86bac9de59 100644 --- a/compiler/testData/cli/jvm/languageVersion.out +++ b/compiler/testData/cli/jvm/languageVersion.out @@ -1,4 +1 @@ -compiler/testData/cli/jvm/languageVersion.kt:6:21: error: 'break' and 'continue' are not allowed in 'when' statements. Consider using labels to continue/break from the outer loop - true -> break - ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/languageVersionInvalid.out b/compiler/testData/cli/jvm/languageVersionInvalid.out index 27fe891bb92..1289e703ebf 100644 --- a/compiler/testData/cli/jvm/languageVersionInvalid.out +++ b/compiler/testData/cli/jvm/languageVersionInvalid.out @@ -1,3 +1,3 @@ error: unknown language version: 239.42 -Supported language versions: 1.2 (DEPRECATED), 1.3, 1.4, 1.5 (EXPERIMENTAL), 1.6 (EXPERIMENTAL) +Supported language versions: 1.3 (DEPRECATED), 1.4, 1.5, 1.6 (EXPERIMENTAL) COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/languageVersionUnsupported.out b/compiler/testData/cli/jvm/languageVersionUnsupported.out index 3865fd31ea8..58a0033b730 100644 --- a/compiler/testData/cli/jvm/languageVersionUnsupported.out +++ b/compiler/testData/cli/jvm/languageVersionUnsupported.out @@ -1,2 +1,2 @@ -error: language version 1.1 is no longer supported; please, use version 1.2 or greater. +error: language version 1.1 is no longer supported; please, use version 1.3 or greater. COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.argfile b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.argfile index e83861dd435..9c5eaa817d6 100644 --- a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.argfile +++ b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.argfile @@ -1 +1 @@ -$TEMP_DIR$ -api-version 1.2 -language-version 1.3 \ No newline at end of file +$TEMP_DIR$ -api-version 1.3 -language-version 1.4 diff --git a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out index dfbbdc6df42..6a8dab0a7c0 100644 --- a/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out +++ b/compiler/testData/cli/jvm/mixingArgfilesAndUsualArgs.out @@ -1,8 +1,95 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/apiVersion.kt:11:20: error: the feature "function types with big arity" is only available since API version 1.3 -fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { - ^ -compiler/testData/cli/jvm/apiVersion.kt:12:9: error: the feature "function types with big arity" is only available since API version 1.3 - bar(::foo) +warning: API version 1.3 is deprecated and its support will be removed in a future version of Kotlin +compiler/testData/cli/jvm/apiVersion.kt:4:5: warning: parameter 'p00' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:13: warning: parameter 'p01' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:21: warning: parameter 'p02' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:29: warning: parameter 'p03' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:37: warning: parameter 'p04' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:45: warning: parameter 'p05' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:53: warning: parameter 'p06' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:61: warning: parameter 'p07' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:69: warning: parameter 'p08' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:4:77: warning: parameter 'p09' is never used + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:5: warning: parameter 'p10' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:13: warning: parameter 'p11' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:21: warning: parameter 'p12' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:29: warning: parameter 'p13' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:37: warning: parameter 'p14' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:45: warning: parameter 'p15' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:53: warning: parameter 'p16' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:61: warning: parameter 'p17' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:69: warning: parameter 'p18' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:5:77: warning: parameter 'p19' is never used + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:5: warning: parameter 'p20' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:13: warning: parameter 'p21' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:21: warning: parameter 'p22' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:29: warning: parameter 'p23' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:37: warning: parameter 'p24' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:45: warning: parameter 'p25' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:53: warning: parameter 'p26' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:61: warning: parameter 'p27' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:69: warning: parameter 'p28' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:6:77: warning: parameter 'p29' is never used + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A + ^ +compiler/testData/cli/jvm/apiVersion.kt:9:9: warning: parameter 'x' is never used +fun bar(x: Any) {} ^ -COMPILATION_ERROR +OK diff --git a/compiler/testData/cli/jvm/progressiveModeOff.args b/compiler/testData/cli/jvm/progressiveModeOff.args index 1145a2f7d56..e7f51194cac 100644 --- a/compiler/testData/cli/jvm/progressiveModeOff.args +++ b/compiler/testData/cli/jvm/progressiveModeOff.args @@ -2,4 +2,4 @@ $TESTDATA_DIR$/progressive -d $TEMP_DIR$ -language-version -1.3 +1.4 diff --git a/compiler/testData/cli/jvm/progressiveModeOff.out b/compiler/testData/cli/jvm/progressiveModeOff.out index 9c4d8e5a9bf..e02fa0abd5a 100644 --- a/compiler/testData/cli/jvm/progressiveModeOff.out +++ b/compiler/testData/cli/jvm/progressiveModeOff.out @@ -1,13 +1,7 @@ -compiler/testData/cli/jvm/progressive/tailrecOnVirtualMember.kt:2:5: warning: a function is marked as tail-recursive but no tail calls are found +compiler/testData/cli/jvm/progressive/tailrecOnVirtualMember.kt:2:5: error: tailrec is not allowed on open members tailrec open fun foo(x: Int) {} ^ -compiler/testData/cli/jvm/progressive/tailrecOnVirtualMember.kt:2:5: warning: tailrec on open members is deprecated - tailrec open fun foo(x: Int) {} - ^ -compiler/testData/cli/jvm/progressive/typeParametersInAnonymousObjects.kt:2:9: warning: variable 'x' is never used - val x = object { } - ^ -compiler/testData/cli/jvm/progressive/typeParametersInAnonymousObjects.kt:2:19: warning: type parameters for anonymous objects are deprecated +compiler/testData/cli/jvm/progressive/typeParametersInAnonymousObjects.kt:2:19: error: type parameters are not allowed for objects val x = object { } ^ -OK +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.args b/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.args deleted file mode 100644 index 9b2dc7ccd3c..00000000000 --- a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.args +++ /dev/null @@ -1,7 +0,0 @@ -$TESTDATA_DIR$/releaseCoroutinesApiVersion1.2.kt --d -$TEMP_DIR$ --language-version -1.3 --api-version -1.2 diff --git a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt b/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt deleted file mode 100644 index e875afbff05..00000000000 --- a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt +++ /dev/null @@ -1,13 +0,0 @@ -suspend fun dummy() {} - -val c: suspend () -> Unit = {} - -fun builder(c: suspend () -> Unit) {} - -val d = suspend {} - -suspend fun check() { - dummy() - c() - builder {} -} \ No newline at end of file diff --git a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.out b/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.out deleted file mode 100644 index a11a4f5a54e..00000000000 --- a/compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.out +++ /dev/null @@ -1,20 +0,0 @@ -warning: API version 1.2 is deprecated and its support will be removed in a future version of Kotlin -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:1:1: error: unsupported [cannot use release coroutines with api version less than 1.3] -suspend fun dummy() {} -^ -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:3:8: error: unsupported [cannot use release coroutines with api version less than 1.3] -val c: suspend () -> Unit = {} - ^ -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:5:16: error: unsupported [cannot use release coroutines with api version less than 1.3] -fun builder(c: suspend () -> Unit) {} - ^ -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:7:9: error: unsupported [cannot use release coroutines with api version less than 1.3] -val d = suspend {} - ^ -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:9:1: error: unsupported [cannot use release coroutines with api version less than 1.3] -suspend fun check() { -^ -compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.kt:12:5: error: unsupported [cannot use release coroutines with api version less than 1.3] - builder {} - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/sanitized-name.clash.out b/compiler/testData/cli/jvm/sanitized-name.clash.out index b1693fb0fa8..593928b006b 100644 --- a/compiler/testData/cli/jvm/sanitized-name.clash.out +++ b/compiler/testData/cli/jvm/sanitized-name.clash.out @@ -1,7 +1,7 @@ -compiler/testData/cli/jvm/sanitized-name.clash.kt:1:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment, Sanitized_name_clashKt +compiler/testData/cli/jvm/sanitized-name.clash.kt:1:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: Sanitized_name_clashKt, Sanitized_name_clashKt class SanitizedNameClash ^ -compiler/testData/cli/jvm/sanitized-name.clash.kt:3:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: package-fragment, Sanitized_name_clashKt +compiler/testData/cli/jvm/sanitized-name.clash.kt:3:1: error: duplicate JVM class name 'Sanitized_name_clashKt' generated from: Sanitized_name_clashKt, Sanitized_name_clashKt class Sanitized_name_clashKt ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/signatureClash.out b/compiler/testData/cli/jvm/signatureClash.out index 387b231a4f6..d0c97239c33 100644 --- a/compiler/testData/cli/jvm/signatureClash.out +++ b/compiler/testData/cli/jvm/signatureClash.out @@ -14,33 +14,28 @@ compiler/testData/cli/jvm/signatureClash.kt:9:5: error: platform declaration cla val a: Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:12:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): Int defined in root package in file signatureClash.kt - fun getB(): Int defined in root package in file signatureClash.kt + fun (): Int defined in root package + fun getB(): Int defined in root package fun getB(): Int = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:13:1: error: platform declaration clash: The following declarations have the same JVM signature (getB()I): - fun (): Int defined in root package in file signatureClash.kt - fun getB(): Int defined in root package in file signatureClash.kt + fun (): Int defined in root package + fun getB(): Int defined in root package val b: Int = 1 ^ -compiler/testData/cli/jvm/signatureClash.kt:19:7: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I): +compiler/testData/cli/jvm/signatureClash.kt:20:5: error: accidental override: The following declarations have the same JVM signature (getTr()I): fun (): Int defined in SubTr - fun getTr(): Int defined in Tr -class SubTr : Tr { - ^ -compiler/testData/cli/jvm/signatureClash.kt:20:5: error: platform declaration clash: The following declarations have the same JVM signature (getTr()I): - fun (): Int defined in SubTr - fun getTr(): Int defined in Tr + fun getTr(): Int defined in SubTr val tr = 1 ^ compiler/testData/cli/jvm/signatureClash.kt:24:7: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): + fun `access$f`(`$this`: C): Unit defined in C fun `access$f`(c: C): Unit defined in C - fun f(): Unit defined in C class C { ^ compiler/testData/cli/jvm/signatureClash.kt:26:5: error: platform declaration clash: The following declarations have the same JVM signature (access$f(LC;)V): + fun `access$f`(`$this`: C): Unit defined in C fun `access$f`(c: C): Unit defined in C - fun f(): Unit defined in C fun `access$f`(c: C) {} ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args deleted file mode 100644 index bead449c30c..00000000000 --- a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args +++ /dev/null @@ -1,5 +0,0 @@ -$TESTDATA_DIR$/standaloneSamConversionsAreEnabledWithNewInference.kt --d -$TEMP_DIR$ --Xnew-inference --XXLanguage\:-SamConversionPerArgument diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out b/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out deleted file mode 100644 index 8f5a386bea2..00000000000 --- a/compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.out +++ /dev/null @@ -1,16 +0,0 @@ -warning: ATTENTION! -This build uses unsafe internal compiler arguments: - --XXLanguage:-SamConversionPerArgument - -This mode is not recommended for production use, -as no stability/compatibility guarantees are given on -compiler or generated code. Use it at your own risk! - -compiler/testData/cli/jvm/standaloneSamConversionsAreEnabledWithNewInference.kt:9:25: error: type mismatch: inferred type is () -> Unit but Runnable was expected - ForceSam.compare(r, {}) - ^ -compiler/testData/cli/jvm/standaloneSamConversionsAreEnabledWithNewInference.kt:10:22: error: type mismatch: inferred type is () -> Unit but Runnable was expected - ForceSam.compare({}, r) - ^ -COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.out b/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.out index 421a361ef02..86f7ce9c672 100644 --- a/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.out +++ b/compiler/testData/cli/jvm/standaloneSamConversionsBaseline_1_3.out @@ -1,3 +1,4 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/standaloneSamConversionsAreEnabledWithNewInference.kt:9:25: error: type mismatch: inferred type is () -> Unit but Runnable was expected ForceSam.compare(r, {}) ^ diff --git a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out index 2bc224f9635..a060e2b4509 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.out @@ -1,71 +1,41 @@ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int defined in A - fun `access$getFoo$p`(a: A): Int defined in A -class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit defined in A - fun `access$setFoo$p`(a: A, d: Int): Unit defined in A -class A { - ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): - fun (): Int defined in A.Companion + fun `access$getFoo$cp`(): Int defined in A fun `access$getFoo$cp`(): Int defined in A class A { ^ +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): + fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A +class A { + ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): - fun (: Int): Unit defined in A.Companion + fun `access$setFoo$cp`(``: Int): Unit defined in A fun `access$setFoo$cp`(d: Int): Unit defined in A class A { ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I): - fun (): Int defined in A - fun `access$getBar$lp`(a: A): Int defined in A +compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): + fun `access$getFoo$p`(`$this`: A): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int defined in A + fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A fun `access$getFoo$p`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit defined in A + fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int) {} ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:9:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$cp()I): - fun (): Int defined in A.Companion + fun `access$getFoo$cp`(): Int defined in A fun `access$getFoo$cp`(): Int defined in A fun `access$getFoo$cp`(): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:10:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$cp(I)V): - fun (: Int): Unit defined in A.Companion + fun `access$setFoo$cp`(``: Int): Unit defined in A fun `access$setFoo$cp`(d: Int): Unit defined in A fun `access$setFoo$cp`(d: Int) {} ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:16:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getBar$lp(LA;)I): - fun (): Int defined in A - fun `access$getBar$lp`(a: A): Int defined in A - fun `access$getBar$lp`(a: A): Int = 7 - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I): - fun (): Int defined in A.Companion - fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion - companion object { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:18:15: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V): - fun (: Int): Unit defined in A.Companion - fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion - companion object { - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:30:9: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA$Companion;)I): - fun (): Int defined in A.Companion - fun `access$getFoo$p`(p: A.Companion): Int defined in A.Companion - fun `access$getFoo$p`(p: A.Companion): Int = 1 - ^ -compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.kt:31:9: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA$Companion;I)V): - fun (: Int): Unit defined in A.Companion - fun `access$setFoo$p`(p: A.Companion, d: Int): Unit defined in A.Companion - fun `access$setFoo$p`(p: A.Companion, d: Int) {} - ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out index b482184957d..1b132b195d9 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.out @@ -1,41 +1,41 @@ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int defined in A - fun `access$getFoo$p`(a: A): Int defined in A -class A { - ^ -compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit defined in A - fun `access$setFoo$p`(a: A, d: Int): Unit defined in A -class A { - ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): + fun `access$getFoo`(`$this`: A): Int defined in A fun `access$getFoo`(a: A): Int defined in A - fun getFoo(): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): + fun `access$setFoo`(`$this`: A, i: Int): Unit defined in A fun `access$setFoo`(a: A, d: Int): Unit defined in A - fun setFoo(i: Int): Unit defined in A +class A { + ^ +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): + fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A + fun `access$setFoo$p`(a: A, d: Int): Unit defined in A +class A { + ^ +compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:1:7: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): + fun `access$getFoo$p`(`$this`: A): Int defined in A + fun `access$getFoo$p`(a: A): Int defined in A class A { ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:5:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo$p(LA;)I): - fun (): Int defined in A + fun `access$getFoo$p`(`$this`: A): Int defined in A fun `access$getFoo$p`(a: A): Int defined in A fun `access$getFoo$p`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:6:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo$p(LA;I)V): - fun (: Int): Unit defined in A + fun `access$setFoo$p`(`$this`: A, ``: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int): Unit defined in A fun `access$setFoo$p`(a: A, d: Int) {} ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:11:5: error: platform declaration clash: The following declarations have the same JVM signature (access$getFoo(LA;)I): + fun `access$getFoo`(`$this`: A): Int defined in A fun `access$getFoo`(a: A): Int defined in A - fun getFoo(): Int defined in A fun `access$getFoo`(a: A): Int = 1 ^ compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.kt:12:5: error: platform declaration clash: The following declarations have the same JVM signature (access$setFoo(LA;I)V): + fun `access$setFoo`(`$this`: A, i: Int): Unit defined in A fun `access$setFoo`(a: A, d: Int): Unit defined in A - fun setFoo(i: Int): Unit defined in A fun `access$setFoo`(a: A, d: Int) {} ^ -COMPILATION_ERROR \ No newline at end of file +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out index fd5abfa1ea4..c0adaf24f8b 100644 --- a/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out +++ b/compiler/testData/cli/jvm/syntheticAccessorSignatureClash.out @@ -1,31 +1,31 @@ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:15:5: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V): +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$foo(LDerived;)V): fun `access$foo`(d: Derived): Unit defined in Derived - fun foo(): Unit defined in Derived - private fun foo() {} - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:18:9: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I): - fun (): Int defined in Derived - fun `access$getBar$p`(d: Derived): Int defined in Derived - get - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:19:9: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V): - fun (: Int): Unit defined in Derived - fun `access$setBar$p`(d: Derived, i: Int): Unit defined in Derived - set - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:21:5: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I): - fun (): Int defined in Derived - fun `access$getBaz$p`(d: Derived): Int defined in Derived - private var baz = 1 - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:23:5: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I): - fun (): Int defined in Derived + fun `access$foo`(`$this`: Derived): Unit defined in Derived +class Derived : Base() { + ^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBoo$p(LDerived;)I): fun `access$getBoo$p`(d: Derived): Int defined in Derived - private val boo = 1 - ^ -compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:27:9: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V): - fun (: Int): Unit defined in Derived + fun `access$getBoo$p`(`$this`: Derived): Int defined in Derived +class Derived : Base() { + ^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$setBar$p(LDerived;I)V): + fun `access$setBar$p`(d: Derived, i: Int): Unit defined in Derived + fun `access$setBar$p`(`$this`: Derived, ``: Int): Unit defined in Derived +class Derived : Base() { + ^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBar$p(LDerived;)I): + fun `access$getBar$p`(d: Derived): Int defined in Derived + fun `access$getBar$p`(`$this`: Derived): Int defined in Derived +class Derived : Base() { + ^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$setBar1$p(LDerived;I)V): fun `access$setBar1$p`(d: Derived, i: Int): Unit defined in Derived - set - ^ -COMPILATION_ERROR \ No newline at end of file + fun `access$setBar1$p`(`$this`: Derived, ``: Int): Unit defined in Derived +class Derived : Base() { + ^ +compiler/testData/cli/jvm/syntheticAccessorSignatureClash.kt:14:7: error: accidental override: The following declarations have the same JVM signature (access$getBaz$p(LDerived;)I): + fun `access$getBaz$p`(d: Derived): Int defined in Derived + fun `access$getBaz$p`(`$this`: Derived): Int defined in Derived +class Derived : Base() { + ^ +COMPILATION_ERROR diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out index d86bac9de59..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImport.out @@ -1 +1,2 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out index d86bac9de59..ae74f0da431 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutExplicitImportCommandLine.out @@ -1 +1,2 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out index 05f0afb2c5d..a239b5a8eb5 100644 --- a/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out +++ b/compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.out @@ -1,3 +1,4 @@ +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin compiler/testData/cli/jvm/useDeclarationThatWasExperimentalWithoutMarker.kt:1:13: error: this declaration is experimental and its usage must be marked with '@kotlin.ExperimentalStdlibApi' or '@OptIn(kotlin.ExperimentalStdlibApi::class)' fun test(s: ArrayDeque): ArrayDeque? { ^ diff --git a/compiler/testData/cli/jvm/variableInWhenSubject.args b/compiler/testData/cli/jvm/variableInWhenSubject.args index ca111f84f4e..822c33b4864 100644 --- a/compiler/testData/cli/jvm/variableInWhenSubject.args +++ b/compiler/testData/cli/jvm/variableInWhenSubject.args @@ -2,5 +2,5 @@ $TESTDATA_DIR$/variableInWhenSubject.kt -d $TEMP_DIR$ -language-version -1.2 --XXLanguage\:+VariableDeclarationInWhenSubject \ No newline at end of file +1.3 +-XXLanguage\:+VariableDeclarationInWhenSubject diff --git a/compiler/testData/cli/jvm/variableInWhenSubject.out b/compiler/testData/cli/jvm/variableInWhenSubject.out index 4fbe65494dc..f5e17f06e11 100644 --- a/compiler/testData/cli/jvm/variableInWhenSubject.out +++ b/compiler/testData/cli/jvm/variableInWhenSubject.out @@ -7,5 +7,5 @@ This mode is not recommended for production use, as no stability/compatibility guarantees are given on compiler or generated code. Use it at your own risk! -warning: language version 1.2 is deprecated and its support will be removed in a future version of Kotlin +warning: language version 1.3 is deprecated and its support will be removed in a future version of Kotlin OK diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java index 2d4fefc58f1..2585ea7c5cf 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -32,11 +32,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/abiStabilityIncorrectValue.args"); } - @TestMetadata("abiStabilityUnstableWithOldBackend.args") - public void testAbiStabilityUnstableWithOldBackend() throws Exception { - runTest("compiler/testData/cli/jvm/abiStabilityUnstableWithOldBackend.args"); - } - public void testAllFilesPresentInJvm() throws Exception { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), null, false); } @@ -576,11 +571,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/kotlinPackage.args"); } - @TestMetadata("kt19628_12.args") - public void testKt19628_12() throws Exception { - runTest("compiler/testData/cli/jvm/kt19628_12.args"); - } - @TestMetadata("kt19628_13.args") public void testKt19628_13() throws Exception { runTest("compiler/testData/cli/jvm/kt19628_13.args"); @@ -706,11 +696,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/progressiveModeOn.args"); } - @TestMetadata("releaseCoroutinesApiVersion1.2.args") - public void testReleaseCoroutinesApiVersion1_2() throws Exception { - runTest("compiler/testData/cli/jvm/releaseCoroutinesApiVersion1.2.args"); - } - @TestMetadata("resultInReturnTypeUnsupportedByDefault14.args") public void testResultInReturnTypeUnsupportedByDefault14() throws Exception { runTest("compiler/testData/cli/jvm/resultInReturnTypeUnsupportedByDefault14.args"); @@ -751,11 +736,6 @@ public class CliTestGenerated extends AbstractCliTest { runTest("compiler/testData/cli/jvm/singleJavaFileRoots.args"); } - @TestMetadata("standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args") - public void testStandaloneSamConversionsAreDisabledExplicitlyWithNewInference() throws Exception { - runTest("compiler/testData/cli/jvm/standaloneSamConversionsAreDisabledExplicitlyWithNewInference.args"); - } - @TestMetadata("standaloneSamConversionsAreEnabledWithNewInference.args") public void testStandaloneSamConversionsAreEnabledWithNewInference() throws Exception { runTest("compiler/testData/cli/jvm/standaloneSamConversionsAreEnabledWithNewInference.args");