Skip to content

Commit dae1b9a

Browse files
stephencelisacosmicflamingombrandonw
authored
Leverage UIKitNavigation (#3180)
* wip * wip * wip * Update * Remove duplicate UIAlertAction convenience initializers (#3188) * wip * wip * wip * fixes * wip * Add nav stack helper * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * watch fix --------- Co-authored-by: Cosmic Flamingo <[email protected]> Co-authored-by: Brandon Williams <[email protected]>
1 parent b5c2a3d commit dae1b9a

File tree

29 files changed

+679
-771
lines changed

29 files changed

+679
-771
lines changed

‎.github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved

+24-24
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/pointfreeco/combine-schedulers",
77
"state" : {
8-
"revision" : "487a4d151e795a5e076a7e7aedcd13c2ebff6c31",
9-
"version" : "1.0.1"
8+
"revision" : "9fa31f4403da54855f1e2aeaeff478f4f0e40b13",
9+
"version" : "1.0.2"
1010
}
1111
},
1212
{
@@ -32,17 +32,17 @@
3232
"kind" : "remoteSourceControl",
3333
"location" : "https://github.com/pointfreeco/swift-case-paths",
3434
"state" : {
35-
"revision" : "031704ba0634b45e02fe875b8ddddc7f30a07f49",
36-
"version" : "1.5.3"
35+
"revision" : "71344dd930fde41e8f3adafe260adcbb2fc2a3dc",
36+
"version" : "1.5.4"
3737
}
3838
},
3939
{
4040
"identity" : "swift-clocks",
4141
"kind" : "remoteSourceControl",
4242
"location" : "https://github.com/pointfreeco/swift-clocks",
4343
"state" : {
44-
"revision" : "eb64eacfed55635a771e3410f9c91de46cf5c6a0",
45-
"version" : "1.0.3"
44+
"revision" : "3581e280bf0d90c3fb9236fb23e75a5d8c46b533",
45+
"version" : "1.0.4"
4646
}
4747
},
4848
{
@@ -68,17 +68,17 @@
6868
"kind" : "remoteSourceControl",
6969
"location" : "https://github.com/pointfreeco/swift-custom-dump",
7070
"state" : {
71-
"revision" : "d237304f42af07f22563aa4cc2d7e2cfb25da82e",
72-
"version" : "1.3.1"
71+
"revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
72+
"version" : "1.3.3"
7373
}
7474
},
7575
{
7676
"identity" : "swift-dependencies",
7777
"kind" : "remoteSourceControl",
7878
"location" : "https://github.com/pointfreeco/swift-dependencies",
7979
"state" : {
80-
"revision" : "52018827ce21e482a36e3795bea2666b3898164c",
81-
"version" : "1.3.4"
80+
"revision" : "d7472be6b3c89251ce4c0db07d32405b43426781",
81+
"version" : "1.3.7"
8282
}
8383
},
8484
{
@@ -109,30 +109,30 @@
109109
}
110110
},
111111
{
112-
"identity" : "swift-issue-reporting",
112+
"identity" : "swift-macro-testing",
113113
"kind" : "remoteSourceControl",
114-
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
114+
"location" : "https://github.com/pointfreeco/swift-macro-testing",
115115
"state" : {
116-
"revision" : "357ca1e5dd31f613a1d43320870ebc219386a495",
117-
"version" : "1.2.2"
116+
"revision" : "a35257b7e9ce44e92636447003a8eeefb77b145c",
117+
"version" : "0.5.1"
118118
}
119119
},
120120
{
121-
"identity" : "swift-macro-testing",
121+
"identity" : "swift-navigation",
122122
"kind" : "remoteSourceControl",
123-
"location" : "https://github.com/pointfreeco/swift-macro-testing",
123+
"location" : "https://github.com/pointfreeco/swift-navigation",
124124
"state" : {
125-
"revision" : "a35257b7e9ce44e92636447003a8eeefb77b145c",
126-
"version" : "0.5.1"
125+
"revision" : "47cfd149ed01223d14fc8e3f52ae27d3a35fe036",
126+
"version" : "2.0.3"
127127
}
128128
},
129129
{
130130
"identity" : "swift-perception",
131131
"kind" : "remoteSourceControl",
132132
"location" : "https://github.com/pointfreeco/swift-perception",
133133
"state" : {
134-
"revision" : "2c75ce556a6fc106721b0dadc2c7327244ad3999",
135-
"version" : "1.3.3"
134+
"revision" : "1552c8f722ac256cc0b8daaf1a7073217d4fcdfb",
135+
"version" : "1.3.4"
136136
}
137137
},
138138
{
@@ -154,12 +154,12 @@
154154
}
155155
},
156156
{
157-
"identity" : "swiftui-navigation",
157+
"identity" : "xctest-dynamic-overlay",
158158
"kind" : "remoteSourceControl",
159-
"location" : "https://github.com/pointfreeco/swiftui-navigation",
159+
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
160160
"state" : {
161-
"revision" : "97f854044356ac082e7e698f39264cc035544d77",
162-
"version" : "1.5.2"
161+
"revision" : "357ca1e5dd31f613a1d43320870ebc219386a495",
162+
"version" : "1.2.2"
163163
}
164164
}
165165
],

