From 09a5faae791b2784bf7d3f1cab82bf289f61cdf9 Mon Sep 17 00:00:00 2001 From: Valera Zakharov Date: Thu, 23 Jan 2025 11:23:41 -0800 Subject: [PATCH 1/3] Add orchestrator dep when androidTest is enabled --- .../main/kotlin/foundry/gradle/StandardProjectConfigurations.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt index 9f0a8c050..c38026ad0 100644 --- a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt +++ b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt @@ -510,6 +510,7 @@ internal class StandardProjectConfigurations( .getOrElse(false) val isAndroidTestEnabled = variant is HasAndroidTest && variant.androidTest != null if (isAndroidTestEnabled) { + dependencies.add("androidTestUtil", libs.androidx.testing.orchestrator) if (!excluded && isAffectedProject) { // Aggregate test apks. In Fladle we aggregate test APKs, in emulator.wtf we aggregate // to their root project dep From f7206bb070c98bbb323ea077fc2ec15e0acad93f Mon Sep 17 00:00:00 2001 From: Valera Zakharov Date: Thu, 23 Jan 2025 11:32:12 -0800 Subject: [PATCH 2/3] Update StandardProjectConfigurations.kt --- .../main/kotlin/foundry/gradle/StandardProjectConfigurations.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt index c38026ad0..ff0aafa2c 100644 --- a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt +++ b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt @@ -510,7 +510,7 @@ internal class StandardProjectConfigurations( .getOrElse(false) val isAndroidTestEnabled = variant is HasAndroidTest && variant.androidTest != null if (isAndroidTestEnabled) { - dependencies.add("androidTestUtil", libs.androidx.testing.orchestrator) + dependencies.add("androidTestUtil", "androidx.test:orchestrator") if (!excluded && isAffectedProject) { // Aggregate test apks. In Fladle we aggregate test APKs, in emulator.wtf we aggregate // to their root project dep From b37cf0e59505b96d9af3e18041d09260c7b8f858 Mon Sep 17 00:00:00 2001 From: Valera Zakharov Date: Thu, 23 Jan 2025 14:10:39 -0800 Subject: [PATCH 3/3] add gate for useOrchestrator property --- .../kotlin/foundry/gradle/StandardProjectConfigurations.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt index ff0aafa2c..d85eb0830 100644 --- a/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt +++ b/platforms/gradle/foundry-gradle-plugin/src/main/kotlin/foundry/gradle/StandardProjectConfigurations.kt @@ -510,7 +510,9 @@ internal class StandardProjectConfigurations( .getOrElse(false) val isAndroidTestEnabled = variant is HasAndroidTest && variant.androidTest != null if (isAndroidTestEnabled) { - dependencies.add("androidTestUtil", "androidx.test:orchestrator") + if (foundryProperties.useOrchestrator.getOrElse(false)) { + dependencies.add("androidTestUtil", "androidx.test:orchestrator") + } if (!excluded && isAffectedProject) { // Aggregate test apks. In Fladle we aggregate test APKs, in emulator.wtf we aggregate // to their root project dep