fix tests

apollographql · Aug 7, 2023 · 76d1727 · 76d1727
1 parent 0c4879e
commit 76d1727
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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,14 +53,15 @@ fun Project.configureMppTestsDefaults(
     withJs: Boolean,
     withJvm: Boolean,
     browserTest: Boolean,
+    appleTargets: Collection<String>,
 ) {
   configureMpp(
       withJvm = withJvm,
       withJs = withJs,
       browserTest = browserTest,
       withLinux = false,
       withAndroid = false,
-      appleTargets = setOf(hostTarget),
+      appleTargets = appleTargets,
   )
 }
 

diff --git a/...logic/src/main/kotlin/com/apollographql/apollo3/buildlogic/plugin/TestConventionPlugin.kt b/...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))
       )
     }
   }