‎ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

+9-9
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,15 @@
117117
"version" : "0.5.2"
118118
}
119119
},
120+
{
121+
"identity" : "swift-navigation",
122+
"kind" : "remoteSourceControl",
123+
"location" : "https://github.com/pointfreeco/swift-navigation",
124+
"state" : {
125+
"revision" : "47cfd149ed01223d14fc8e3f52ae27d3a35fe036",
126+
"version" : "2.0.3"
127+
}
128+
},
120129
{
121130
"identity" : "swift-perception",
122131
"kind" : "remoteSourceControl",
@@ -153,15 +162,6 @@
153162
"version" : "0.10.0"
154163
}
155164
},
156-
{
157-
"identity" : "swiftui-navigation",
158-
"kind" : "remoteSourceControl",
159-
"location" : "https://github.com/pointfreeco/swiftui-navigation",
160-
"state" : {
161-
"revision" : "fc91d591ebba1f90d65028ccb65c861e5979e898",
162-
"version" : "1.5.4"
163-
}
164-
},
165165
{
166166
"identity" : "xctest-dynamic-overlay",
167167
"kind" : "remoteSourceControl",

‎Examples/Integration/Integration.xcodeproj/project.pbxproj

-17
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
CAF5802329A564590042FB62 /* TestCases.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAF57FFC29A564210042FB62 /* TestCases.framework */; };
5454
CAF5802529A5651D0042FB62 /* LegacyPresentationTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802429A5651D0042FB62 /* LegacyPresentationTestCase.swift */; };
5555
CAF5802729A567BB0042FB62 /* LegacyPresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802629A567BB0042FB62 /* LegacyPresentationTests.swift */; };
56-
CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CAF8595729BF8882008721D4 /* SwiftUINavigation */; };
5756
DC140CC529E0BB2C006DF553 /* SwitchStoreTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC140CC429E0BB2C006DF553 /* SwitchStoreTestCase.swift */; };
5857
DC140CC729E0E8F3006DF553 /* SwitchStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC140CC629E0E8F3006DF553 /* SwitchStoreTests.swift */; };
5958
DC6268502AD1C85E00F2E2EF /* InlineSnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = DC62684F2AD1C85E00F2E2EF /* InlineSnapshotTesting */; };
@@ -198,7 +197,6 @@
198197
files = (
199198
CAF5801C29A564440042FB62 /* TestCases.framework in Frameworks */,
200199
CA595278296DF67E00B5B695 /* ComposableArchitecture in Frameworks */,
201-
CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */,
202200
);
203201
runOnlyForDeploymentPostprocessing = 0;
204202
};
@@ -449,7 +447,6 @@
449447
name = Integration;
450448
packageProductDependencies = (
451449
CA595277296DF67E00B5B695 /* ComposableArchitecture */,
452-
CAF8595729BF8882008721D4 /* SwiftUINavigation */,
453450
);
454451
productName = Integration;
455452
productReference = CAA1CAF1296DEE78000665B1 /* Integration.app */;
@@ -531,7 +528,6 @@
531528
);
532529
mainGroup = CAA1CAE8296DEE78000665B1;
533530
packageReferences = (
534-
CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */,
535531
DC6268512AD1E06300F2E2EF /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
536532
);
537533
productRefGroup = CAA1CAF2296DEE78000665B1 /* Products */;
@@ -998,14 +994,6 @@
998994
/* End XCConfigurationList section */
999995

