From 76d17275db7825c5ea9c508a2777f162401e37c9 Mon Sep 17 00:00:00 2001
From: Martin Bonnin <martin@mbonnin.net>
Date: Tue, 8 Aug 2023 01:08:10 +0200
Subject: [PATCH] fix tests

---
 build-logic/src/main/kotlin/Mpp.kt                           | 5 +++--
 .../apollo3/buildlogic/plugin/TestConventionPlugin.kt        | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build-logic/src/main/kotlin/Mpp.kt b/build-logic/src/main/kotlin/Mpp.kt
index da8af40d582..6883ecd307a 100644
--- a/build-logic/src/main/kotlin/Mpp.kt
+++ b/build-logic/src/main/kotlin/Mpp.kt
@@ -23,7 +23,7 @@ private val allAppleTargets = setOf(
 )
 
 // Try to guess the dev machine to make sure the tests are running smoothly
-private val hostTarget: String
+internal val hostTarget: String
   get() = if (System.getProperty("os.arch") == "aarch64") {
     "macosArm64"
   } else {
@@ -53,6 +53,7 @@ fun Project.configureMppTestsDefaults(
     withJs: Boolean,
     withJvm: Boolean,
     browserTest: Boolean,
+    appleTargets: Collection<String>,
 ) {
   configureMpp(
       withJvm = withJvm,
@@ -60,7 +61,7 @@ fun Project.configureMppTestsDefaults(
       browserTest = browserTest,
       withLinux = false,
       withAndroid = false,
-      appleTargets = setOf(hostTarget),
+      appleTargets = appleTargets,
   )
 }
 
diff --git a/build-logic/src/main/kotlin/com/apollographql/apollo3/buildlogic/plugin/TestConventionPlugin.kt b/build-logic/src/main/kotlin/com/apollographql/apollo3/buildlogic/plugin/TestConventionPlugin.kt
index fda3fb80541..dfc94c13990 100644
--- a/build-logic/src/main/kotlin/com/apollographql/apollo3/buildlogic/plugin/TestConventionPlugin.kt
+++ b/build-logic/src/main/kotlin/com/apollographql/apollo3/buildlogic/plugin/TestConventionPlugin.kt
@@ -4,6 +4,7 @@ import commonSetup
 import configureJavaAndKotlinCompilers
 import configureMppTestsDefaults
 import configureTesting
+import hostTarget
 import optIn
 import org.gradle.api.Action
 import org.gradle.api.Plugin
@@ -49,6 +50,7 @@ class TestConventionPlugin : Plugin<Project> {
           withJs = mppConfiguration.withJs.getOrElse(true),
           withJvm = mppConfiguration.withJvm.getOrElse(true),
           browserTest = mppConfiguration.browserTest.getOrElse(false),
+          appleTargets = mppConfiguration.appleTargets.getOrElse(setOf(hostTarget))
       )
     }
   }