From 4479b79a8b6dc1838823024f6bea1c67c1335b02 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Nov 2022 20:28:12 +0100 Subject: [PATCH] Update tested Gradle versions --- gradle-plugins/compose/build.gradle.kts | 8 +++----- gradle-plugins/gradle.properties | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index 0bc5c7f91a..b8d2a9d831 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -89,11 +89,9 @@ val jar = tasks.named("jar") { this.duplicatesStrategy = DuplicatesStrategy.INCLUDE } -// __SUPPORTED_GRADLE_VERSIONS__ -//testGradleVersion("6.7.1") // min supported by kotlin 1.7.0 gradle plugin https://kotlinlang.org/docs/gradle.html -// despite that, some tests didn't pass -testGradleVersion("7.1.1") -testGradleVersion("7.3.3") +project.property("compose.tests.gradle.versions") + .toString().split(",") + .forEach { testGradleVersion(it.trim()) } val javaHomeForTests: String? = when { // __COMPOSE_NATIVE_DISTRIBUTIONS_MIN_JAVA_VERSION__ diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index 53f2223ab6..a2dd1eba9a 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -14,6 +14,8 @@ compose.tests.js.compiler.compatible.kotlin.version=1.7.20 # https://developer.android.com/jetpack/androidx/releases/compose-kotlin compose.tests.androidx.compiler.version=1.1.1 compose.tests.androidx.compiler.compatible.kotlin.version=1.6.10 +# __SUPPORTED_GRADLE_VERSIONS__ +compose.tests.gradle.versions=7.0.2, 7.5.1 # A version of Gradle plugin, that will be published, # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.