Skip to content

Track diff of macOS branch #10

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.

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

Draft
wants to merge 84 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
e44b75a
Build CareKitStore for macOS
cbaker6 May 4, 2023
37fa45a
Build CareKitStore and CareKitFHIR for macOS
cbaker6 May 4, 2023
01aef74
add macOS tests to CI
cbaker6 May 4, 2023
910f94e
fix CI
cbaker6 May 4, 2023
2cc782b
revert swift.yml until macOS13 available
cbaker6 May 4, 2023
7cba031
Fix SPI docs
cbaker6 May 5, 2023
a878c8c
Bump CI to macOS 13
cbaker6 May 6, 2023
ee9936b
Update swift.yml
cbaker6 May 6, 2023
7c94199
Update swift.yml
cbaker6 May 6, 2023
ed05957
Merge branch 'carekit-apple:main' into macOS
cbaker6 Sep 24, 2023
65823c9
feat: Update OCKSurveyTaskViewController to support ResearchKit 3.0
cbaker6 Feb 29, 2024
1368f6d
Merge branch 'carekit-apple:main' into macOS
cbaker6 Feb 29, 2024
592ecb6
Merge branch 'patch-3'
cbaker6 Feb 29, 2024
9690c99
Merge remote-tracking branch 'refs/remotes/origin/macOS'
cbaker6 Feb 29, 2024
d1a8799
import ResearchKitUI
cbaker6 Feb 29, 2024
49e3238
Merge branch 'patch-3'
cbaker6 Feb 29, 2024
c9ab638
support old and new ResearchKit
cbaker6 Mar 1, 2024
75e4da1
Merge branch 'patch-3'
cbaker6 Mar 1, 2024
af92be6
Update CareKit/CareKit/iOS/Task/View Controllers/OCKSurveyTaskViewCon…
cbaker6 Mar 16, 2024
3fbdb95
revert
cbaker6 Mar 16, 2024
796accc
nit
cbaker6 Mar 16, 2024
3db456f
nit
cbaker6 Mar 16, 2024
336623c
Merge branch 'patch-3'
cbaker6 Mar 18, 2024
764d01e
Merge branch 'carekit-apple:main' into macOS
cbaker6 Mar 29, 2024
95135c8
update to main
cbaker6 Jun 24, 2024
355b607
feat: Build CareKitUI for macOS
cbaker6 Jul 5, 2024
7ef51eb
build for macOS in xcode projects
cbaker6 Jul 5, 2024
150d2d4
build for visionOS
cbaker6 Jul 5, 2024
521878c
update CI
cbaker6 Jul 5, 2024
fef8b5a
fix: Update swift-async-algorithms to 1.0.0
cbaker6 Jun 23, 2024
c6a2227
feat: Update FHIRModels dependency
cbaker6 Jul 5, 2024
b91f1c8
fix file protections for macOS
cbaker6 Jul 6, 2024
075d600
nits
cbaker6 Jul 6, 2024
4f10b62
test outcome fix
cbaker6 Jul 7, 2024
671cfa7
make all sort descriptors use class keyPaths
cbaker6 Jul 7, 2024
4e95e3c
Update Package.resolved
cbaker6 Jul 7, 2024
8f84560
fix: Update async-algorithms
cbaker6 Jul 10, 2024
027ef3a
feat: Build CI on macOS branch
cbaker6 Jul 28, 2024
482e0b3
feat: Add HKSample Start and End to OCKOutcomeValues (#11)
Rodrigox30 Aug 6, 2024
ba36ad4
Update Xcode
cbaker6 Sep 30, 2024
6d1425e
Allow initialization of OCKScheduleEvent
cbaker6 Nov 26, 2024
9247fed
fix init of OCKScheduleElement
cbaker6 Nov 26, 2024
6529908
fix: HealthKit store crash when querying objects with zero descriptors
cbaker6 Nov 28, 2024
c1b7de3
fix: Crash of CoreDataQueryMonitor returning objects as faults
cbaker6 Nov 28, 2024
03e46fe
ensure faults that return objects are realized
cbaker6 Nov 28, 2024
e37e578
store taskUUID before context
cbaker6 Nov 28, 2024
23704b6
shouldn't need context as faults are realized
cbaker6 Nov 28, 2024
46a4087
remove context in OutcomeValue
cbaker6 Nov 28, 2024
fa9279a
remove rest of context since faults are realized
cbaker6 Nov 28, 2024
31a31c1
revert using context
cbaker6 Nov 28, 2024
49e3d89
test taskUUID
cbaker6 Nov 28, 2024
15b6fe7
revert test
cbaker6 Nov 28, 2024
487e85b
revert task.uuid
cbaker6 Nov 28, 2024
ae30f1f
feat: Add CareStoreFetchedResult init
cbaker6 Dec 10, 2024
989454a
feat: Make CareStoreFetchedResult store property public
cbaker6 Dec 12, 2024
7412cef
fix: Encode/Decode of startDate and endDate of OCKOutcomeValue (#13)
Rodrigox30 Feb 14, 2025
1d9add9
fix: Query HealthKitSamples over specified date interval (#15)
cbaker6 Feb 23, 2025
096a263
test: All relevant properties of outcome query (#16)
cbaker6 Feb 23, 2025
7f552a0
feat: Add HealthKit sample metadata (#17)
cbaker6 Feb 25, 2025
b4424ee
fix: Adding HealthKit Sample metadata (#18)
cbaker6 Feb 25, 2025
826f682
feat: Add additional HealthKit Sample properties to OCKStore (#19)
cbaker6 Mar 2, 2025
9d16ede
fix: HealthStore deleteOutcomes should return on success
cbaker6 Mar 2, 2025
72f1078
feat: Make all HealthKit sample properties public (#20)
cbaker6 Mar 2, 2025
41e4a9e
fix: Bump Swift-async and FHIR dependencies (#21)
cbaker6 Mar 2, 2025
419401d
fix: Finish making HealthKit samples public
cbaker6 Mar 2, 2025
ada038c
feat: All OCKOutcomeQuery sorting (#22)
cbaker6 Mar 3, 2025
4257a8b
add more unit tests
cbaker6 Mar 3, 2025
ea2fd3a
feat: Fetch and save HealthKit category samples (#23)
cbaker6 Mar 11, 2025
79c88ab
fix: OCKHealthKitLinkage init
cbaker6 Mar 11, 2025
b21b693
feat: Add excludesTasksWithNoEvents to OCKEventQuery
cbaker6 Apr 23, 2025
1289dd8
nit
cbaker6 Apr 23, 2025
ad835b1
feat: Add more conformance of CareStore types to Hashable
cbaker6 Apr 26, 2025
cde647c
fix: Error when saving outcomes related to multiple tasks
cbaker6 May 1, 2025
9f83afe
add test to ensure multiple outcomes can save
cbaker6 May 2, 2025
9fe1f95
fix: OCKOutcomeValue.createdDate should reflect HealthKit sample star…
Rodrigox30 May 9, 2025
dd978e6
ockoutcomevalues that are cululative HKSamples should reflected date,…
cbaker6 May 10, 2025
87eeef7
fix: Ensure all OCKOutcomeValues properties are always up-to-date (#26)
cbaker6 May 10, 2025
818f73b
refactor: Merge with CareKit 3.1.7 (#27)
cbaker6 May 14, 2025
93f352d
Remove extra options on OCKStore
cbaker6 May 14, 2025
0505c50
add back macOS file protection code
cbaker6 May 14, 2025
1931c91
refactor: Bump FHIRModels and Async Algorithms
cbaker6 May 14, 2025
e9c4db2
fix: Allow read/write to HealthKit store on all OS's
cbaker6 May 14, 2025
61be991
Fix packages
cbaker6 May 14, 2025
2bc659f
refactor: OCKCDHealthKitLinkage.swift (#28)
cbaker6 May 18, 2025
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
Prev Previous commit
Next Next commit
build for visionOS
  • Loading branch information
cbaker6 committed Jul 5, 2024
commit 150d2d40c339928d01427fbfc04756eb9a88c3af
16 changes: 8 additions & 8 deletions CareKit/CareKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1131,12 +1131,12 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Apple.CareKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,4";
TARGETED_DEVICE_FAMILY = "1,2,4,7";
};
name = Debug;
};
Expand Down Expand Up @@ -1166,10 +1166,10 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = Apple.CareKitTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2,4";
TARGETED_DEVICE_FAMILY = "1,2,4,7";
};
name = Release;
};
Expand Down Expand Up @@ -1367,13 +1367,13 @@
RUN_DOCUMENTATION_COMPILER = YES;
SDKROOT = auto;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SUPPORTS_UIKITFORMAC = NO;
"SWIFT_ACTIVE_COMPILATION_CONDITIONS[arch=*]" = DEBUG;
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
TARGETED_DEVICE_FAMILY = "1,2,4";
TARGETED_DEVICE_FAMILY = "1,2,4,7";
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Debug;
Expand Down Expand Up @@ -1412,12 +1412,12 @@
RUN_DOCUMENTATION_COMPILER = YES;
SDKROOT = auto;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx watchos watchsimulator xros xrsimulator";
SUPPORTS_MACCATALYST = YES;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SUPPORTS_UIKITFORMAC = NO;
SWIFT_TREAT_WARNINGS_AS_ERRORS = NO;
TARGETED_DEVICE_FAMILY = "1,2,4";
TARGETED_DEVICE_FAMILY = "1,2,4,7";
WATCHOS_DEPLOYMENT_TARGET = 7.0;
};
name = Release;
Expand Down
4 changes: 4 additions & 0 deletions CareKit/CareKit/Shared/Extensions/UIImage+Asset.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if canImport(UIKit)

import Foundation
import UIKit

Expand All @@ -42,3 +44,5 @@ extension UIImage {
return otherUrlImage ?? appAssetsImage ?? symbol
}
}

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

import CareKitStore
import Foundation
import UIKit

extension OCKAnyReadOnlyEventStore {

Expand Down
23 changes: 20 additions & 3 deletions CareKit/CareKit/Shared/Task/OCKTaskEvents.swift
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ public struct OCKTaskEvents: Collection, Identifiable {

// First make sure there is no matching event already stored in the data structure.
let indexPath = self.indexPath(of: event)
guard indexPath == nil else { return (self[indexPath!.section][indexPath!.row], false) }
guard indexPath == nil else {
let indexPathRowValue = rowValueOfIndexPath(indexPath!)
return (self[indexPath!.section][indexPathRowValue], false)
}

// Append the event to the matching section if one exists.
if let section = section(for: event.task) {
Expand All @@ -113,7 +116,8 @@ public struct OCKTaskEvents: Collection, Identifiable {
public mutating func remove(event: OCKAnyEvent) -> OCKAnyEvent? {
guard let indexPath = indexPath(of: event) else { return nil }
var updatedEvents = events[indexPath.section]
let removedEvent = updatedEvents.remove(at: indexPath.row)
let indexPathRowValue = rowValueOfIndexPath(indexPath)
let removedEvent = updatedEvents.remove(at: indexPathRowValue)

// If the removed event was the last one in the section, remove the whole section.
guard !updatedEvents.isEmpty else {
Expand All @@ -132,7 +136,8 @@ public struct OCKTaskEvents: Collection, Identifiable {
public mutating func update(event: OCKAnyEvent) -> OCKAnyEvent? {
// Update the matching event
if let matchIndexPath = indexPath(of: event) {
events[matchIndexPath.section][matchIndexPath.row] = event
let matchIndexPathRowValue = rowValueOfIndexPath(matchIndexPath)
events[matchIndexPath.section][matchIndexPathRowValue] = event
return event
// Else append the event
} else {
Expand All @@ -148,7 +153,19 @@ public struct OCKTaskEvents: Collection, Identifiable {
private func indexPath(of event: OCKAnyEvent) -> IndexPath? {
guard let section = section(for: event.task) else { return nil }
guard let row = events[section].firstIndex(where: { $0.matches(event) }) else { return nil }
#if !os(macOS)
return .init(row: row, section: section)
#else
return .init(item: row, section: section)
#endif
}

private func rowValueOfIndexPath(_ indexPath: IndexPath) -> Int {
#if !os(macOS)
return indexPath.row
#else
return indexPath.item
#endif
}

// MARK: - Collection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import Foundation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import Foundation
Expand Down
2 changes: 1 addition & 1 deletion CareKit/CareKit/iOS/Details/OCKDetailViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitUI
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import UIKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitUI
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitUI
import UIKit
Expand Down
2 changes: 1 addition & 1 deletion CareKit/CareKit/iOS/Higher Order/View/OCKListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitUI
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import CareKitStore
import CareKitUI
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import UIKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#if !os(watchOS)
#if !os(watchOS) && !os(macOS)

import UIKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#if !os(watchOS)
#if !os(watchOS) && !os(macOS) && !os(visionOS)

import CareKitStore
import CareKitUI
Expand Down
Loading