From 3819b2ce59bf17416dce5abdee5fd31acab712e8 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Fri, 31 Jan 2020 16:52:41 +0300 Subject: [PATCH] Change unsupported 1.0 version in maven plugin tests KT-36146 --- .../src/it/test-apiVersion/pom.xml | 2 +- .../it/test-apiVersion/src/main/kotlin/main.kt | 16 +++++++++++++--- .../src/it/test-apiVersion/verify.bsh | 2 +- .../src/it/test-languageVersion/pom.xml | 2 +- .../test-languageVersion/src/main/kotlin/main.kt | 14 +++++++------- .../src/it/test-languageVersion/verify.bsh | 3 +-- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/pom.xml index c9f308adce1..0e73ad97ca5 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/pom.xml @@ -22,7 +22,7 @@ - 1.0 + 1.2 diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/src/main/kotlin/main.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/src/main/kotlin/main.kt index b894766ebde..c2b3f9c5b1d 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/src/main/kotlin/main.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/src/main/kotlin/main.kt @@ -1,4 +1,14 @@ -fun useApiFrom11() { - mapOf().toMutableMap() -} +class A +fun foo( + p00: A, p01: A, p02: A, p03: A, p04: A, p05: A, p06: A, p07: A, p08: A, p09: A, + p10: A, p11: A, p12: A, p13: A, p14: A, p15: A, p16: A, p17: A, p18: A, p19: A, + p20: A, p21: A, p22: A, p23: A, p24: A, p25: A, p26: A, p27: A, p28: A, p29: A +) {} + +fun bar(x: Any) {} + +fun test(vararg x: Function30<*, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, *, Unit>) { + bar(::foo) + bar(x) +} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/verify.bsh index 8959db27a9d..192c8ff5002 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-apiVersion/verify.bsh @@ -1,4 +1,4 @@ source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] BUILD FAILURE"); -assertBuildLogHasLineThatContains("Unresolved reference: toMutableMap"); +assertBuildLogHasLineThatContains("feature \"function types with big arity\" is only available since API version 1.3"); diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml index 5baec33d41a..07907e24c57 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/pom.xml @@ -22,7 +22,7 @@ - 1.0 + 1.3 diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/src/main/kotlin/main.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/src/main/kotlin/main.kt index 6a0652d0885..1793bf43ac4 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/src/main/kotlin/main.kt +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/src/main/kotlin/main.kt @@ -1,7 +1,7 @@ -sealed class Base - -class Derived : Base() - -fun useApiFrom11() { - mapOf().toMutableMap() -} \ No newline at end of file +fun breakInWhenFrom14() { + while (true) { + when { + true -> break + } + } +} diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/verify.bsh index dcca2c06e44..bc9f0893ab5 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/verify.bsh +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-languageVersion/verify.bsh @@ -1,5 +1,4 @@ source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); assertBuildLogHasLine("[INFO] BUILD FAILURE"); -assertBuildLogHasLineThatContains("This type is sealed"); -assertBuildLogHasLineThatContains("Unresolved reference: toMutableMap"); +assertBuildLogHasLineThatContains("'break' and 'continue' are not allowed in 'when' statements");