From 785ab617b6a7e4f0579d7ad0059bff7788c593b6 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Tue, 26 Oct 2021 11:03:02 +0300 Subject: [PATCH] Fix compiling and running Gradle tests (#1312) * Tests stopped compiling after preview RPC was embedded, because compileOnly dependencies are not visible to tests; * Local test runs were broken, because the default compose.version (1.0.0-alpha4-build328) is not compatible with Kotlin 1.5.31 (compose.version is always overridden on CI, so CI runs work); --- gradle-plugins/compose/build.gradle.kts | 1 + gradle-plugins/gradle.properties | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts index ed5101f375..3350930d39 100644 --- a/gradle-plugins/compose/build.gradle.kts +++ b/gradle-plugins/compose/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { // Use `embedded` helper to include a dependency. fun embedded(dep: Any) { compileOnly(dep) + testCompileOnly(dep) embeddedDependencies(dep) } diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties index cafcd12b99..e2ddf72b5e 100644 --- a/gradle-plugins/gradle.properties +++ b/gradle-plugins/gradle.properties @@ -6,7 +6,7 @@ kotlin.code.style=official # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var. # # __LATEST_COMPOSE_RELEASE_VERSION__ -compose.version=1.0.0-alpha4-build328 +compose.version=1.0.0-beta1 compose.with.web=false # A version of Gradle plugin, that will be published,