Skip to content

Commit

Permalink
merge SpeziHealthKitUI into SpeziHealthKit
Browse files Browse the repository at this point in the history
this sadly seems to be necessary to work around swiftlang/swift#78734 and swiftlang/swift#78735
  • Loading branch information
lukaskollmer committed Jan 18, 2025
1 parent fac771e commit 79e2e3d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 73 deletions.
18 changes: 5 additions & 13 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ let package = Package(
.iOS(.v17)
],
products: [
.library(name: "SpeziHealthKit", targets: ["SpeziHealthKit"]),
.library(name: "SpeziHealthKitUI", targets: ["SpeziHealthKitUI"])
.library(name: "SpeziHealthKit", targets: ["SpeziHealthKit"])
],
dependencies: [
.package(path: "../Spezi"),
.package(path: "../SpeziFoundation")
.package(path: "../SpeziFoundation"),
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.7")
] + swiftLintPackage(),
targets: [
.target(
Expand All @@ -35,20 +35,12 @@ let package = Package(
],
plugins: [] + swiftLintPlugin()
),
.target(
name: "SpeziHealthKitUI",
dependencies: [
.target(name: "SpeziHealthKit"),
.product(name: "Spezi", package: "Spezi"),
.product(name: "SpeziFoundation", package: "SpeziFoundation")
],
plugins: [] + swiftLintPlugin()
),
.testTarget(
name: "SpeziHealthKitTests",
dependencies: [
.product(name: "XCTSpezi", package: "Spezi"),
.target(name: "SpeziHealthKit")
.target(name: "SpeziHealthKit"),
.product(name: "SnapshotTesting", package: "swift-snapshot-testing")
],
plugins: [] + swiftLintPlugin()
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import SpeziHealthKit
// TODO Rename HealthChartDateSet? (Entry kinda sounds like it's referring to a single data point. But then again, it could very well also be the case that we want to split eg "step count" up into separate data sets, to make it look nicer?
/// An entry in a ``HealthChart``
public final class HealthChartEntry<Results: HealthKitQueryResults>: Sendable {
public typealias HealthKitQueryDataPoint = SpeziHealthKitUI.HealthKitQueryDataPoint//<Results.Element.ID>
// public typealias HealthKitQueryDataPoint = SpeziHealthKit.HealthKitQueryDataPoint//<Results.Element.ID>
public typealias MakeDataPointImp = @Sendable (Results.Element, Results) -> HealthKitQueryDataPoint?

private enum Variant {
private enum Variant: Sendable {
case regular(Results, HealthChartDrawingConfig, MakeDataPointImp)
case empty
}
Expand Down
58 changes: 0 additions & 58 deletions Sources/SpeziHealthKitUI/HealthOverview.swift

This file was deleted.

0 comments on commit 79e2e3d

Please sign in to comment.