fix: Update to latest CareKit and remove warnings (#73)

cbaker6 · web-flow · commit e2c6cfc18ce6 · 2026-01-09T09:56:13.000-08:00
* fix: Update to latest CareKit and fix warnings

* Update package to Swift 6

* Update Xcode Project

* Update Xcode version and macOS runner in workflow

* move extension
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,13 +3,13 @@ on:
   release:
     types: [published]
 env:
-  CI_XCODE: '/Applications/Xcode_16.3.app/Contents/Developer'
+  CI_XCODE: '/Applications/Xcode_26.1.app/Contents/Developer'
   
 jobs:
   docs:
-    runs-on: macos-15
+    runs-on: macos-26
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Build and Deploy Docs
         run: set -o pipefail && env NSUnbufferedIO=YES Scripts/update-gh-pages-documentation-site
         env:
diff --git a/CareKitEssentials.xcodeproj/project.pbxproj b/CareKitEssentials.xcodeproj/project.pbxproj
@@ -701,7 +701,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftMigration = 9999;
 				LastSwiftUpdateCheck = 1540;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 2620;
 				ORGANIZATIONNAME = "Network Reconnaissance Lab";
 				TargetAttributes = {
 					70C422CE2C3B6C7600E6DC51 = {
@@ -940,8 +940,10 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"TestHost/Preview Content\"";
+				ENABLE_APP_SANDBOX = YES;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SELECTED_FILES = readonly;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1005,9 +1007,11 @@
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"TestHost/Preview Content\"";
+				ENABLE_APP_SANDBOX = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_PREVIEWS = YES;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				ENABLE_USER_SELECTED_FILES = readonly;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
@@ -1094,11 +1098,13 @@
 				OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)";
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE DEBUG";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 6.0;
 				USE_HEADERMAP = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 				XROS_DEPLOYMENT_TARGET = 1.0;
@@ -1152,12 +1158,14 @@
 				OTHER_SWIFT_FLAGS = "$(inherited) -DXcode";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SUPPORTED_PLATFORMS = "$(AVAILABLE_PLATFORMS)";
 				SUPPORTS_MACCATALYST = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = 6.0;
 				USE_HEADERMAP = NO;
 				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 				XROS_DEPLOYMENT_TARGET = 1.0;
@@ -1196,7 +1204,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,4,7";
 				TARGET_NAME = CareKitEssentials;
 				TVOS_DEPLOYMENT_TARGET = 12.0;
@@ -1237,7 +1245,7 @@
 				SUPPORTS_MACCATALYST = YES;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,4,7";
 				TARGET_NAME = CareKitEssentials;
 				TVOS_DEPLOYMENT_TARGET = 12.0;
@@ -1367,7 +1375,7 @@
 			repositoryURL = "https://github.com/cbaker6/CareKit.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.0.5;
+				minimumVersion = 4.0.7;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
diff --git a/CareKitEssentials.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CareKitEssentials.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/CareKitEssentials.xcodeproj/xcshareddata/xcschemes/CareKitEssentials.xcscheme b/CareKitEssentials.xcodeproj/xcshareddata/xcschemes/CareKitEssentials.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "2620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/CareKitEssentials.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme b/CareKitEssentials.xcodeproj/xcshareddata/xcschemes/TestHost.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1630"
+   LastUpgradeVersion = "2620"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 6.1
+// swift-tools-version: 6.0
 
 import PackageDescription
 
@@ -15,7 +15,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/cbaker6/CareKit.git",
-            .upToNextMajor(from: "4.0.6")
+            .upToNextMajor(from: "4.0.7")
         )
     ],
     targets: [
diff --git a/Sources/CareKitEssentials/Cards/Shared/Chart/CKEConfigurationView.swift b/Sources/CareKitEssentials/Cards/Shared/Chart/CKEConfigurationView.swift
@@ -43,19 +43,19 @@ struct CKEConfigurationView: View {
 				Toggle("SHOW_MEDIAN", isOn: $isShowingMedianMark)
 			}
 		}
