diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2fd902400..29c998597 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,30 +2,33 @@ name: CI
 on:
   pull_request:
   workflow_dispatch:
+permissions:
+  contents: read
 jobs:
   build:
-    runs-on: macos-14
+    runs-on: macos-26
     env:
-      # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md
-      xcode: '/Applications/Xcode_15.2.app'
-      destination_ios17: 'platform=iOS Simulator,OS=17.2,name=iPhone 15'
+      # https://github.com/actions/runner-images/blob/main/images/macos/macos-26-arm64-Readme.md
+      xcode: '/Applications/Xcode_26.2.app'
+      destination_ios: 'platform=iOS Simulator,OS=26.2,name=iPhone 17'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           token: ${{ secrets.CAREEVOLUTIONBUILD_TOKEN }}
           submodules: 'recursive'
+          persist-credentials: false
       - name: Build
         run: |
           set -o pipefail
-          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
-          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild build-for-testing -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios }}' IS_TRAVIS_CI=true | xcpretty
         env:
           DEVELOPER_DIR: ${{ env.xcode }}/Contents/Developer
       - name: Test
         run: |
           set -o pipefail
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
-          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios17 }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ORK1Kit' -destination '${{ env.destination_ios }}' IS_TRAVIS_CI=true | xcpretty
+          xcodebuild test-without-building -workspace 'RKWorkspace.xcworkspace' -scheme 'ResearchKit' -destination '${{ env.destination_ios }}' IS_TRAVIS_CI=true | xcpretty
         env:
           DEVELOPER_DIR: ${{ env.xcode }}/Contents/Developer
