From c8e998c2d4f92364c62158ef2368099dc3e41467 Mon Sep 17 00:00:00 2001 From: Thomas Grapperon <35562418+tgrapperon@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:05:58 +0200 Subject: [PATCH] Fix Example app (#79) --- .../xcshareddata/swiftpm/Package.resolved | 37 ++++++++----- .../CaseStudies.xcodeproj/project.pbxproj | 52 +++++++++---------- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/DependenciesAdditions.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DependenciesAdditions.xcworkspace/xcshareddata/swiftpm/Package.resolved index ca9e0b0..9f878f7 100644 --- a/DependenciesAdditions.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DependenciesAdditions.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/combine-schedulers", "state" : { - "revision" : "0625932976b3ae23949f6b816d13bd97f3b40b7c", - "version" : "0.10.0" + "revision" : "9dc9cbe4bc45c65164fa653a563d8d8db61b09bb", + "version" : "1.0.0" } }, { @@ -14,8 +14,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-case-paths", "state" : { - "revision" : "fc45e7b2cfece9dd80b5a45e6469ffe67fe67984", - "version" : "0.14.1" + "revision" : "5da6989aae464f324eef5c5b52bdb7974725ab81", + "version" : "1.0.0" } }, { @@ -23,8 +23,17 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-clocks", "state" : { - "revision" : "f9acfa1a45f4483fe0f2c434a74e6f68f865d12d", - "version" : "0.3.0" + "revision" : "d1fd837326aa719bee979bdde1f53cd5797443eb", + "version" : "1.0.0" + } + }, + { + "identity" : "swift-concurrency-extras", + "kind" : "remoteSourceControl", + "location" : "https://github.com/pointfreeco/swift-concurrency-extras", + "state" : { + "revision" : "ea631ce892687f5432a833312292b80db238186a", + "version" : "1.0.0" } }, { @@ -32,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-custom-dump", "state" : { - "revision" : "84b30e1af72e0ffe6dfbfe39d53b8173caacf224", - "version" : "0.10.2" + "revision" : "edd66cace818e1b1c6f1b3349bb1d8e00d6f8b01", + "version" : "1.0.0" } }, { @@ -41,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swift-dependencies", "state" : { - "revision" : "98650d886ec950b587d671261f06d6b59dec4052", - "version" : "0.4.1" + "revision" : "4e1eb6e28afe723286d8cc60611237ffbddba7c5", + "version" : "1.0.0" } }, { @@ -68,8 +77,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/swiftui-navigation", "state" : { - "revision" : "47dd574b900ba5ba679f56ea00d4d282fc7305a6", - "version" : "0.7.1" + "revision" : "f5bcdac5b6bb3f826916b14705f37a3937c2fd34", + "version" : "1.0.0" } }, { @@ -77,8 +86,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay", "state" : { - "revision" : "4af50b38daf0037cfbab15514a241224c3f62f98", - "version" : "0.8.5" + "revision" : "302891700c7fa3b92ebde9fe7b42933f8349f3c7", + "version" : "1.0.0" } } ], diff --git a/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj b/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj index 3f4ffff..6315e7d 100644 --- a/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj +++ b/Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj @@ -7,10 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - E95149892968A3C9004E397A /* _AppStorageDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E95149882968A3C9004E397A /* _AppStorageDependency */; }; - E951498B2968A3C9004E397A /* _CoreDataDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E951498A2968A3C9004E397A /* _CoreDataDependency */; }; - E951498D2968A3C9004E397A /* _NotificationDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E951498C2968A3C9004E397A /* _NotificationDependency */; }; - E951498F2968A3C9004E397A /* _SwiftUIDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E951498E2968A3C9004E397A /* _SwiftUIDependency */; }; E95149912968A3C9004E397A /* DependenciesAdditions in Frameworks */ = {isa = PBXBuildFile; productRef = E95149902968A3C9004E397A /* DependenciesAdditions */; }; E95149932968A3C9004E397A /* SwiftUINavigation in Frameworks */ = {isa = PBXBuildFile; productRef = E95149922968A3C9004E397A /* SwiftUINavigation */; }; E9672A7D29620A2E00CFB3F5 /* BatteryStatusStudy.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9672A7C29620A2E00CFB3F5 /* BatteryStatusStudy.swift */; }; @@ -30,6 +26,10 @@ E9C3B93F29596715000263AD /* CaseStudiesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C3B93E29596715000263AD /* CaseStudiesTests.swift */; }; E9C3B946295967AE000263AD /* AppStorageStudyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9C3B945295967AE000263AD /* AppStorageStudyTests.swift */; }; E9EE247D29629AC600D0173E /* BatteryStateStudyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9EE247C29629AC600D0173E /* BatteryStateStudyTests.swift */; }; + E9F41F142A77F6A000926D97 /* _AppStorageDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E9F41F132A77F6A000926D97 /* _AppStorageDependency */; }; + E9F41F162A77F6A000926D97 /* _CoreDataDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E9F41F152A77F6A000926D97 /* _CoreDataDependency */; }; + E9F41F182A77F6A000926D97 /* _NotificationDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E9F41F172A77F6A000926D97 /* _NotificationDependency */; }; + E9F41F1A2A77F6A000926D97 /* _SwiftUIDependency in Frameworks */ = {isa = PBXBuildFile; productRef = E9F41F192A77F6A000926D97 /* _SwiftUIDependency */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -79,12 +79,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E951498B2968A3C9004E397A /* _CoreDataDependency in Frameworks */, + E9F41F162A77F6A000926D97 /* _CoreDataDependency in Frameworks */, + E9F41F142A77F6A000926D97 /* _AppStorageDependency in Frameworks */, E95149912968A3C9004E397A /* DependenciesAdditions in Frameworks */, + E9F41F182A77F6A000926D97 /* _NotificationDependency in Frameworks */, E95149932968A3C9004E397A /* SwiftUINavigation in Frameworks */, - E95149892968A3C9004E397A /* _AppStorageDependency in Frameworks */, - E951498D2968A3C9004E397A /* _NotificationDependency in Frameworks */, - E951498F2968A3C9004E397A /* _SwiftUIDependency in Frameworks */, + E9F41F1A2A77F6A000926D97 /* _SwiftUIDependency in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -218,12 +218,12 @@ ); name = CaseStudies; packageProductDependencies = ( - E95149882968A3C9004E397A /* _AppStorageDependency */, - E951498A2968A3C9004E397A /* _CoreDataDependency */, - E951498C2968A3C9004E397A /* _NotificationDependency */, - E951498E2968A3C9004E397A /* _SwiftUIDependency */, E95149902968A3C9004E397A /* DependenciesAdditions */, E95149922968A3C9004E397A /* SwiftUINavigation */, + E9F41F132A77F6A000926D97 /* _AppStorageDependency */, + E9F41F152A77F6A000926D97 /* _CoreDataDependency */, + E9F41F172A77F6A000926D97 /* _NotificationDependency */, + E9F41F192A77F6A000926D97 /* _SwiftUIDependency */, ); productName = "Dependencies Additions Case Studies"; productReference = E9DC4C422958F9BB003F0CA8 /* CaseStudies.app */; @@ -606,36 +606,36 @@ repositoryURL = "https://github.com/pointfreeco/swiftui-navigation"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.4.5; + minimumVersion = 1.0.0; }; }; /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - E95149882968A3C9004E397A /* _AppStorageDependency */ = { + E95149902968A3C9004E397A /* DependenciesAdditions */ = { isa = XCSwiftPackageProductDependency; - productName = _AppStorageDependency; + productName = DependenciesAdditions; }; - E951498A2968A3C9004E397A /* _CoreDataDependency */ = { + E95149922968A3C9004E397A /* SwiftUINavigation */ = { isa = XCSwiftPackageProductDependency; - productName = _CoreDataDependency; + package = E98E74D4295B5C060024D761 /* XCRemoteSwiftPackageReference "swiftui-navigation" */; + productName = SwiftUINavigation; }; - E951498C2968A3C9004E397A /* _NotificationDependency */ = { + E9F41F132A77F6A000926D97 /* _AppStorageDependency */ = { isa = XCSwiftPackageProductDependency; - productName = _NotificationDependency; + productName = _AppStorageDependency; }; - E951498E2968A3C9004E397A /* _SwiftUIDependency */ = { + E9F41F152A77F6A000926D97 /* _CoreDataDependency */ = { isa = XCSwiftPackageProductDependency; - productName = _SwiftUIDependency; + productName = _CoreDataDependency; }; - E95149902968A3C9004E397A /* DependenciesAdditions */ = { + E9F41F172A77F6A000926D97 /* _NotificationDependency */ = { isa = XCSwiftPackageProductDependency; - productName = DependenciesAdditions; + productName = _NotificationDependency; }; - E95149922968A3C9004E397A /* SwiftUINavigation */ = { + E9F41F192A77F6A000926D97 /* _SwiftUIDependency */ = { isa = XCSwiftPackageProductDependency; - package = E98E74D4295B5C060024D761 /* XCRemoteSwiftPackageReference "swiftui-navigation" */; - productName = SwiftUINavigation; + productName = _SwiftUIDependency; }; /* End XCSwiftPackageProductDependency section */