Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Leverage UIKitNavigation #3180

Merged
merged 28 commits into from
Aug 13, 2024
Merged

Leverage UIKitNavigation #3180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
0f1308f
wip
stephencelis May 24, 2024
4555be9
wip
stephencelis May 24, 2024
8b0560b
wip
stephencelis May 24, 2024
e5bb335
Merge remote-tracking branch 'origin/main' into tic-tac-toe-updates
stephencelis Jun 18, 2024
35556a6
Update
stephencelis Jun 18, 2024
f7a0c5e
Remove duplicate UIAlertAction convenience initializers (#3188)
acosmicflamingo Jun 19, 2024
62ca359
Merge branch 'main' into uikit-navigation
stephencelis Jun 19, 2024
80f14b6
Merge remote-tracking branch 'origin/main' into uikit-navigation
mbrandonw Jul 29, 2024
b22d604
wip
mbrandonw Jul 29, 2024
d22410c
wip
mbrandonw Aug 1, 2024
1d0dfad
wip
mbrandonw Aug 1, 2024
9de4895
Merge remote-tracking branch 'origin/main' into uikit-navigation
stephencelis Aug 6, 2024
0f29a83
fixes
stephencelis Aug 6, 2024
92172b7
wip
stephencelis Aug 11, 2024
ec28ca9
Merge remote-tracking branch 'origin/main' into uikit-navigation
stephencelis Aug 12, 2024
da33843
Add nav stack helper
stephencelis Aug 12, 2024
6eb7da2
wip
stephencelis Aug 12, 2024
e25dfe9
wip
stephencelis Aug 12, 2024
616bae4
wip
stephencelis Aug 12, 2024
9513334
wip
stephencelis Aug 12, 2024
20fab7b
wip
stephencelis Aug 12, 2024
232e3e7
wip
stephencelis Aug 12, 2024
95b0057
wip
mbrandonw Aug 13, 2024
b6df4da
wip
mbrandonw Aug 13, 2024
c8e29ad
wip
mbrandonw Aug 13, 2024
f1ca168
wip
mbrandonw Aug 13, 2024
95624f7
wip
mbrandonw Aug 13, 2024
21749bb
watch fix
mbrandonw Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions .github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/combine-schedulers",
"state" : {
"revision" : "487a4d151e795a5e076a7e7aedcd13c2ebff6c31",
"version" : "1.0.1"
"revision" : "9fa31f4403da54855f1e2aeaeff478f4f0e40b13",
"version" : "1.0.2"
}
},
{
Expand All @@ -32,17 +32,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-case-paths",
"state" : {
"revision" : "031704ba0634b45e02fe875b8ddddc7f30a07f49",
"version" : "1.5.3"
"revision" : "71344dd930fde41e8f3adafe260adcbb2fc2a3dc",
"version" : "1.5.4"
}
},
{
"identity" : "swift-clocks",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-clocks",
"state" : {
"revision" : "eb64eacfed55635a771e3410f9c91de46cf5c6a0",
"version" : "1.0.3"
"revision" : "3581e280bf0d90c3fb9236fb23e75a5d8c46b533",
"version" : "1.0.4"
}
},
{
Expand All @@ -68,17 +68,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-custom-dump",
"state" : {
"revision" : "d237304f42af07f22563aa4cc2d7e2cfb25da82e",
"version" : "1.3.1"
"revision" : "82645ec760917961cfa08c9c0c7104a57a0fa4b1",
"version" : "1.3.3"
}
},
{
"identity" : "swift-dependencies",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-dependencies",
"state" : {
"revision" : "52018827ce21e482a36e3795bea2666b3898164c",
"version" : "1.3.4"
"revision" : "d7472be6b3c89251ce4c0db07d32405b43426781",
"version" : "1.3.7"
}
},
{
Expand Down Expand Up @@ -109,30 +109,30 @@
}
},
{
"identity" : "swift-issue-reporting",
"identity" : "swift-macro-testing",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-issue-reporting",
"location" : "https://github.com/pointfreeco/swift-macro-testing",
"state" : {
"revision" : "357ca1e5dd31f613a1d43320870ebc219386a495",
"version" : "1.2.2"
"revision" : "a35257b7e9ce44e92636447003a8eeefb77b145c",
"version" : "0.5.1"
}
},
{
"identity" : "swift-macro-testing",
"identity" : "swift-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-macro-testing",
"location" : "https://github.com/pointfreeco/swift-navigation",
"state" : {
"revision" : "a35257b7e9ce44e92636447003a8eeefb77b145c",
"version" : "0.5.1"
"revision" : "47cfd149ed01223d14fc8e3f52ae27d3a35fe036",
"version" : "2.0.3"
}
},
{
"identity" : "swift-perception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-perception",
"state" : {
"revision" : "2c75ce556a6fc106721b0dadc2c7327244ad3999",
"version" : "1.3.3"
"revision" : "1552c8f722ac256cc0b8daaf1a7073217d4fcdfb",
"version" : "1.3.4"
}
},
{
Expand All @@ -154,12 +154,12 @@
}
},
{
"identity" : "swiftui-navigation",
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swiftui-navigation",
"location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
"state" : {
"revision" : "97f854044356ac082e7e698f39264cc035544d77",
"version" : "1.5.2"
"revision" : "357ca1e5dd31f613a1d43320870ebc219386a495",
"version" : "1.2.2"
}
}
],
Expand Down
18 changes: 9 additions & 9 deletions ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,15 @@
"version" : "0.5.2"
}
},
{
"identity" : "swift-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swift-navigation",
"state" : {
"revision" : "47cfd149ed01223d14fc8e3f52ae27d3a35fe036",
"version" : "2.0.3"
}
},
{
"identity" : "swift-perception",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -153,15 +162,6 @@
"version" : "0.10.0"
}
},
{
"identity" : "swiftui-navigation",
"kind" : "remoteSourceControl",
"location" : "https://github.com/pointfreeco/swiftui-navigation",
"state" : {
"revision" : "fc91d591ebba1f90d65028ccb65c861e5979e898",
"version" : "1.5.4"
}
},
{
"identity" : "xctest-dynamic-overlay",
"kind" : "remoteSourceControl",
Expand Down
17 changes: 0 additions & 17 deletions Examples/Integration/Integration.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
CAF5802329A564590042FB62 /* TestCases.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CAF57FFC29A564210042FB62 /* TestCases.framework */; };
CAF5802529A5651D0042FB62 /* LegacyPresentationTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802429A5651D0042FB62 /* LegacyPresentationTestCase.swift */; };
CAF5802729A567BB0042FB62 /* LegacyPresentationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF5802629A567BB0042FB62 /* LegacyPresentationTests.swift */; };
CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CAF8595729BF8882008721D4 /* SwiftUINavigation */; };
DC140CC529E0BB2C006DF553 /* SwitchStoreTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC140CC429E0BB2C006DF553 /* SwitchStoreTestCase.swift */; };
DC140CC729E0E8F3006DF553 /* SwitchStoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC140CC629E0E8F3006DF553 /* SwitchStoreTests.swift */; };
DC6268502AD1C85E00F2E2EF /* InlineSnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = DC62684F2AD1C85E00F2E2EF /* InlineSnapshotTesting */; };
Expand Down Expand Up @@ -198,7 +197,6 @@
files = (
CAF5801C29A564440042FB62 /* TestCases.framework in Frameworks */,
CA595278296DF67E00B5B695 /* ComposableArchitecture in Frameworks */,
CAF8595829BF8882008721D4 /* SwiftUINavigation in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -449,7 +447,6 @@
name = Integration;
packageProductDependencies = (
CA595277296DF67E00B5B695 /* ComposableArchitecture */,
CAF8595729BF8882008721D4 /* SwiftUINavigation */,
);
productName = Integration;
productReference = CAA1CAF1296DEE78000665B1 /* Integration.app */;
Expand Down Expand Up @@ -531,7 +528,6 @@
);
mainGroup = CAA1CAE8296DEE78000665B1;
packageReferences = (
CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */,
DC6268512AD1E06300F2E2EF /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
);
productRefGroup = CAA1CAF2296DEE78000665B1 /* Products */;
Expand Down Expand Up @@ -998,14 +994,6 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swiftui-navigation.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.5.2;
};
};
DC6268512AD1E06300F2E2EF /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
Expand All @@ -1025,11 +1013,6 @@
isa = XCSwiftPackageProductDependency;
productName = ComposableArchitecture;
};
CAF8595729BF8882008721D4 /* SwiftUINavigation */ = {
isa = XCSwiftPackageProductDependency;
package = CAF8595629BF8882008721D4 /* XCRemoteSwiftPackageReference "swiftui-navigation" */;
productName = SwiftUINavigation;
};
DC62684F2AD1C85E00F2E2EF /* InlineSnapshotTesting */ = {
isa = XCSwiftPackageProductDependency;
productName = InlineSnapshotTesting;
Expand Down
17 changes: 0 additions & 17 deletions Examples/SyncUps/SyncUps.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
CA14FF052B361C7400104A70 /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = CA14FF042B361C7400104A70 /* SwiftUINavigation */; };
DC7CE4E729E9E6E4006B6263 /* ding.wav in Resources */ = {isa = PBXBuildFile; fileRef = DC7CE4E629E9E6E4006B6263 /* ding.wav */; };
DC808D7329E9C3AC0072B4A9 /* App.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC808D7229E9C3AC0072B4A9 /* App.swift */; };
DC808D7729E9C3AD0072B4A9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC808D7629E9C3AD0072B4A9 /* Assets.xcassets */; };
Expand Down Expand Up @@ -80,7 +79,6 @@
files = (
DC808DB629E9C58F0072B4A9 /* Tagged in Frameworks */,
DC808DA329E9C4490072B4A9 /* ComposableArchitecture in Frameworks */,
CA14FF052B361C7400104A70 /* SwiftUINavigation in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -205,7 +203,6 @@
packageProductDependencies = (
DC808DA229E9C4490072B4A9 /* ComposableArchitecture */,
DC808DB529E9C58F0072B4A9 /* Tagged */,
CA14FF042B361C7400104A70 /* SwiftUINavigation */,
);
productName = SyncUps;
productReference = DC808D6F29E9C3AC0072B4A9 /* SyncUps.app */;
Expand Down Expand Up @@ -281,7 +278,6 @@
mainGroup = DC808D6629E9C3AC0072B4A9;
packageReferences = (
DC808DB429E9C58F0072B4A9 /* XCRemoteSwiftPackageReference "swift-tagged" */,
CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */,
);
productRefGroup = DC808D7029E9C3AC0072B4A9 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -664,14 +660,6 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swiftui-navigation.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 1.5.2;
};
};
DC808DB429E9C58F0072B4A9 /* XCRemoteSwiftPackageReference "swift-tagged" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/pointfreeco/swift-tagged.git";
Expand All @@ -683,11 +671,6 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
CA14FF042B361C7400104A70 /* SwiftUINavigation */ = {
isa = XCSwiftPackageProductDependency;
package = CA14FF032B361C7400104A70 /* XCRemoteSwiftPackageReference "swiftui-navigation" */;
productName = SwiftUINavigation;
};
DC808DA229E9C4490072B4A9 /* ComposableArchitecture */ = {
isa = XCSwiftPackageProductDependency;
productName = ComposableArchitecture;
Expand Down
Loading