wip

pointfreeco · Sep 11, 2024 · a99246e · a99246e
1 parent 229b8cd
commit a99246e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme b/ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1600"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -28,24 +28,30 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Examples/ComposableArchitecture.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ComposableArchitectureTests"
-               BuildableName = "ComposableArchitectureTests"
-               BlueprintName = "ComposableArchitectureTests"
+               BlueprintIdentifier = "ComposableArchitectureMacrosTests"
+               BuildableName = "ComposableArchitectureMacrosTests"
+               BlueprintName = "ComposableArchitectureMacrosTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "ComposableArchitectureMacrosTests"
-               BuildableName = "ComposableArchitectureMacrosTests"
-               BlueprintName = "ComposableArchitectureMacrosTests"
+               BlueprintIdentifier = "ComposableArchitectureTests"
+               BuildableName = "ComposableArchitectureTests"
+               BlueprintName = "ComposableArchitectureTests"
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>

diff --git a/Makefile b/Makefile
@@ -13,11 +13,11 @@ TEST_RUNNER_CI = $(CI)
 XCODEBUILD = xcodebuild $(COMMAND) \
 			-skipMacroValidation \
 			-quiet \
-			-configuration $(CONFIG) \
-			-scheme $(SCHEME) \
+			-configuration "$(CONFIG)" \
+			-scheme "$(SCHEME)" \
 			-workspace ComposableArchitecture.xcworkspace \
 			-derivedDataPath ~/.derivedData/$(CONFIG) \
-			-testPlan $(TEST_PLAN)
+			-testPlan "$(TEST_PLAN)"
 
 default: test-all