Skip to content

Commit 441cf53

Browse files
mbrandonwmbrandonw
committed
Merge remote-tracking branch 'origin/main' into more-init-fixes
2 parents 636276c + 595eecb commit 441cf53

36 files changed

Lines changed: 2200 additions & 733 deletions

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@ jobs:
2828
- name: Run ${{ matrix.config }} tests
2929
run: swift test -c ${{ matrix.config }}
3030

31+
examples:
32+
name: Examples
33+
strategy:
34+
matrix:
35+
xcode: ['16.3']
36+
config: ['debug']
37+
scheme: ['Reminders', 'CaseStudies', 'SyncUps']
38+
runs-on: macos-15
39+
steps:
40+
- uses: actions/checkout@v4
41+
- name: Select Xcode ${{ matrix.xcode }}
42+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
43+
- name: xcodebuild ${{ matrix.scheme }}
44+
run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="${{ matrix.scheme }}" xcodebuild-raw
45+
3146
linux:
3247
name: Linux
3348
strategy:

‎Examples/Examples.xcodeproj/project.pbxproj‎

Lines changed: 154 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
/* Begin PBXBuildFile section */
1010
CA14DBC92DA884C400E36852 /* CasePaths in Frameworks */ = {isa = PBXBuildFile; productRef = CA14DBC82DA884C400E36852 /* CasePaths */; };
1111
CA2908C92D4AF70E003F165F /* UIKitNavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CA2908C82D4AF70E003F165F /* UIKitNavigation */; };
12+
CA5E46912DEBB8570069E0F8 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CA5E46902DEBB8570069E0F8 /* SwiftUINavigation */; };
13+
CA5E47072DECEF0F0069E0F8 /* InlineSnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = CA5E47062DECEF0F0069E0F8 /* InlineSnapshotTesting */; };
14+
CA5E47092DECEFC80069E0F8 /* SnapshotTestingCustomDump in Frameworks */ = {isa = PBXBuildFile; productRef = CA5E47082DECEFC80069E0F8 /* SnapshotTestingCustomDump */; };
15+
CA5E470B2DECF0280069E0F8 /* DependenciesTestSupport in Frameworks */ = {isa = PBXBuildFile; productRef = CA5E470A2DECF0280069E0F8 /* DependenciesTestSupport */; };
1216
CAD001872D874F1F00FA977A /* DependenciesTestSupport in Frameworks */ = {isa = PBXBuildFile; productRef = CAD001862D874F1F00FA977A /* DependenciesTestSupport */; };
1317
CAFDD64A2D5E823A00EE099E /* SharingGRDB in Frameworks */ = {isa = PBXBuildFile; productRef = CAFDD6492D5E823A00EE099E /* SharingGRDB */; };
1418
DC5B73A72DEFE103004C2A16 /* SharingGRDB in Frameworks */ = {isa = PBXBuildFile; productRef = DC5B73A62DEFE103004C2A16 /* SharingGRDB */; };
@@ -20,6 +24,13 @@
2024
/* End PBXBuildFile section */
2125