-		.onChange(of: markSelected) { newValue in
+		.onChange(of: markSelected) { _, newValue in
 			configurations[configurationId]?.mark = newValue
 		}
-		.onChange(of: dataStrategySelected) { newValue in
+		.onChange(of: dataStrategySelected) { _, newValue in
 			configurations[configurationId]?.dataStrategy = newValue
 		}
-		.onChange(of: isShowingMarkHighlighted) { newValue in
+		.onChange(of: isShowingMarkHighlighted) { _, newValue in
 			configurations[configurationId]?.showMarkWhenHighlighted = newValue
 		}
-		.onChange(of: isShowingMeanMark) { newValue in
+		.onChange(of: isShowingMeanMark) { _, newValue in
 			configurations[configurationId]?.showMeanMark = newValue
 		}
-		.onChange(of: isShowingMedianMark) { newValue in
+		.onChange(of: isShowingMedianMark) { _, newValue in
 			configurations[configurationId]?.showMedianMark = newValue
 		}
     }
diff --git a/Sources/CareKitEssentials/Cards/Shared/Chart/CareKitEssentialChartDetailView.swift b/Sources/CareKitEssentials/Cards/Shared/Chart/CareKitEssentialChartDetailView.swift
@@ -64,10 +64,10 @@ struct CareKitEssentialChartDetailView: CareKitEssentialChartable {
 				.onAppear {
 					updateQuery()
 				}
-				.onChange(of: dateInterval) { _ in
+				.onChange(of: dateInterval) {
 					updateQuery()
 				}
-				.onChange(of: configurations) { _ in
+				.onChange(of: configurations) {
 					updateQuery()
 				}
 				.onReceive(events.publisher) { _ in
diff --git a/Sources/CareKitEssentials/Cards/Shared/Chart/CareKitEssentialChartView.swift b/Sources/CareKitEssentials/Cards/Shared/Chart/CareKitEssentialChartView.swift
@@ -89,10 +89,10 @@ public struct CareKitEssentialChartView: CareKitEssentialChartable {
 				.onAppear {
 					updateQuery()
 				}
-				.onChange(of: dateInterval) { _ in
+				.onChange(of: dateInterval) {
 					updateQuery()
 				}
-				.onChange(of: configurations) { _ in
+				.onChange(of: configurations) {
 					updateQuery()
 				}
 			}
diff --git a/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Comparable.swift b/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Comparable.swift
@@ -8,7 +8,7 @@
 
 import CareKitStore
 
-extension OCKAnyEvent: Comparable {
+extension OCKAnyEvent: @retroactive Comparable {
 
 	func isOrderedBefore(other: OCKAnyEvent) -> Bool {
 
diff --git a/Sources/CareKitEssentials/Extensions/OCKAnyEvent+CustomStringConvertable.swift b/Sources/CareKitEssentials/Extensions/OCKAnyEvent+CustomStringConvertable.swift
@@ -9,7 +9,7 @@
 import Foundation
 import CareKitStore
 
-extension OCKAnyEvent: CustomStringConvertible {
+extension OCKAnyEvent: @retroactive CustomStringConvertible {
 
     public var description: String {
         guard let task = self.task as? OCKTask,
diff --git a/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Equatable.swift b/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Equatable.swift
@@ -8,7 +8,7 @@
 
 import CareKitStore
 
-extension OCKAnyEvent: Equatable {
+extension OCKAnyEvent: @retroactive Equatable {
     public static func == (
         lhs: OCKAnyEvent,
         rhs: OCKAnyEvent
diff --git a/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Hashable.swift b/Sources/CareKitEssentials/Extensions/OCKAnyEvent+Hashable.swift
@@ -9,7 +9,7 @@
 import CareKitStore
 import Foundation
 
-extension OCKAnyEvent: Hashable {
+extension OCKAnyEvent: @retroactive Hashable {
 	public func hash(into hasher: inout Hasher) {
 		hasher.combine(id)
 		hasher.combine(scheduleEvent)
diff --git a/Sources/CareKitEssentials/Extensions/OCKOutcomeValue+Identifiable.swift b/Sources/CareKitEssentials/Extensions/OCKOutcomeValue+Identifiable.swift
@@ -9,7 +9,7 @@
 import Foundation
 import CareKitStore
 
-extension OCKOutcomeValue: Identifiable {
+extension OCKOutcomeValue: @retroactive Identifiable {
     public var id: String {
         if let kind = kind {
             return "\(kind)_\(value)_\(createdDate)"
diff --git a/Sources/CareKitEssentials/Extensions/OCKOutcomeValue+Plottable.swift b/Sources/CareKitEssentials/Extensions/OCKOutcomeValue+Plottable.swift
@@ -9,7 +9,7 @@
 import CareKitStore
 import Charts
 
-extension OCKOutcomeValue: Plottable {
+extension OCKOutcomeValue: @retroactive Plottable {
 	public var primitivePlottable: Double {
 		LinearCareTaskProgress.accumulableDoubleValue(for: self)
 	}
diff --git a/Sources/CareKitEssentials/Extensions/OCKScheduleEvent+Comparable.swift b/Sources/CareKitEssentials/Extensions/OCKScheduleEvent+Comparable.swift
@@ -7,7 +7,7 @@
 
 import CareKitStore
 
-extension OCKScheduleEvent: Comparable {
+extension OCKScheduleEvent: @retroactive Comparable {
     public static func < (lhs: Self, rhs: Self) -> Bool {
         if lhs.start < rhs.start {
             return true
diff --git a/Sources/CareKitEssentials/Extensions/OCKStoreCoordinator+Hashable.swift b/Sources/CareKitEssentials/Extensions/OCKStoreCoordinator+Hashable.swift
@@ -8,11 +8,13 @@
 
 import CareKitStore
 
-extension OCKStoreCoordinator: Hashable {
+extension OCKStoreCoordinator: @retroactive Equatable {
 	public static func == (lhs: CareKitStore.OCKStoreCoordinator, rhs: CareKitStore.OCKStoreCoordinator) -> Bool {
 		lhs === rhs
 	}
+}
 
+extension OCKStoreCoordinator: @retroactive Hashable {
 	public func hash(into hasher: inout Hasher) {
 		hasher.combine(Unmanaged.passUnretained(self).toOpaque())
 	}
diff --git a/TestHost/TestHost.entitlements b/TestHost/TestHost.entitlements
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
-</dict>
+<dict/>
 </plist>

Original file line number	Diff line number	Diff line change
`@@ -43,19 +43,19 @@ struct CKEConfigurationView: View {`
`43`	`43`	`Toggle("SHOW_MEDIAN", isOn: $isShowingMedianMark)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`		`- .onChange(of: markSelected) { newValue in`
	`46`	`+ .onChange(of: markSelected) { _, newValue in`
`47`	`47`	`configurations[configurationId]?.mark = newValue`
`48`	`48`	`}`
`49`		`- .onChange(of: dataStrategySelected) { newValue in`
	`49`	`+ .onChange(of: dataStrategySelected) { _, newValue in`
`50`	`50`	`configurations[configurationId]?.dataStrategy = newValue`
`51`	`51`	`}`
`52`		`- .onChange(of: isShowingMarkHighlighted) { newValue in`
	`52`	`+ .onChange(of: isShowingMarkHighlighted) { _, newValue in`
`53`	`53`	`configurations[configurationId]?.showMarkWhenHighlighted = newValue`
`54`	`54`	`}`
`55`		`- .onChange(of: isShowingMeanMark) { newValue in`
	`55`	`+ .onChange(of: isShowingMeanMark) { _, newValue in`
`56`	`56`	`configurations[configurationId]?.showMeanMark = newValue`
`57`	`57`	`}`
`58`		`- .onChange(of: isShowingMedianMark) { newValue in`
	`58`	`+ .onChange(of: isShowingMedianMark) { _, newValue in`
`59`	`59`	`configurations[configurationId]?.showMedianMark = newValue`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,10 +64,10 @@ struct CareKitEssentialChartDetailView: CareKitEssentialChartable {`
`64`	`64`	`.onAppear {`
`65`	`65`	`updateQuery()`
`66`	`66`	`}`
`67`		`- .onChange(of: dateInterval) { _ in`
	`67`	`+ .onChange(of: dateInterval) {`
`68`	`68`	`updateQuery()`
`69`	`69`	`}`
`70`		`- .onChange(of: configurations) { _ in`
	`70`	`+ .onChange(of: configurations) {`
`71`	`71`	`updateQuery()`
`72`	`72`	`}`
`73`	`73`	`.onReceive(events.publisher) { _ in`
Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,10 @@ public struct CareKitEssentialChartView: CareKitEssentialChartable {`
`89`	`89`	`.onAppear {`
`90`	`90`	`updateQuery()`
`91`	`91`	`}`
`92`		`- .onChange(of: dateInterval) { _ in`
	`92`	`+ .onChange(of: dateInterval) {`
`93`	`93`	`updateQuery()`
`94`	`94`	`}`
`95`		`- .onChange(of: configurations) { _ in`
	`95`	`+ .onChange(of: configurations) {`
`96`	`96`	`updateQuery()`
`97`	`97`	`}`
`98`	`98`	`}`