From 49d5c8ae37e7443503d3865dd8d0da87a1b68cd9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 29 Oct 2018 15:57:28 +0300 Subject: [PATCH] Run model tests with Gradle 4.0+ --- .../kotlin/org/jetbrains/kotlin/gradle/model/AllOpenModelIT.kt | 3 +++ .../kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt | 3 +++ .../jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt | 3 +++ .../org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt | 3 +++ .../kotlin/org/jetbrains/kotlin/gradle/model/NoArgModelIT.kt | 3 +++ .../jetbrains/kotlin/gradle/model/SamWithReceiverModelIT.kt | 3 +++ 6 files changed, 18 insertions(+) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/AllOpenModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/AllOpenModelIT.kt index 88eef06827f..6a62b927871 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/AllOpenModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/AllOpenModelIT.kt @@ -6,12 +6,15 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue class AllOpenModelIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.0") @Test fun testAllOpenSimple() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt index 2a7c6deee16..0fb6e922f5c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KaptModelIT.kt @@ -6,12 +6,15 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue class KaptModelIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.0") @Test fun testKaptSimple() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt index a0bdd623817..6e3eaa86430 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.jetbrains.kotlin.test.KotlinTestUtils import org.junit.Test import kotlin.test.assertEquals @@ -14,6 +15,8 @@ import kotlin.test.assertNull import kotlin.test.assertTrue class KotlinAndroidExtensionIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.1") override fun defaultBuildOptions(): BuildOptions { return super.defaultBuildOptions().copy( diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index 683fcc4eb9d..f95f480f59c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -6,12 +6,15 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.assertTrue class KotlinProjectIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.0") @Test fun testKotlinProject() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/NoArgModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/NoArgModelIT.kt index 94b47b6ab25..c353a0af10a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/NoArgModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/NoArgModelIT.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFalse @@ -13,6 +14,8 @@ import kotlin.test.assertNull import kotlin.test.assertTrue class NoArgModelIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.0") @Test fun testNoArgKt18668() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiverModelIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiverModelIT.kt index b1c200cd35f..6010b0437fc 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiverModelIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/SamWithReceiverModelIT.kt @@ -6,12 +6,15 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT +import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertNull import kotlin.test.assertTrue class SamWithReceiverModelIT : BaseGradleIT() { + override val defaultGradleVersion: GradleVersionRequired + get() = GradleVersionRequired.AtLeast("4.0") @Test fun testSamWithReceiverSimple() {