Merge branch 'master' into samples_against_master

web/gradle.properties

@@ -3,3 +3,4 @@ COMPOSE_CORE_VERSION=0.0.0-master-build316
 COMPOSE_WEB_VERSION=1.0.0-alpha1
 compose.web.buildSamples=false
 compose.web.tests.integration.withFirefox
+compose.web.tests.skip.benchmarks=false

web/settings.gradle.kts

@@ -38,9 +38,14 @@ module(":web-core", "core")
 module(":web-widgets", "widgets")
 module(":web-integration-core", "integration-core")
 module(":web-integration-widgets", "integration-widgets")
-module(":web-benchmark-core", "benchmark-core")
 module(":compose-compiler-integration", "compose-compiler-integration")
 
+if (extra["compose.web.tests.skip.benchmarks"]!!.toString().toBoolean() != true) {
+    module(":web-benchmark-core", "benchmark-core")
+} else {
+    println("skipping benchmarks")
+}
+
 if (extra["compose.web.buildSamples"]!!.toString().toBoolean() == true) {
     println("building with examples")
     module(":examples:falling-balls-web", "../examples/falling-balls-web")