From fe1faac162af92ba60db61def987ffd5b8abd5f3 Mon Sep 17 00:00:00 2001
From: Brent Simmons <brent@ranchero.com>
Date: Mon, 20 May 2024 13:45:04 -0700
Subject: [PATCH] Remove Mac.xctestplan from iOS app scheme.

---
 Mac.xctestplan                                           | 2 ++
 NetNewsWire.xcodeproj/project.pbxproj                    | 4 ++--
 .../xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme      | 9 ++-------
 .../xcshareddata/xcschemes/NetNewsWire.xcscheme          | 2 +-
 Tree/Package.swift                                       | 6 +++---
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Mac.xctestplan b/Mac.xctestplan
index af49816fb..9acf435f4 100644
--- a/Mac.xctestplan
+++ b/Mac.xctestplan
@@ -22,6 +22,7 @@
       }
     },
     {
+      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:AppKitExtras",
         "identifier" : "AppKitExtrasTests",
@@ -29,6 +30,7 @@
       }
     },
     {
+      "parallelizable" : true,
       "target" : {
         "containerPath" : "container:Parser",
         "identifier" : "ParserTests",
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index 1156edc72..d01c21ef1 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -1082,7 +1082,7 @@
 		84A699132BC34E8500605AB8 /* ArticleExtractor */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ArticleExtractor; sourceTree = "<group>"; };
 		84A699182BC3524C00605AB8 /* LocalAccount */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = LocalAccount; sourceTree = "<group>"; };
 		84A699192BC36EDB00605AB8 /* Feedly */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Feedly; sourceTree = "<group>"; };
-		84A959052BF9743F00F0D9B8 /* App.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = App.xctestplan; sourceTree = "<group>"; };
+		84A959052BF9743F00F0D9B8 /* Mac.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Mac.xctestplan; sourceTree = "<group>"; };
 		84AD1EA92031617300BC20B7 /* PasteboardFolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardFolder.swift; sourceTree = "<group>"; };
 		84AD1EB92031649C00BC20B7 /* SmartFeedPasteboardWriter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedPasteboardWriter.swift; sourceTree = "<group>"; };
 		84AD1EBB2032AF5C00BC20B7 /* SidebarOutlineDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarOutlineDataSource.swift; sourceTree = "<group>"; };
@@ -1974,7 +1974,7 @@
 			children = (
 				845B14A51FC2299E0013CF92 /* README.md */,
 				84D2200922B0BC4B0019E085 /* CONTRIBUTING.md */,
-				84A959052BF9743F00F0D9B8 /* App.xctestplan */,
+				84A959052BF9743F00F0D9B8 /* Mac.xctestplan */,
 				84CBDDAE1FD3674C005A61AA /* Technotes */,
 				84C9FC6522629B3900D921D6 /* Mac */,
 				84C9FC922262A0E600D921D6 /* iOS */,
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme
index cc5fe129c..59c6d30a5 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire-iOS.xcscheme
@@ -44,13 +44,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <TestPlans>
-         <TestPlanReference
-            reference = "container:App.xctestplan"
-            default = "YES">
-         </TestPlanReference>
-      </TestPlans>
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
index bb53e39b1..410c2b25b 100644
--- a/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
+++ b/NetNewsWire.xcodeproj/xcshareddata/xcschemes/NetNewsWire.xcscheme
@@ -47,7 +47,7 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <TestPlans>
          <TestPlanReference
-            reference = "container:App.xctestplan"
+            reference = "container:Mac.xctestplan"
             default = "YES">
          </TestPlanReference>
       </TestPlans>
diff --git a/Tree/Package.swift b/Tree/Package.swift
index 1069ba681..511b8a234 100644
--- a/Tree/Package.swift
+++ b/Tree/Package.swift
@@ -17,8 +17,8 @@ let package = Package(
 				.enableExperimentalFeature("StrictConcurrency")
 			]
 		),
-	.testTarget(
-		name: "TreeTests",
-		dependencies: ["Tree"])
+		.testTarget(
+			name: "TreeTests",
+			dependencies: ["Tree"])
 	]
 )