Skip to content

Commit ec3287e

Browse files
committedMay 20, 2024·
more wrangling to try this...
1 parent 40051c6 commit ec3287e

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed
 

‎.github/workflows/iostest.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ jobs:
5252
- name: Show available destinations
5353
run: xcodebuild -scheme SwiftUI-Notes -showdestinations
5454

55-
- name: Run the Combine test suite
55+
- name: Run the Combine test suite (macOS)
56+
run: |
57+
xcodebuild -scheme SwiftUI-Notes test
58+
59+
- name: Run the Combine test suite (iOS)
5660
run: |
5761
xcodebuild -scheme SwiftUI-Notes \
5862
-configuration Debug \

‎SwiftUI-Notes.xcodeproj/project.pbxproj

+5-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -476,27 +476,25 @@
476476
1AC8C76D22B1BED80064C1AE /* Project object */ = {
477477
isa = PBXProject;
478478
attributes = {
479+
BuildIndependentTargetsInParallel = YES;
479480
LastSwiftUpdateCheck = 1100;
480-
LastUpgradeCheck = 1210;
481+
LastUpgradeCheck = 1540;
481482
ORGANIZATIONNAME = "SwiftUI-Notes";
482483
TargetAttributes = {
483484
1A6006DD22D267F10030A471 = {
484485
CreatedOnToolsVersion = 11.0;
485486
};
486487
1A6006F222D267F30030A471 = {
487488
CreatedOnToolsVersion = 11.0;
488-
TestTargetID = 1A6006DD22D267F10030A471;
489489
};
490490
1AC8C77422B1BED80064C1AE = {
491491
CreatedOnToolsVersion = 11.0;
492492
};
493493
1AC8C78A22B1BED90064C1AE = {
494494
CreatedOnToolsVersion = 11.0;
495-
TestTargetID = 1AC8C77422B1BED80064C1AE;
496495
};
497496
1AEA9C2322CD5FE7006709F1 = {
498497
CreatedOnToolsVersion = 11.0;
499-
TestTargetID = 1AC8C77422B1BED80064C1AE;
500498
};
501499
};
502500
};
@@ -753,7 +751,6 @@
753751
isa = XCBuildConfiguration;
754752
buildSettings = {
755753
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
756-
BUNDLE_LOADER = "$(TEST_HOST)";
757754
CODE_SIGN_STYLE = Automatic;
758755
DEVELOPMENT_TEAM = BDV4VC27D3;
759756
INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -766,15 +763,13 @@
766763
PRODUCT_NAME = "$(TARGET_NAME)";
767764
SWIFT_VERSION = 5.0;
768765
TARGETED_DEVICE_FAMILY = "1,2";
769-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
770766
};
771767
name = Debug;
772768
};
773769
1A6006FD22D267F30030A471 /* Release */ = {
774770
isa = XCBuildConfiguration;
775771
buildSettings = {
776772
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
777-
BUNDLE_LOADER = "$(TEST_HOST)";
778773
CODE_SIGN_STYLE = Automatic;
779774
DEVELOPMENT_TEAM = BDV4VC27D3;
780775
INFOPLIST_FILE = "UIKit-CombineTests/Info.plist";
@@ -787,7 +782,6 @@
787782
PRODUCT_NAME = "$(TARGET_NAME)";
788783
SWIFT_VERSION = 5.0;
789784
TARGETED_DEVICE_FAMILY = "1,2";
790-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UIKit-Combine.app/UIKit-Combine";
791785
};
792786
name = Release;
793787
};
@@ -828,6 +822,7 @@
828822
DEBUG_INFORMATION_FORMAT = dwarf;
829823
ENABLE_STRICT_OBJC_MSGSEND = YES;
830824
ENABLE_TESTABILITY = YES;
825+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
831826
GCC_C_LANGUAGE_STANDARD = gnu11;
832827
GCC_DYNAMIC_NO_PIC = NO;
833828
GCC_NO_COMMON_BLOCKS = YES;
@@ -889,6 +884,7 @@
889884
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
890885
ENABLE_NS_ASSERTIONS = NO;
891886
ENABLE_STRICT_OBJC_MSGSEND = YES;
887+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
892888
GCC_C_LANGUAGE_STANDARD = gnu11;
893889
GCC_NO_COMMON_BLOCKS = YES;
894890
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -955,7 +951,6 @@
955951
isa = XCBuildConfiguration;
956952
buildSettings = {
957953
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
958-
BUNDLE_LOADER = "$(TEST_HOST)";
959954
CODE_SIGN_STYLE = Automatic;
960955
DEVELOPMENT_TEAM = BDV4VC27D3;
961956
INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -968,15 +963,13 @@
968963
PRODUCT_NAME = "$(TARGET_NAME)";
969964
SWIFT_VERSION = 5.0;
970965
TARGETED_DEVICE_FAMILY = "1,2";
971-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
972966
};
973967
name = Debug;
974968
};
975969
1AC8C79922B1BED90064C1AE /* Release */ = {
976970
isa = XCBuildConfiguration;
977971
buildSettings = {
978972
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
979-
BUNDLE_LOADER = "$(TEST_HOST)";
980973
CODE_SIGN_STYLE = Automatic;
981974
DEVELOPMENT_TEAM = BDV4VC27D3;
982975
INFOPLIST_FILE = "SwiftUI-NotesTests/Info.plist";
@@ -989,14 +982,12 @@
989982
PRODUCT_NAME = "$(TARGET_NAME)";
990983
SWIFT_VERSION = 5.0;
991984
TARGETED_DEVICE_FAMILY = "1,2";
992-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
993985
};
994986
name = Release;
995987
};
996988
1AEA9C2B22CD5FE7006709F1 /* Debug */ = {
997989
isa = XCBuildConfiguration;
998990
buildSettings = {
999-
BUNDLE_LOADER = "$(TEST_HOST)";
1000991
CODE_SIGN_STYLE = Automatic;
1001992
DEVELOPMENT_TEAM = BDV4VC27D3;
1002993
INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1009,14 +1000,12 @@
10091000
PRODUCT_NAME = "$(TARGET_NAME)";
10101001
SWIFT_VERSION = 5.0;
10111002
TARGETED_DEVICE_FAMILY = "1,2";
1012-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
10131003
};
10141004
name = Debug;
10151005
};
10161006
1AEA9C2C22CD5FE7006709F1 /* Release */ = {
10171007
isa = XCBuildConfiguration;
10181008
buildSettings = {
1019-
BUNDLE_LOADER = "$(TEST_HOST)";
10201009
CODE_SIGN_STYLE = Automatic;
10211010
DEVELOPMENT_TEAM = BDV4VC27D3;
10221011
INFOPLIST_FILE = UsingCombineTests/Info.plist;
@@ -1029,7 +1018,6 @@
10291018
PRODUCT_NAME = "$(TARGET_NAME)";
10301019
SWIFT_VERSION = 5.0;
10311020
TARGETED_DEVICE_FAMILY = "1,2";
1032-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftUI-Notes.app/SwiftUI-Notes";
10331021
};
10341022
name = Release;
10351023
};

‎SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/SwiftUI-Notes.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎SwiftUI-Notes.xcodeproj/xcshareddata/xcschemes/UIKit-Combine.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "1540"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)