diff --git a/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj b/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj
index 1d50c3e2e..137d00ef4 100644
--- a/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj
+++ b/ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj
@@ -2981,7 +2981,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = ORK1;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1520;
+				LastUpgradeCheck = 2620;
 				ORGANIZATIONNAME = researchkit.org;
 				TargetAttributes = {
 					86CC8E991AC09332001CCD89 = {
@@ -3533,7 +3533,6 @@
 		86CC8EA41AC09332001CCD89 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -3546,6 +3545,7 @@
 				);
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "$(SRCROOT)/ORK1KitTests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3563,7 +3563,6 @@
 		86CC8EA51AC09332001CCD89 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -3573,6 +3572,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "$(SRCROOT)/ORK1KitTests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -3597,6 +3597,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
diff --git a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme
index 4a5162876..3231f6b58 100644
--- a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme
+++ b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
index 391e9df22..85ed0d33d 100644
--- a/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
+++ b/ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ORK1Kit/ORK1Kit/ActiveTasks/ORK1ReactionTimeViewController.m b/ORK1Kit/ORK1Kit/ActiveTasks/ORK1ReactionTimeViewController.m
index 4b1fc01a2..16b58bf8d 100644
--- a/ORK1Kit/ORK1Kit/ActiveTasks/ORK1ReactionTimeViewController.m
+++ b/ORK1Kit/ORK1Kit/ActiveTasks/ORK1ReactionTimeViewController.m
@@ -93,7 +93,7 @@ - (void)start {
 
 #if TARGET_IPHONE_SIMULATOR
 - (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event {
-    if (event.type == UIEventSubtypeMotionShake) {
+    if (event.subtype == UIEventSubtypeMotionShake) {
         if (_validResult) {
             ORK1ReactionTimeResult *reactionTimeResult = [[ORK1ReactionTimeResult alloc] initWithIdentifier:self.step.identifier];
             reactionTimeResult.timestamp = _stimulusTimestamp;
diff --git a/ORK1Kit/ORK1KitTests/ORK1DataLoggerManagerTests.m b/ORK1Kit/ORK1KitTests/ORK1DataLoggerManagerTests.m
index b1c169e8d..d331a4729 100644
--- a/ORK1Kit/ORK1KitTests/ORK1DataLoggerManagerTests.m
+++ b/ORK1Kit/ORK1KitTests/ORK1DataLoggerManagerTests.m
@@ -222,7 +222,7 @@ - (void)testDelegateThresholds {
     [dm3 finishCurrentLog];
     [dm2 finishCurrentLog];
     [dm1 finishCurrentLog];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     unsigned long long bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes > _manager.pendingUploadBytesThreshold);
@@ -235,7 +235,7 @@ - (void)testDelegateThresholds {
     } error:nil];
     XCTAssertTrue(success);
     
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes < _manager.pendingUploadBytesThreshold);
@@ -246,7 +246,7 @@ - (void)testDelegateThresholds {
     [dm3 finishCurrentLog];
     [dm2 finishCurrentLog];
     [dm1 finishCurrentLog];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes > _manager.pendingUploadBytesThreshold);
diff --git a/ResearchKit.xcodeproj/project.pbxproj b/ResearchKit.xcodeproj/project.pbxproj
index b9dc80c2d..813801f3c 100644
--- a/ResearchKit.xcodeproj/project.pbxproj
+++ b/ResearchKit.xcodeproj/project.pbxproj
@@ -3499,7 +3499,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				CLASSPREFIX = ORK;
 				LastSwiftUpdateCheck = 0700;
-				LastUpgradeCheck = 1520;
+				LastUpgradeCheck = 2620;
 				ORGANIZATIONNAME = researchkit.org;
 				TargetAttributes = {
 					86CC8E991AC09332001CCD89 = {
@@ -4135,7 +4135,6 @@
 		86CC8EA41AC09332001CCD89 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -4148,6 +4147,7 @@
 				);
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "$(SRCROOT)/ResearchKitTests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -4165,7 +4165,6 @@
 		86CC8EA51AC09332001CCD89 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
@@ -4175,6 +4174,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				INFOPLIST_FILE = "$(SRCROOT)/ResearchKitTests/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 18.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -4199,6 +4199,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				ENABLE_MODULE_VERIFIER = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
diff --git a/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme b/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme
index 8c956ae85..b4a30087f 100644
--- a/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme
+++ b/ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme b/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
index 4ef911737..24d767019 100644
--- a/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
+++ b/ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m b/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m
index 4f602b3a3..a84b6dc10 100644
--- a/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m
+++ b/ResearchKit/ActiveTasks/ORKReactionTimeViewController.m
@@ -95,7 +95,7 @@ - (void)start {
 
 #if TARGET_IPHONE_SIMULATOR
 - (void)motionBegan:(UIEventSubtype)motion withEvent:(UIEvent *)event {
-    if (event.type == UIEventSubtypeMotionShake) {
+    if (event.subtype == UIEventSubtypeMotionShake) {
         if (_validResult) {
             ORKReactionTimeResult *reactionTimeResult = [[ORKReactionTimeResult alloc] initWithIdentifier:self.step.identifier];
             reactionTimeResult.timestamp = _stimulusTimestamp;
diff --git a/ResearchKitTests/ORKDataLoggerManagerTests.m b/ResearchKitTests/ORKDataLoggerManagerTests.m
index 87e3bb2ba..0b6776577 100644
--- a/ResearchKitTests/ORKDataLoggerManagerTests.m
+++ b/ResearchKitTests/ORKDataLoggerManagerTests.m
@@ -222,7 +222,7 @@ - (void)testDelegateThresholds {
     [dm3 finishCurrentLog];
     [dm2 finishCurrentLog];
     [dm1 finishCurrentLog];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     unsigned long long bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes > _manager.pendingUploadBytesThreshold);
@@ -235,7 +235,7 @@ - (void)testDelegateThresholds {
     } error:nil];
     XCTAssertTrue(success);
     
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes < _manager.pendingUploadBytesThreshold);
@@ -246,7 +246,7 @@ - (void)testDelegateThresholds {
     [dm3 finishCurrentLog];
     [dm2 finishCurrentLog];
     [dm1 finishCurrentLog];
-    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.2]];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
     
     bytes = _manager.pendingUploadBytes;
     XCTAssertTrue(bytes > _manager.pendingUploadBytesThreshold);
diff --git a/Testing/ORKTest/ORKTest.xcodeproj/xcshareddata/xcschemes/ORKTest.xcscheme b/Testing/ORKTest/ORKTest.xcodeproj/xcshareddata/xcschemes/ORKTest.xcscheme
index a835e9207..7b06edaa5 100644
--- a/Testing/ORKTest/ORKTest.xcodeproj/xcshareddata/xcschemes/ORKTest.xcscheme
+++ b/Testing/ORKTest/ORKTest.xcodeproj/xcshareddata/xcschemes/ORKTest.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Complication).xcscheme b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Complication).xcscheme
index dff4a1ddd..89e37779c 100644
--- a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Complication).xcscheme	
+++ b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Complication).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Notification).xcscheme b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Notification).xcscheme
index 53dc6b27f..3b3dae562 100644
--- a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Notification).xcscheme	
+++ b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Notification).xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App.xcscheme b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App.xcscheme
index 59ff1f0fa..7222a21df 100644
--- a/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App.xcscheme	
+++ b/samples/ORKParkinsonStudy/ORKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "2620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"