diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt index 17edd49d31e..c9949138352 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt @@ -99,6 +99,13 @@ class SimpleKotlinGradleIT : BaseGradleIT() { assertContains("This type is sealed") } } + @Test + fun testJvmTarget() { + Project("jvmTarget", "1.6").build("build") { + assertFailed() + assertContains("Unknown JVM target version: 1.7") + } + } @Test fun testGradleSubplugin() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle new file mode 100644 index 00000000000..b216eab4d41 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/build.gradle @@ -0,0 +1,40 @@ +buildscript { + repositories { + mavenCentral() + maven { + url 'file://' + pathToKotlinPlugin + } + } + dependencies { + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.1-SNAPSHOT' + } +} + +apply plugin: "kotlin" + +sourceSets { + main { + kotlin { + srcDir 'src' + } + } +} + +repositories { + maven { + url 'file://' + pathToKotlinPlugin + } + mavenCentral() +} + +dependencies { + compile 'org.jetbrains.kotlin:kotlin-stdlib:1.1-SNAPSHOT' +} + +compileKotlin { + kotlinOptions.jvmTarget = "1.7" +} + +task wrapper(type: Wrapper) { + gradleVersion = "1.4" +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/src/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/src/helloWorld.kt new file mode 100644 index 00000000000..c7f98b9d8c0 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/jvmTarget/src/helloWorld.kt @@ -0,0 +1,3 @@ +interface A { + fun foo(): Int = 1 +} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/invoker.properties b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/invoker.properties new file mode 100644 index 00000000000..c21e972fc6b --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/invoker.properties @@ -0,0 +1 @@ +invoker.buildResult = failure diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml new file mode 100644 index 00000000000..ef1138a71c4 --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + org.jetbrains.kotlin + test-jvmTarget + 1.0-SNAPSHOT + + + + junit + junit + 4.9 + + + org.jetbrains.kotlin + kotlin-runtime + ${kotlin.version} + + + + + 1.4 + + + + ${project.basedir}/src/main/kotlin + + + kotlin-maven-plugin + org.jetbrains.kotlin + ${kotlin.version} + + + compile + process-sources + + compile + + + + + + + + diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/src/main/kotlin/main.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/src/main/kotlin/main.kt new file mode 100644 index 00000000000..c7f98b9d8c0 --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/src/main/kotlin/main.kt @@ -0,0 +1,3 @@ +interface A { + fun foo(): Int = 1 +} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/verify.bsh b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/verify.bsh new file mode 100644 index 00000000000..55dc15c3dad --- /dev/null +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-jvmTarget/verify.bsh @@ -0,0 +1,4 @@ +source(new File(basedir, "../../../verify-common.bsh").getAbsolutePath()); + +assertBuildLogHasLine("[INFO] BUILD FAILURE"); +assertBuildLogHasLineThatContains("Unknown JVM target version: 1.4");