From 42d19b380105233c02c7cc4014a6335afe09ac64 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Thu, 28 Oct 2021 21:49:22 +0300 Subject: [PATCH] Disable Android build if redirecting to Jetpack Compose is enabled (#1322) --- compose/build.gradle.kts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 73a8ab1fcf..e93bcb6817 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -1,6 +1,7 @@ val composeBuild = gradle.includedBuild("support") fun Task.dependsOnComposeTask(name: String) = dependsOn(composeBuild.task(name)) +val isOelPublication = project.findProperty("oel.publication") == "true" val isWebExist = composeBuild.projectDir.resolve(".jbWebExistsMarker").exists() // To show all projects which use `xxx` task, run: @@ -42,8 +43,11 @@ tasks.register("publishComposeJb") { ).forEach { dependsOnComposeTask("$it:publishKotlinMultiplatformPublicationToMavenRepository") dependsOnComposeTask("$it:publishDesktopPublicationToMavenRepository") - dependsOnComposeTask("$it:publishAndroidDebugPublicationToMavenRepository") - dependsOnComposeTask("$it:publishAndroidReleasePublicationToMavenRepository") + + if (!isOelPublication) { + dependsOnComposeTask("$it:publishAndroidDebugPublicationToMavenRepository") + dependsOnComposeTask("$it:publishAndroidReleasePublicationToMavenRepository") + } } if (isWebExist) { @@ -63,8 +67,11 @@ tasks.register("publishComposeJbExtendedIcons") { ).forEach { dependsOnComposeTask("$it:publishKotlinMultiplatformPublicationToMavenRepository") dependsOnComposeTask("$it:publishDesktopPublicationToMavenRepository") - dependsOnComposeTask("$it:publishAndroidDebugPublicationToMavenRepository") - dependsOnComposeTask("$it:publishAndroidReleasePublicationToMavenRepository") + + if (!isOelPublication) { + dependsOnComposeTask("$it:publishAndroidDebugPublicationToMavenRepository") + dependsOnComposeTask("$it:publishAndroidReleasePublicationToMavenRepository") + } } } @@ -99,7 +106,7 @@ tasks.register("testRuntimeNative") { } tasks.register("testComposeModules") { // used in https://github.com/JetBrains/androidx/tree/jb-main/.github/workflows - // TODO: donwload robolectrict to run ui:ui:test + // TODO: download robolectrict to run ui:ui:test // dependsOnComposeTask(":compose:ui:ui:test") dependsOnComposeTask(":compose:ui:ui-graphics:test")