1000996
/* Begin XCRemoteSwiftPackageReference section */
1001-
CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */ = {
1002-
isa = XCRemoteSwiftPackageReference;
1003-
repositoryURL = "https://github.com/pointfreeco/swiftui-navigation.git";
1004-
requirement = {
1005-
kind = upToNextMajorVersion;
1006-
minimumVersion = 1.5.2;
1007-
};
1008-
};
1009997
DC6268512AD1E06300F2E2EF /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
1010998
isa = XCRemoteSwiftPackageReference;
1011999
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
@@ -1025,11 +1013,6 @@
10251013
isa = XCSwiftPackageProductDependency;
10261014
productName = ComposableArchitecture;
10271015
};
1028-
CAF8595729BF8882008721D4 /* SwiftUINavigation */ = {
1029-
isa = XCSwiftPackageProductDependency;
1030-
package = CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */;
1031-
productName = SwiftUINavigation;
1032-
};
10331016
DC62684F2AD1C85E00F2E2EF /* InlineSnapshotTesting */ = {
10341017
isa = XCSwiftPackageProductDependency;
10351018
productName = InlineSnapshotTesting;

‎Examples/SyncUps/SyncUps.xcodeproj/project.pbxproj

-17
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
CA14FF052B361C7400104A70 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CA14FF042B361C7400104A70 /* SwiftUINavigation */; };
1110
DC7CE4E729E9E6E4006B6263 /* ding.wav in Resources */ = {isa = PBXBuildFile; fileRef = DC7CE4E629E9E6E4006B6263 /* ding.wav */; };
1211
DC808D7329E9C3AC0072B4A9 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC808D7229E9C3AC0072B4A9 /* App.swift */; };
1312
DC808D7729E9C3AD0072B4A9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC808D7629E9C3AD0072B4A9 /* Assets.xcassets */; };
@@ -80,7 +79,6 @@
8079
files = (
8180
DC808DB629E9C58F0072B4A9 /* Tagged in Frameworks */,
8281
DC808DA329E9C4490072B4A9 /* ComposableArchitecture in Frameworks */,
83-
CA14FF052B361C7400104A70 /* SwiftUINavigation in Frameworks */,
8482
);
8583
runOnlyForDeploymentPostprocessing = 0;
8684
};
@@ -205,7 +203,6 @@
205203
packageProductDependencies = (
206204
DC808DA229E9C4490072B4A9 /* ComposableArchitecture */,
207205
DC808DB529E9C58F0072B4A9 /* Tagged */,
208-
CA14FF042B361C7400104A70 /* SwiftUINavigation */,
209206
);
210207
productName = SyncUps;
211208
productReference = DC808D6F29E9C3AC0072B4A9 /* SyncUps.app */;
@@ -281,7 +278,6 @@
281278
mainGroup = DC808D6629E9C3AC0072B4A9;
282279
packageReferences = (
283280
DC808DB429E9C58F0072B4A9 /* XCRemoteSwiftPackageReference "swift-tagged" */,
284-
CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */,
285281
);
286282
productRefGroup = DC808D7029E9C3AC0072B4A9 /* Products */;
287283
projectDirPath = "";
@@ -664,14 +660,6 @@
664660
/* End XCConfigurationList section */
665661

666662
/* Begin XCRemoteSwiftPackageReference section */
667-
CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */ = {
668-
isa = XCRemoteSwiftPackageReference;
669-
repositoryURL = "https://github.com/pointfreeco/swiftui-navigation.git";
670-
requirement = {
671-
kind = upToNextMajorVersion;
672-
minimumVersion = 1.5.2;
673-
};
674-
};
675663
DC808DB429E9C58F0072B4A9 /* XCRemoteSwiftPackageReference "swift-tagged" */ = {
676664
isa = XCRemoteSwiftPackageReference;
677665
repositoryURL = "https://github.com/pointfreeco/swift-tagged.git";
@@ -683,11 +671,6 @@
683671
/* End XCRemoteSwiftPackageReference section */
684672

685673
/* Begin XCSwiftPackageProductDependency section */
686-
CA14FF042B361C7400104A70 /* SwiftUINavigation */ = {
687-
isa = XCSwiftPackageProductDependency;
688-
package = CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */;
689-
productName = SwiftUINavigation;
690-
};
691674
DC808DA229E9C4490072B4A9 /* ComposableArchitecture */ = {
692675
isa = XCSwiftPackageProductDependency;
693676
productName = ComposableArchitecture;

0 commit comments

Comments
 (0)