2226
/* Begin PBXContainerItemProxy section */
27+
CA5E469A2DEBFE410069E0F8 /* PBXContainerItemProxy */ = {
28+
isa = PBXContainerItemProxy;
29+
containerPortal = CAF836902D4735620047AEB5 /* Project object */;
30+
proxyType = 1;
31+
remoteGlobalIDString = CAF836D72D4735AB0047AEB5;
32+
remoteInfo = Reminders;
33+
};
2334
CAD001812D874E6F00FA977A /* PBXContainerItemProxy */ = {
2435
isa = PBXContainerItemProxy;
2536
containerPortal = CAF836902D4735620047AEB5 /* Project object */;
@@ -37,6 +48,7 @@
3748
/* End PBXContainerItemProxy section */
3849

3950
/* Begin PBXFileReference section */
51+
CA5E46962DEBFE410069E0F8 /* RemindersTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RemindersTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4052
CA5F37542D5AFBBC002E1A9E /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
4153
CAD0017D2D874E6F00FA977A /* SyncUpTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncUpTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4254
CAF836982D4735620047AEB5 /* CaseStudies.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CaseStudies.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -71,6 +83,11 @@
7183
/* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
7284

7385
/* Begin PBXFileSystemSynchronizedRootGroup section */
86+
CA5E46972DEBFE410069E0F8 /* RemindersTests */ = {
87+
isa = PBXFileSystemSynchronizedRootGroup;
88+
path = RemindersTests;
89+
sourceTree = "<group>";
90+
};
7491
CAD0017E2D874E6F00FA977A /* SyncUpTests */ = {
7592
isa = PBXFileSystemSynchronizedRootGroup;
7693
path = SyncUpTests;
@@ -108,6 +125,16 @@
108125
/* End PBXFileSystemSynchronizedRootGroup section */
109126

110127
/* Begin PBXFrameworksBuildPhase section */
128+
CA5E46932DEBFE410069E0F8 /* Frameworks */ = {
129+
isa = PBXFrameworksBuildPhase;
130+
buildActionMask = 2147483647;
131+
files = (
132+
CA5E47092DECEFC80069E0F8 /* SnapshotTestingCustomDump in Frameworks */,
133+
CA5E47072DECEF0F0069E0F8 /* InlineSnapshotTesting in Frameworks */,
134+
CA5E470B2DECF0280069E0F8 /* DependenciesTestSupport in Frameworks */,
135+
);
136+
runOnlyForDeploymentPostprocessing = 0;
137+
};
111138
CAD0017A2D874E6F00FA977A /* Frameworks */ = {
112139
isa = PBXFrameworksBuildPhase;
113140
buildActionMask = 2147483647;
@@ -139,6 +166,7 @@
139166
files = (
140167
CAFDD64A2D5E823A00EE099E /* SharingGRDB in Frameworks */,
141168
CA14DBC92DA884C400E36852 /* CasePaths in Frameworks */,
169+
CA5E46912DEBB8570069E0F8 /* SwiftUINavigation in Frameworks */,
142170
);
143171
runOnlyForDeploymentPostprocessing = 0;
144172
};
@@ -163,6 +191,7 @@
163191
CAF8369A2D4735620047AEB5 /* CaseStudies */,
164192
CAF836AB2D4735640047AEB5 /* CaseStudiesTests */,
165193
CAF836D92D4735AB0047AEB5 /* Reminders */,
194+
CA5E46972DEBFE410069E0F8 /* RemindersTests */,
166195
DCBE89CD2D483FB90071F499 /* SyncUps */,
167196
CAD0017E2D874E6F00FA977A /* SyncUpTests */,
168197
CAF837022D4735C00047AEB5 /* Frameworks */,
@@ -178,6 +207,7 @@
178207
CAF836D82D4735AB0047AEB5 /* Reminders.app */,
179208
DCBE89CC2D483FB90071F499 /* SyncUps.app */,
180209
CAD0017D2D874E6F00FA977A /* SyncUpTests.xctest */,
210+
CA5E46962DEBFE410069E0F8 /* RemindersTests.xctest */,
181211
);
182212
name = Products;
183213
sourceTree = "<group>";
@@ -192,6 +222,32 @@
192222
/* End PBXGroup section */
193223

194224
/* Begin PBXNativeTarget section */
225+
CA5E46952DEBFE410069E0F8 /* RemindersTests */ = {
226+
isa = PBXNativeTarget;
227+
buildConfigurationList = CA5E469C2DEBFE420069E0F8 /* Build configuration list for PBXNativeTarget "RemindersTests" */;
228+
buildPhases = (
229+
CA5E46922DEBFE410069E0F8 /* Sources */,
230+
CA5E46932DEBFE410069E0F8 /* Frameworks */,
231+
CA5E46942DEBFE410069E0F8 /* Resources */,
232+
);
233+
buildRules = (
234+
);
235+
dependencies = (
236+
CA5E469B2DEBFE410069E0F8 /* PBXTargetDependency */,
237+
);
238+
fileSystemSynchronizedGroups = (
239+
CA5E46972DEBFE410069E0F8 /* RemindersTests */,
240+
);
241+
name = RemindersTests;
242+
packageProductDependencies = (
243+
CA5E47062DECEF0F0069E0F8 /* InlineSnapshotTesting */,
244+
CA5E47082DECEFC80069E0F8 /* SnapshotTestingCustomDump */,
245+
CA5E470A2DECF0280069E0F8 /* DependenciesTestSupport */,
246+
);
247+
productName = RemindersTests;
248+
productReference = CA5E46962DEBFE410069E0F8 /* RemindersTests.xctest */;
249+
productType = "com.apple.product-type.bundle.unit-test";
250+
};
195251
CAD0017C2D874E6F00FA977A /* SyncUpTests */ = {
196252
isa = PBXNativeTarget;
197253
buildConfigurationList = CAD001852D874E6F00FA977A /* Build configuration list for PBXNativeTarget "SyncUpTests" */;
@@ -283,6 +339,7 @@
283339
packageProductDependencies = (
284340
CAFDD6492D5E823A00EE099E /* SharingGRDB */,
285341
CA14DBC82DA884C400E36852 /* CasePaths */,
342+
CA5E46902DEBB8570069E0F8 /* SwiftUINavigation */,
286343
);
287344
productName = Reminders;
288345
productReference = CAF836D82D4735AB0047AEB5 /* Reminders.app */;
@@ -321,9 +378,13 @@
321378
isa = PBXProject;
322379
attributes = {
323380
BuildIndependentTargetsInParallel = 1;
324-
LastSwiftUpdateCheck = 1630;
381+
LastSwiftUpdateCheck = 1640;
325382
LastUpgradeCheck = 1620;
326383
TargetAttributes = {
384+
CA5E46952DEBFE410069E0F8 = {
385+
CreatedOnToolsVersion = 16.4;
386+
TestTargetID = CAF836D72D4735AB0047AEB5;
387+
};
327388
CAD0017C2D874E6F00FA977A = {
328389
CreatedOnToolsVersion = 16.3;
329390
TestTargetID = DCBE89CB2D483FB90071F499;
@@ -356,7 +417,7 @@
356417
DCBE8A122D4842BF0071F499 /* XCRemoteSwiftPackageReference "swift-case-paths" */,
357418
DCF267372D48437300B680BE /* XCRemoteSwiftPackageReference "swift-navigation" */,
358419
DC5FA7462D4C63D60082743E /* XCRemoteSwiftPackageReference "swift-dependencies" */,
359-
DC5B73A52DEFE103004C2A16 /* XCLocalSwiftPackageReference "../../sharing-grdb" */,
420+
CA5E47052DECEF0F0069E0F8 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
360421
);
361422
preferredProjectObjectVersion = 77;
362423
productRefGroup = CAF836992D4735620047AEB5 /* Products */;
@@ -366,13 +427,21 @@
366427
CAF836972D4735620047AEB5 /* CaseStudies */,
367428
CAF836A72D4735640047AEB5 /* CaseStudiesTests */,
368429
CAF836D72D4735AB0047AEB5 /* Reminders */,
430+
CA5E46952DEBFE410069E0F8 /* RemindersTests */,
369431
DCBE89CB2D483FB90071F499 /* SyncUps */,
370432
CAD0017C2D874E6F00FA977A /* SyncUpTests */,
371433
);
372434
};
373435
/* End PBXProject section */
374436

375437
/* Begin PBXResourcesBuildPhase section */
438+
CA5E46942DEBFE410069E0F8 /* Resources */ = {
439+
isa = PBXResourcesBuildPhase;
440+
buildActionMask = 2147483647;
441+
files = (
442+
);
443+
runOnlyForDeploymentPostprocessing = 0;
444+
};
376445
CAD0017B2D874E6F00FA977A /* Resources */ = {
377446
isa = PBXResourcesBuildPhase;
378447
buildActionMask = 2147483647;
@@ -411,6 +480,13 @@
411480
/* End PBXResourcesBuildPhase section */
412481

413482
/* Begin PBXSourcesBuildPhase section */
483+
CA5E46922DEBFE410069E0F8 /* Sources */ = {
484+
isa = PBXSourcesBuildPhase;
485+
buildActionMask = 2147483647;
486+
files = (
487+
);
488+
runOnlyForDeploymentPostprocessing = 0;
489+
};
414490
CAD001792D874E6F00FA977A /* Sources */ = {
415491
isa = PBXSourcesBuildPhase;
416492
buildActionMask = 2147483647;
@@ -449,6 +525,11 @@
449525
/* End PBXSourcesBuildPhase section */
450526

451527
/* Begin PBXTargetDependency section */
528+
CA5E469B2DEBFE410069E0F8 /* PBXTargetDependency */ = {
529+
isa = PBXTargetDependency;
530+
target = CAF836D72D4735AB0047AEB5 /* Reminders */;
531+
targetProxy = CA5E469A2DEBFE410069E0F8 /* PBXContainerItemProxy */;
532+
};
452533
CAD001822D874E6F00FA977A /* PBXTargetDependency */ = {
453534
isa = PBXTargetDependency;
454535
target = DCBE89CB2D483FB90071F499 /* SyncUps */;
@@ -462,14 +543,47 @@
462543
/* End PBXTargetDependency section */
463544

464545
/* Begin XCBuildConfiguration section */
546+
CA5E469D2DEBFE420069E0F8 /* Debug */ = {
547+
isa = XCBuildConfiguration;
548+
buildSettings = {
549+
BUNDLE_LOADER = "$(TEST_HOST)";
550+
CODE_SIGN_STYLE = Automatic;
551+
CURRENT_PROJECT_VERSION = 1;
552+
GENERATE_INFOPLIST_FILE = YES;
553+
MARKETING_VERSION = 1.0;
554+
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.RemindersTests;
555+
PRODUCT_NAME = "$(TARGET_NAME)";
556+
SWIFT_EMIT_LOC_STRINGS = NO;
557+
SWIFT_VERSION = 5.0;
558+
TARGETED_DEVICE_FAMILY = "1,2";
559+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Reminders.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Reminders";
560+
};
561+
name = Debug;
562+
};
563+
CA5E469E2DEBFE420069E0F8 /* Release */ = {
564+
isa = XCBuildConfiguration;
565+
buildSettings = {
566+
BUNDLE_LOADER = "$(TEST_HOST)";
567+
CODE_SIGN_STYLE = Automatic;
568+
CURRENT_PROJECT_VERSION = 1;
569+
GENERATE_INFOPLIST_FILE = YES;
570+
MARKETING_VERSION = 1.0;
571+
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.RemindersTests;
572+
PRODUCT_NAME = "$(TARGET_NAME)";
573+
SWIFT_EMIT_LOC_STRINGS = NO;
574+
SWIFT_VERSION = 5.0;
575+
TARGETED_DEVICE_FAMILY = "1,2";
576+
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Reminders.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Reminders";
577+
};
578+
name = Release;
579+
};
465580
CAD001832D874E6F00FA977A /* Debug */ = {
466581
isa = XCBuildConfiguration;
467582
buildSettings = {
468583
BUNDLE_LOADER = "$(TEST_HOST)";
469584
CODE_SIGN_STYLE = Automatic;
470585
CURRENT_PROJECT_VERSION = 1;
471586
GENERATE_INFOPLIST_FILE = YES;
472-
IPHONEOS_DEPLOYMENT_TARGET = 18.4;
473587
MARKETING_VERSION = 1.0;
474588
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.SyncUpTests;
475589
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -487,7 +601,6 @@
487601
CODE_SIGN_STYLE = Automatic;
488602
CURRENT_PROJECT_VERSION = 1;
489603
GENERATE_INFOPLIST_FILE = YES;
490-
IPHONEOS_DEPLOYMENT_TARGET = 18.4;
491604
MARKETING_VERSION = 1.0;
492605
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.SyncUpTests;
493606
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -682,7 +795,6 @@
682795
CODE_SIGN_STYLE = Automatic;
683796
CURRENT_PROJECT_VERSION = 1;
684797
GENERATE_INFOPLIST_FILE = YES;
685-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
686798
MARKETING_VERSION = 1.0;
687799
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudiesTests;
688800
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -699,7 +811,6 @@
699811
CODE_SIGN_STYLE = Automatic;
700812
CURRENT_PROJECT_VERSION = 1;
701813
GENERATE_INFOPLIST_FILE = YES;
702-
IPHONEOS_DEPLOYMENT_TARGET = 18.2;
703814
MARKETING_VERSION = 1.0;
704815
PRODUCT_BUNDLE_IDENTIFIER = co.pointfree.CaseStudiesTests;
705816
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -822,6 +933,15 @@
822933
/* End XCBuildConfiguration section */
823934

824935
/* Begin XCConfigurationList section */
936+
CA5E469C2DEBFE420069E0F8 /* Build configuration list for PBXNativeTarget "RemindersTests" */ = {
937+
isa = XCConfigurationList;
938+
buildConfigurations = (
939+
CA5E469D2DEBFE420069E0F8 /* Debug */,
940+
CA5E469E2DEBFE420069E0F8 /* Release */,
941+
);
942+
defaultConfigurationIsVisible = 0;
943+
defaultConfigurationName = Release;
944+
};
825945
CAD001852D874E6F00FA977A /* Build configuration list for PBXNativeTarget "SyncUpTests" */ = {
826946
isa = XCConfigurationList;
827947
buildConfigurations = (
@@ -886,6 +1006,14 @@
8861006
/* End XCLocalSwiftPackageReference section */
8871007

8881008
/* Begin XCRemoteSwiftPackageReference section */
1009+
CA5E47052DECEF0F0069E0F8 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
1010+
isa = XCRemoteSwiftPackageReference;
1011+
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
1012+
requirement = {
1013+
kind = upToNextMajorVersion;
1014+
minimumVersion = 1.18.4;
1015+
};
1016+
};
8891017
DC5FA7462D4C63D60082743E /* XCRemoteSwiftPackageReference "swift-dependencies" */ = {
8901018
isa = XCRemoteSwiftPackageReference;
8911019
repositoryURL = "https://github.com/pointfreeco/swift-dependencies";
@@ -923,6 +1051,26 @@
9231051
package = DCF267372D48437300B680BE /* XCRemoteSwiftPackageReference "swift-navigation" */;
9241052
productName = UIKitNavigation;
9251053
};
1054+
CA5E46902DEBB8570069E0F8 /* SwiftUINavigation */ = {
1055+
isa = XCSwiftPackageProductDependency;
1056+
package = DCF267372D48437300B680BE /* XCRemoteSwiftPackageReference "swift-navigation" */;
1057+
productName = SwiftUINavigation;
1058+
};
1059+
CA5E47062DECEF0F0069E0F8 /* InlineSnapshotTesting */ = {
1060+
isa = XCSwiftPackageProductDependency;
1061+
package = CA5E47052DECEF0F0069E0F8 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
1062+
productName = InlineSnapshotTesting;
1063+
};
1064+
CA5E47082DECEFC80069E0F8 /* SnapshotTestingCustomDump */ = {
1065+
isa = XCSwiftPackageProductDependency;
1066+
package = CA5E47052DECEF0F0069E0F8 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
1067+
productName = SnapshotTestingCustomDump;
1068+
};
1069+
CA5E470A2DECF0280069E0F8 /* DependenciesTestSupport */ = {
1070+
isa = XCSwiftPackageProductDependency;
1071+
package = DC5FA7462D4C63D60082743E /* XCRemoteSwiftPackageReference "swift-dependencies" */;
1072+
productName = DependenciesTestSupport;
1073+
};
9261074
CAD001862D874F1F00FA977A /* DependenciesTestSupport */ = {
9271075
isa = XCSwiftPackageProductDependency;
9281076
package = DC5FA7462D4C63D60082743E /* XCRemoteSwiftPackageReference "swift-dependencies" */;

‎Examples/Examples.xcodeproj/xcshareddata/xcschemes/Reminders.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
parallelizable = "YES">
3636
<BuildableReference
3737
BuildableIdentifier = "primary"
38-
BlueprintIdentifier = "CAF836E62D4735AD0047AEB5"
38+
BlueprintIdentifier = "CA5E46952DEBFE410069E0F8"
3939
BuildableName = "RemindersTests.xctest"
4040
BlueprintName = "RemindersTests"
4141
ReferencedContainer = "container:Examples.xcodeproj">

0 commit comments

Comments
 (0)