more wrangling to try this...

heckj · May 20, 2024 · ec3287e · ec3287e
1 parent 40051c6
commit ec3287e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/iostest.yml b/.github/workflows/iostest.yml
@@ -52,7 +52,11 @@ jobs:
     - name: Show available destinations
       run: xcodebuild -scheme SwiftUI-Notes -showdestinations
 
-    - name: Run the Combine test suite
+    - name: Run the Combine test suite (macOS)
+      run: |
+        xcodebuild -scheme SwiftUI-Notes test 
+
+    - name: Run the Combine test suite (iOS)
       run: |
         xcodebuild -scheme SwiftUI-Notes \
         -configuration Debug \

diff --git a/SwiftUI-Notes.xcodeproj/project.pbxproj b/SwiftUI-Notes.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -476,27 +476,25 @@
 		1AC8C76D22B1BED80064C1AE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1100;
-				LastUpgradeCheck = 1210;
+				LastUpgradeCheck = 1540;
 				ORGANIZATIONNAME = "SwiftUI-Notes";
 				TargetAttributes = {
 					1A6006DD22D267F10030A471 = {
 						CreatedOnToolsVersion = 11.0;
 					};
 					1A6006F222D267F30030A471 = {
 						CreatedOnToolsVersion = 11.0;
-						TestTargetID = 1A6006DD22D267F10030A471;
 					};
 					1AC8C77422B1BED80064C1AE = {
 						CreatedOnToolsVersion = 11.0;
 					};
 					1AC8C78A22B1BED90064C1AE = {
 						CreatedOnToolsVersion = 11.0;
-						TestTargetID = 1AC8C77422B1BED80064C1AE;
 					};
 					1AEA9C2322CD5FE7006709F1 = {
 						CreatedOnToolsVersion = 11.0;
-						TestTargetID = 1AC8C77422B1BED80064C1AE;
 					};
 				};
 			};
@@ -753,7 +751,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -766,15 +763,13 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
 			};
 			name = Debug;
 		};
 		1A6006FD22D267F30030A471 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -787,7 +782,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
 			};
 			name = Release;
 		};
@@ -828,6 +822,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -889,6 +884,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -955,7 +951,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -968,15 +963,13 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
 			};
 			name = Debug;
 		};
 		1AC8C79922B1BED90064C1AE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -989,14 +982,12 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
 			};
 			name = Release;
 		};
 		1AEA9C2B22CD5FE7006709F1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1009,14 +1000,12 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
 			};
 			name = Debug;
 		};
 		1AEA9C2C22CD5FE7006709F1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = BDV4VC27D3;
 				INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1029,7 +1018,6 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
 			};
 			name = Release;
 		};

diff --git a/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme b/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme b/SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1540"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"