testing CI

.github/workflows/swift.yml

@@ -12,14 +12,14 @@ concurrency:
 
 jobs:        
   test:
-    runs-on: macos-14
+    runs-on: macos-15
     strategy:
       matrix:
-        destination: ['platform=iOS\ Simulator,OS=17.5,name=iPhone\ 15\ Pro\ Max', 'platform=watchOS\ Simulator,OS=10.5,name=Apple\ Watch\ Series\ 7\ \(45mm\)']
+        destination: ['platform=iOS\ Simulator,OS=18.2,name=iPhone\ 16\ Pro\ Max', 'platform=watchOS\ Simulator,OS=11.2,name=Apple\ Watch\ Series\ 10\ \(46mm\)', 'platform=macOS CODE_SIGN_IDENTITY=""', 'platform=visionOS\ Simulator,OS=2.2,name=Apple\ Vision\ Pro CODE_SIGN_IDENTITY=""']
         scheme: ['CareKit', 'CareKitStore', 'CareKitUI', 'CareKitFHIR']
     steps:
       - uses: actions/checkout@v4
       - name: Set Xcode Version
-        run: sudo xcode-select -s /Applications/Xcode_15.4.app
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app
       - name: Build
-        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -verbose -workspace CKWorkspace.xcworkspace -scheme ${{ matrix.scheme }} -destination ${{ matrix.destination }} build test | xcpretty
+        run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -verbose -workspace CKWorkspace.xcworkspace -scheme ${{ matrix.scheme }} -destination ${{ matrix.destination }} build test 2>&1 | xcbeautify --renderer github-actions

CareKit/CareKit.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1131,12 +1131,12 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = Apple.CareKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "watchsimulator watchos iphonesimulator iphoneos";
+				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;
 		};
@@ -1166,10 +1166,10 @@
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = Apple.CareKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SUPPORTED_PLATFORMS = "watchsimulator watchos iphonesimulator iphoneos";
+				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;
 		};
@@ -1238,6 +1238,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = "$(VERSION_NUMBER)";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1252,6 +1253,7 @@
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Debug;
 		};
@@ -1314,6 +1316,7 @@
 				GCC_WARN_UNUSED_LABEL = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MARKETING_VERSION = "$(VERSION_NUMBER)";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				ONLY_ACTIVE_ARCH = NO;
@@ -1328,6 +1331,7 @@
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 				WATCHOS_DEPLOYMENT_TARGET = 7.0;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Release;
 		};
@@ -1365,13 +1369,13 @@
 				RUN_DOCUMENTATION_COMPILER = YES;
 				SDKROOT = auto;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator 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;
@@ -1410,12 +1414,12 @@
 				RUN_DOCUMENTATION_COMPILER = YES;
 				SDKROOT = auto;
 				SKIP_INSTALL = YES;
-				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator 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;

CareKit/CareKit/Shared/Extensions/UIImage+Asset.swift

@@ -28,6 +28,8 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if canImport(UIKit)
+
 import Foundation
 import UIKit
 
@@ -42,3 +44,5 @@ extension UIImage {
         return otherUrlImage ?? appAssetsImage ?? symbol
     }
 }
+
+#endif

CareKit/CareKit/Shared/Synchronization/OCKAnyReadOnlyEventStore+Progress.swift

@@ -30,7 +30,6 @@
 
 import CareKitStore
 import Foundation
-import UIKit
 
 extension OCKAnyReadOnlyEventStore {
 

CareKit/CareKit/Shared/Task/OCKTaskEvents.swift

@@ -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) {
@@ -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 {
@@ -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 {
@@ -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

CareKit/CareKit/Stale/OCKCalendarViewSynchronizerProtocol.swift

@@ -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

CareKit/CareKit/Stale/OCKChartViewSynchronizerProtocol.swift

@@ -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

CareKit/CareKit/Stale/OCKContactViewSynchronizerProtocol.swift

@@ -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

CareKit/CareKit/Stale/OCKTaskViewSynchronizerProtocol.swift

@@ -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

CareKit/CareKit/iOS/Calendar/Paging/OCKWeekCalendarPageViewController.swift

@@ -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

CareKit/CareKit/iOS/Calendar/Synchronizers/OCKWeekCalendarViewSynchronizer.swift

@@ -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

CareKit/CareKit/iOS/Calendar/View Controllers/OCKCalendarViewController.swift

@@ -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

CareKit/CareKit/iOS/Calendar/View Controllers/OCKWeekCalendarViewController.swift

@@ -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

CareKit/CareKit/iOS/Chart/Synchronizers/OCKCartesianChartViewSynchronizer.swift

@@ -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

CareKit/CareKit/iOS/Chart/View Controllers/OCKCartesianChartViewController.swift

@@ -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

CareKit/CareKit/iOS/Contact/Synchronizers/OCKDetailedContactViewSynchronizer.swift

@@ -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

CareKit/CareKit/iOS/Contact/Synchronizers/OCKSimpleContactViewSynchronizer.swift

@@ -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

CareKit/CareKit/iOS/Contact/Synchronizers/_OCKContactsListViewSynchronizer.swift

@@ -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

CareKit/CareKit/iOS/Contact/View Controllers/OCKContactViewController.swift

@@ -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

CareKit/CareKit/iOS/Contact/View Controllers/OCKContactViewResponder.swift

@@ -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

CareKit/CareKit/iOS/Contact/View Controllers/OCKContactsListViewController.swift

@@ -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

CareKit/CareKit/iOS/Contact/View Controllers/OCKDetailedContactViewController.swift

@@ -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

CareKit/CareKit/iOS/Contact/View Controllers/OCKSimpleContactViewController.swift

@@ -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

CareKit/CareKit/iOS/Details/OCKDetailViewController.swift

@@ -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

CareKit/CareKit/iOS/Extensions/NSLayoutConstraint+Extensions.swift

@@ -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
 

CareKit/CareKit/iOS/Extensions/UIViewController+Extensions.swift

@@ -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

CareKit/CareKit/iOS/Higher Order/View/OCKHeaderBodyView.swift

@@ -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