diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 41ba5189e6..4c325bf9d2 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -8,7 +8,7 @@ plugins { kotlin("multiplatform") apply false } -val COMPOSE_WEB_VERSION: String by project +val COMPOSE_WEB_VERSION: String = extra["compose.version"] as String val COMPOSE_REPO_USERNAME: String? by project val COMPOSE_REPO_KEY: String? by project val COMPOSE_WEB_BUILD_WITH_SAMPLES = project.property("compose.web.buildSamples")!!.toString().toBoolean() diff --git a/web/compose-compiler-integration/README.md b/web/compose-compiler-integration/README.md index f8d63f0094..bc0f8ad811 100644 --- a/web/compose-compiler-integration/README.md +++ b/web/compose-compiler-integration/README.md @@ -2,7 +2,7 @@ RUN from project root directory: `./gradlew :compose-compiler-integration:checkComposeCases` To use specific version: -`./gradlew :compose-compiler-integration:checkComposeCases -PCOMPOSE_CORE_VERSION=1.0.1-rc2 -PCOMPOSE_WEB_VERSION=1.0.1-rc2 +`./gradlew :compose-compiler-integration:checkComposeCases -Pcompose.version=1.2.0-beta03 To fun only filtered cases (check for contained in file path): `./gradlew :compose-compiler-integration:checkComposeCases -PFILTER_CASES=CaseName` diff --git a/web/compose-compiler-integration/build.gradle.kts b/web/compose-compiler-integration/build.gradle.kts index b770099633..8f4c88fabc 100644 --- a/web/compose-compiler-integration/build.gradle.kts +++ b/web/compose-compiler-integration/build.gradle.kts @@ -61,7 +61,7 @@ fun build( ) { val isWin = System.getProperty("os.name").startsWith("Win") val arguments = buildCmd.toMutableList().also { - it.add("-PCOMPOSE_CORE_VERSION=$composeVersion") + it.add("-Pcompose.version=$composeVersion") it.add("-Pkotlin.version=$kotlinVersion") }.toTypedArray() @@ -176,7 +176,7 @@ fun runCasesInDirectory( tasks.register("checkComposeCases") { doLast { val filterCases = project.findProperty("FILTER_CASES")?.toString() ?: "" - val composeVersion = project.findProperty("COMPOSE_CORE_VERSION")?.toString() ?: "0.0.0-SNASPHOT" + val composeVersion = project.findProperty("compose.version")?.toString() ?: "0.0.0-SNASPHOT" val kotlinVersion = kotlin.coreLibrariesVersion val expectedFailingCasesDir = File("${projectDir.absolutePath}/testcases/failing") diff --git a/web/compose-compiler-integration/main-template/settings.gradle.kts b/web/compose-compiler-integration/main-template/settings.gradle.kts index fcfdf8f809..c554a78781 100644 --- a/web/compose-compiler-integration/main-template/settings.gradle.kts +++ b/web/compose-compiler-integration/main-template/settings.gradle.kts @@ -12,8 +12,8 @@ pluginManagement { println("KotlinVersion=[$kotlinVersion]") eachPlugin { if (requested.id.id == "org.jetbrains.compose") { - val useVersion = if (extra.has("COMPOSE_CORE_VERSION")) { - extra["COMPOSE_CORE_VERSION"].toString() + val useVersion = if (extra.has("compose.version")) { + extra["compose.version"].toString() } else { "0.0.0-SNASPHOT" } diff --git a/web/gradle.properties b/web/gradle.properties index 18004c5d53..1838132f93 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -1,5 +1,4 @@ -COMPOSE_CORE_VERSION=1.1.0 -COMPOSE_WEB_VERSION=1.1.0 +compose.version=1.1.0 compose.web.buildSamples=false compose.web.tests.integration.withFirefox compose.web.tests.skip.benchmarks=false diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index 6059e52a65..ad4c210e79 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -1,5 +1,5 @@ pluginManagement { - val COMPOSE_CORE_VERSION: String by settings + val COMPOSE_CORE_VERSION = extra["compose.version"] as String println("[build] compose core version: $COMPOSE_CORE_VERSION") // pluginManagement section won't see outer scope, hence the FQ names