diff --git a/HealthImport.xcodeproj/project.pbxproj b/HealthImport.xcodeproj/project.pbxproj index 3768e6e..4a0f397 100644 --- a/HealthImport.xcodeproj/project.pbxproj +++ b/HealthImport.xcodeproj/project.pbxproj @@ -11,7 +11,6 @@ 8850025D2B5C273C00E7D4DB /* WorkoutTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8850025C2B5C273C00E7D4DB /* WorkoutTab.swift */; }; 8850025F2B5C273E00E7D4DB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8850025E2B5C273E00E7D4DB /* Assets.xcassets */; }; 885002622B5C273E00E7D4DB /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 885002612B5C273E00E7D4DB /* Preview Assets.xcassets */; }; - 885002772B5C2FC400E7D4DB /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = 885002762B5C2FC400E7D4DB /* SQLite */; }; 885002792B5C320400E7D4DB /* Optional+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 885002782B5C320400E7D4DB /* Optional+Extensions.swift */; }; 8850028D2B5D0B5000E7D4DB /* WorkoutDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8850028C2B5D0B5000E7D4DB /* WorkoutDetailView.swift */; }; 8850028F2B5D0EAF00E7D4DB /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8850028E2B5D0EAF00E7D4DB /* Date+Extensions.swift */; }; @@ -33,6 +32,8 @@ E27BC6942B5FD587003A8873 /* Workout+Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC6932B5FD587003A8873 /* Workout+Mock.swift */; }; E27BC6962B5FD61D003A8873 /* WorkoutEvent+Mock.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC6952B5FD61D003A8873 /* WorkoutEvent+Mock.swift */; }; E27BC6982B5FD76F003A8873 /* Data+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E27BC6972B5FD76F003A8873 /* Data+Extensions.swift */; }; + E29E17BF2D4D04A200E0EE54 /* SQLite in Frameworks */ = {isa = PBXBuildFile; productRef = E29E17BE2D4D04A200E0EE54 /* SQLite */; }; + E29E17C22D4D04B900E0EE54 /* HealthDB in Frameworks */ = {isa = PBXBuildFile; productRef = E29E17C12D4D04B900E0EE54 /* HealthDB */; }; E2A38EA32B9A024500BAD02E /* Workout+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2A38EA22B9A024500BAD02E /* Workout+Extensions.swift */; }; E2A38EA52B9C6EA900BAD02E /* SearchHealthStoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2A38EA42B9C6EA900BAD02E /* SearchHealthStoreView.swift */; }; E2A38EA82B9C6EE800BAD02E /* SFSafeSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = E2A38EA72B9C6EE800BAD02E /* SFSafeSymbols */; }; @@ -60,7 +61,6 @@ E2E552902BA236A000BF5E9B /* DatabaseList.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E5528F2BA236A000BF5E9B /* DatabaseList.swift */; }; E2E552922BA236D000BF5E9B /* DatabaseFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E552912BA236D000BF5E9B /* DatabaseFile.swift */; }; E2E5529B2BA3935600BF5E9B /* HKWorkout+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E5529A2BA3935600BF5E9B /* HKWorkout+Extensions.swift */; }; - E2E5529E2BA47BA600BF5E9B /* HealthDB in Frameworks */ = {isa = PBXBuildFile; productRef = E2E5529D2BA47BA600BF5E9B /* HealthDB */; }; E2E552A12BA4B14600BF5E9B /* HeartRateSample.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E552A02BA4B14600BF5E9B /* HeartRateSample.swift */; }; E2E552A32BA4B58F00BF5E9B /* HeartRateGraph.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E552A22BA4B58F00BF5E9B /* HeartRateGraph.swift */; }; E2E552A72BA7531C00BF5E9B /* Event+Identifiable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E552A62BA7531C00BF5E9B /* Event+Identifiable.swift */; }; @@ -154,10 +154,10 @@ files = ( 885002A62B5D296700E7D4DB /* Collections in Frameworks */, E20881D32B76912000D41D95 /* HealthKitExtensions in Frameworks */, - 885002772B5C2FC400E7D4DB /* SQLite in Frameworks */, 885002AA2B5D296700E7D4DB /* OrderedCollections in Frameworks */, - E2E5529E2BA47BA600BF5E9B /* HealthDB in Frameworks */, 885002A82B5D296700E7D4DB /* DequeModule in Frameworks */, + E29E17C22D4D04B900E0EE54 /* HealthDB in Frameworks */, + E29E17BF2D4D04A200E0EE54 /* SQLite in Frameworks */, E2A38EA82B9C6EE800BAD02E /* SFSafeSymbols in Frameworks */, E2FDFF202B6BE34C0080A7B3 /* SwiftProtobuf in Frameworks */, ); @@ -335,14 +335,14 @@ ); name = HealthImport; packageProductDependencies = ( - 885002762B5C2FC400E7D4DB /* SQLite */, 885002A52B5D296700E7D4DB /* Collections */, 885002A72B5D296700E7D4DB /* DequeModule */, 885002A92B5D296700E7D4DB /* OrderedCollections */, E2FDFF1F2B6BE34C0080A7B3 /* SwiftProtobuf */, E20881D22B76912000D41D95 /* HealthKitExtensions */, E2A38EA72B9C6EE800BAD02E /* SFSafeSymbols */, - E2E5529D2BA47BA600BF5E9B /* HealthDB */, + E29E17BE2D4D04A200E0EE54 /* SQLite */, + E29E17C12D4D04B900E0EE54 /* HealthDB */, ); productName = HealthImport; productReference = 885002572B5C273C00E7D4DB /* HealthImport.app */; @@ -373,12 +373,12 @@ ); mainGroup = 8850024E2B5C273C00E7D4DB; packageReferences = ( - 885002752B5C2FC400E7D4DB /* XCRemoteSwiftPackageReference "SQLite" */, 885002A42B5D296700E7D4DB /* XCRemoteSwiftPackageReference "swift-collections" */, E2FDFF1E2B6BE34C0080A7B3 /* XCRemoteSwiftPackageReference "swift-protobuf" */, E20881D12B76912000D41D95 /* XCRemoteSwiftPackageReference "HealthKitExtensions" */, E2A38EA62B9C6EE800BAD02E /* XCRemoteSwiftPackageReference "SFSafeSymbols" */, - E2E552972BA3748500BF5E9B /* XCRemoteSwiftPackageReference "HealthDB" */, + E29E17BD2D4D04A200E0EE54 /* XCRemoteSwiftPackageReference "SQLite" */, + E29E17C02D4D04B900E0EE54 /* XCRemoteSwiftPackageReference "HealthDB" */, ); productRefGroup = 885002582B5C273C00E7D4DB /* Products */; projectDirPath = ""; @@ -688,14 +688,6 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 885002752B5C2FC400E7D4DB /* XCRemoteSwiftPackageReference "SQLite" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/stephencelis/SQLite.swift"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.14.1; - }; - }; 885002A42B5D296700E7D4DB /* XCRemoteSwiftPackageReference "swift-collections" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-collections.git"; @@ -712,6 +704,22 @@ minimumVersion = 0.4.0; }; }; + E29E17BD2D4D04A200E0EE54 /* XCRemoteSwiftPackageReference "SQLite" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/stephencelis/SQLite.swift"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.15.3; + }; + }; + E29E17C02D4D04B900E0EE54 /* XCRemoteSwiftPackageReference "HealthDB" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/christophhagen/HealthDB"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.4.4; + }; + }; E2A38EA62B9C6EE800BAD02E /* XCRemoteSwiftPackageReference "SFSafeSymbols" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/SFSafeSymbols/SFSafeSymbols"; @@ -720,14 +728,6 @@ minimumVersion = 5.2.0; }; }; - E2E552972BA3748500BF5E9B /* XCRemoteSwiftPackageReference "HealthDB" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/christophhagen/HealthDB"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.4.0; - }; - }; E2FDFF1E2B6BE34C0080A7B3 /* XCRemoteSwiftPackageReference "swift-protobuf" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/apple/swift-protobuf.git"; @@ -739,11 +739,6 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 885002762B5C2FC400E7D4DB /* SQLite */ = { - isa = XCSwiftPackageProductDependency; - package = 885002752B5C2FC400E7D4DB /* XCRemoteSwiftPackageReference "SQLite" */; - productName = SQLite; - }; 885002A52B5D296700E7D4DB /* Collections */ = { isa = XCSwiftPackageProductDependency; package = 885002A42B5D296700E7D4DB /* XCRemoteSwiftPackageReference "swift-collections" */; @@ -764,16 +759,21 @@ package = E20881D12B76912000D41D95 /* XCRemoteSwiftPackageReference "HealthKitExtensions" */; productName = HealthKitExtensions; }; + E29E17BE2D4D04A200E0EE54 /* SQLite */ = { + isa = XCSwiftPackageProductDependency; + package = E29E17BD2D4D04A200E0EE54 /* XCRemoteSwiftPackageReference "SQLite" */; + productName = SQLite; + }; + E29E17C12D4D04B900E0EE54 /* HealthDB */ = { + isa = XCSwiftPackageProductDependency; + package = E29E17C02D4D04B900E0EE54 /* XCRemoteSwiftPackageReference "HealthDB" */; + productName = HealthDB; + }; E2A38EA72B9C6EE800BAD02E /* SFSafeSymbols */ = { isa = XCSwiftPackageProductDependency; package = E2A38EA62B9C6EE800BAD02E /* XCRemoteSwiftPackageReference "SFSafeSymbols" */; productName = SFSafeSymbols; }; - E2E5529D2BA47BA600BF5E9B /* HealthDB */ = { - isa = XCSwiftPackageProductDependency; - package = E2E552972BA3748500BF5E9B /* XCRemoteSwiftPackageReference "HealthDB" */; - productName = HealthDB; - }; E2FDFF1F2B6BE34C0080A7B3 /* SwiftProtobuf */ = { isa = XCSwiftPackageProductDependency; package = E2FDFF1E2B6BE34C0080A7B3 /* XCRemoteSwiftPackageReference "swift-protobuf" */; diff --git a/HealthImport.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/HealthImport.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9bd7944..d399fe0 100644 --- a/HealthImport.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/HealthImport.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "5b8e27ff27b74293d3ae2085172fcc80a2317825fae6f3e7879caab9728af319", + "originHash" : "853d27802fcd1b74fc9030c3fd718aa74e5a159d9bd4e67bca057ac38d56b364", "pins" : [ { "identity" : "healthdb", "kind" : "remoteSourceControl", "location" : "https://github.com/christophhagen/HealthDB", "state" : { - "revision" : "cd077d034d88d31cf283bcf5c0663cb027496a66", - "version" : "0.4.1" + "revision" : "b02391d12d52623fa15fa79a097c7fefd16ddf32", + "version" : "0.4.4" } }, { @@ -33,8 +33,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/stephencelis/SQLite.swift", "state" : { - "revision" : "7a2e3cd27de56f6d396e84f63beefd0267b55ccb", - "version" : "0.14.1" + "revision" : "a95fc6df17d108bd99210db5e8a9bac90fe984b8", + "version" : "0.15.3" } }, { diff --git a/HealthImport.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate b/HealthImport.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..c0f8a6c Binary files /dev/null and b/HealthImport.xcodeproj/project.xcworkspace/xcuserdata/ch.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/HealthImport/Extensions/Event+Identifiable.swift b/HealthImport/Extensions/Event+Identifiable.swift index 966751d..ec41def 100644 --- a/HealthImport/Extensions/Event+Identifiable.swift +++ b/HealthImport/Extensions/Event+Identifiable.swift @@ -1,7 +1,7 @@ import Foundation import HealthKit -extension HKWorkoutEvent: Identifiable { +extension HKWorkoutEvent: @retroactive Identifiable { public var id: Int { Int(dateInterval.start.timeIntervalSinceReferenceDate) << 16 + diff --git a/HealthImport/Extensions/Workout+Extensions.swift b/HealthImport/Extensions/Workout+Extensions.swift index 957ab83..86c227f 100644 --- a/HealthImport/Extensions/Workout+Extensions.swift +++ b/HealthImport/Extensions/Workout+Extensions.swift @@ -10,7 +10,7 @@ private let df: DateFormatter = { return df }() -extension Workout: Identifiable { +extension Workout: @retroactive Identifiable { public var id: Int { dataId diff --git a/HealthImport/SearchHealthStoreView.swift b/HealthImport/SearchHealthStoreView.swift index 42675b6..4000786 100644 --- a/HealthImport/SearchHealthStoreView.swift +++ b/HealthImport/SearchHealthStoreView.swift @@ -83,7 +83,7 @@ struct SearchHealthStoreView: View { SearchHealthStoreView() } -extension HKQuantityTypeIdentifier: Identifiable { +extension HKQuantityTypeIdentifier: @retroactive Identifiable { public var id: String { rawValue diff --git a/HealthImport/Workouts/WorkoutDetailView.swift b/HealthImport/Workouts/WorkoutDetailView.swift index 8e2cab6..d2c0173 100644 --- a/HealthImport/Workouts/WorkoutDetailView.swift +++ b/HealthImport/Workouts/WorkoutDetailView.swift @@ -449,7 +449,7 @@ struct WorkoutDetailView: View { } } -extension String: Identifiable { +extension String: @retroactive Identifiable { public var id: Self { self } }