From ab3ac73f834592546d18c5d6d036bdfe425614fe Mon Sep 17 00:00:00 2001 From: Shagen Ogandzhanian Date: Tue, 27 Jul 2021 14:14:29 +0200 Subject: [PATCH] Build all web examples with -Pcompose.web.buildSamples=true --- web/build.gradle.kts | 4 ++-- web/gradle.properties | 1 + web/settings.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 9b2fdc9bc2..cc11c9b1fc 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -1,7 +1,7 @@ val COMPOSE_WEB_VERSION: String by project val COMPOSE_REPO_USERNAME: String? by project val COMPOSE_REPO_KEY: String? by project -val COMPOSE_WEB_BUILD_WITH_EXAMPLES = project.property("COMPOSE_WEB_BUILD_WITH_EXAMPLES")!!.toString()?.toBoolean() +val COMPOSE_WEB_BUILD_WITH_SAMPLES = project.property("compose.web.buildSamples")!!.toString().toBoolean() apply() @@ -26,7 +26,7 @@ subprojects { } } - if (COMPOSE_WEB_BUILD_WITH_EXAMPLES) { + if (COMPOSE_WEB_BUILD_WITH_SAMPLES) { println("substituting published artifacts with projects ones in project $name") configurations.all { resolutionStrategy.dependencySubstitution { diff --git a/web/gradle.properties b/web/gradle.properties index 1896d50b69..027c19c867 100644 --- a/web/gradle.properties +++ b/web/gradle.properties @@ -2,4 +2,5 @@ COMPOSE_CORE_VERSION=0.5.0-build262 COMPOSE_WEB_VERSION=0.5.0-build262 COMPOSE_WEB_BUILD_WITH_EXAMPLES=false +compose.web.buildSamples=false compose.web.tests.integration.withFirefox diff --git a/web/settings.gradle.kts b/web/settings.gradle.kts index e738011871..72460b2de7 100644 --- a/web/settings.gradle.kts +++ b/web/settings.gradle.kts @@ -35,7 +35,7 @@ module(":web-integration-widgets", "$rootDir/integration-widgets") module(":web-benchmark-core", "$rootDir/benchmark-core") module(":compose-compiler-integration", "$rootDir/compose-compiler-integration") -if (extra["COMPOSE_WEB_BUILD_WITH_EXAMPLES"]!!.toString().toBoolean() == true) { +if (extra["compose.web.buildSamples"]!!.toString().toBoolean() == true) { println("building with examples") module(":examples:falling_balls_with_web", "../examples/falling_balls_with_web") module(":examples:compose-web-lp", "../examples/web_landing")