[MPP][Tests] Use max supported Gradle version for MPP old-dsl tests
This commit is contained in:
committed by
Space Team
parent
5618ee84f8
commit
816efc2def
+2
@@ -15,6 +15,8 @@ import kotlin.test.assertTrue
|
|||||||
|
|
||||||
@RunWith(Parameterized::class)
|
@RunWith(Parameterized::class)
|
||||||
internal class HierarchicalStructureOptInMigrationArtifactContentMppIT : BaseGradleIT() {
|
internal class HierarchicalStructureOptInMigrationArtifactContentMppIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
enum class Mode {
|
enum class Mode {
|
||||||
HMPP_BY_DEFAULT, OPT_OUT_HMPP, DISABLE_HMPP_BY_DEFAULT
|
HMPP_BY_DEFAULT, OPT_OUT_HMPP, DISABLE_HMPP_BY_DEFAULT
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -16,6 +16,8 @@ import kotlin.test.assertFalse
|
|||||||
import kotlin.test.assertTrue
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
open class KlibBasedMppIT : BaseGradleIT() {
|
open class KlibBasedMppIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private const val MODULE_GROUP = "com.example"
|
private const val MODULE_GROUP = "com.example"
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -11,6 +11,8 @@ import kotlin.test.Ignore
|
|||||||
import kotlin.test.assertTrue
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
class KpmCompilerPluginMppIT : BaseGradleIT() {
|
class KpmCompilerPluginMppIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
@Ignore
|
||||||
fun testTransientPluginOptions() = with(transformProjectWithPluginsDsl("kpmTransientPluginOptions")) {
|
fun testTransientPluginOptions() = with(transformProjectWithPluginsDsl("kpmTransientPluginOptions")) {
|
||||||
|
|||||||
+1
@@ -24,6 +24,7 @@ import org.junit.Test
|
|||||||
* - dependency-mode=repository: In this case p2 will rely on a previously published version of p1
|
* - dependency-mode=repository: In this case p2 will rely on a previously published version of p1
|
||||||
*/
|
*/
|
||||||
abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
|
abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
|
override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
|
||||||
copy(
|
copy(
|
||||||
|
|||||||
+1
@@ -16,6 +16,7 @@ import java.util.*
|
|||||||
|
|
||||||
@RunWith(Parameterized::class)
|
@RunWith(Parameterized::class)
|
||||||
class MppHighlightingTestDataWithGradleIT : BaseGradleIT() {
|
class MppHighlightingTestDataWithGradleIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun runTestK2NativeCli() = doTest(CliCompiler.NATIVE)
|
fun runTestK2NativeCli() = doTest(CliCompiler.NATIVE)
|
||||||
|
|||||||
+3
-1
@@ -37,6 +37,7 @@ import kotlin.test.assertTrue
|
|||||||
|
|
||||||
@TestDataPath("\$CONTENT_ROOT/resources")
|
@TestDataPath("\$CONTENT_ROOT/resources")
|
||||||
class MultiplatformGradleIT : BaseGradleIT() {
|
class MultiplatformGradleIT : BaseGradleIT() {
|
||||||
|
override val defaultGradleVersion: GradleVersionRequired = GradleVersionRequired.FOR_MPP_SUPPORT
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testMultiplatformCompile() {
|
fun testMultiplatformCompile() {
|
||||||
@@ -350,7 +351,8 @@ class MultiplatformGradleIT : BaseGradleIT() {
|
|||||||
@Test
|
@Test
|
||||||
fun testKtKt35942InternalsFromMainInTestViaTransitiveDepsAndroid() = with(
|
fun testKtKt35942InternalsFromMainInTestViaTransitiveDepsAndroid() = with(
|
||||||
Project(
|
Project(
|
||||||
projectName = "kt-35942-android"
|
projectName = "kt-35942-android",
|
||||||
|
gradleVersionRequirement = GradleVersionRequired.AtLeast(TestVersions.Gradle.G_7_0)
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
|
val currentGradleVersion = chooseWrapperVersionOrFinishTest()
|
||||||
|
|||||||
Reference in New Issue
Block a user