Skip to content

Xcode 26 updates #157

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.

Sign up for GitHub

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

Merged
mmertsock merged 9 commits into from
Jan 16, 2026
Merged

Xcode 26 updates #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3340a9
Xcode 26
mmertsock Jan 14, 2026
5d824ec
Fix some build warnings
mmertsock Jan 14, 2026
836237e
Update CI
mmertsock Jan 14, 2026
1cd0cb8
Update CI
mmertsock Jan 14, 2026
81a246b
Update CI
mmertsock Jan 14, 2026
20834cd
Update CI
mmertsock Jan 16, 2026
ebbd728
Update unit test deployment targets
mmertsock Jan 16, 2026
575224e
Allow more time for some unit tests to run
mmertsock Jan 16, 2026
a98d959
Allow more time for some unit tests to run
mmertsock Jan 16, 2026
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
21 changes: 12 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions ORK1Kit/ORK1Kit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2981,7 +2981,7 @@
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = ORK1;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 2620;
ORGANIZATIONNAME = researchkit.org;
TargetAttributes = {
86CC8E991AC09332001CCD89 = {
Expand Down Expand Up @@ -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;
Expand All @@ -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",
Expand All @@ -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;
Expand All @@ -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",
Expand All @@ -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 = (
Expand Down
2 changes: 1 addition & 1 deletion ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/ORK1Kit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ORK1Kit/ORK1Kit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ORK1Kit/ORK1Kit/ActiveTasks/ORK1ReactionTimeViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ORK1Kit/ORK1KitTests/ORK1DataLoggerManagerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
7 changes: 4 additions & 3 deletions ResearchKit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3499,7 +3499,7 @@
BuildIndependentTargetsInParallel = YES;
CLASSPREFIX = ORK;
LastSwiftUpdateCheck = 0700;
LastUpgradeCheck = 1520;
LastUpgradeCheck = 2620;
ORGANIZATIONNAME = researchkit.org;
TargetAttributes = {
86CC8E991AC09332001CCD89 = {
Expand Down Expand Up @@ -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;
Expand All @@ -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",
Expand All @@ -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;
Expand All @@ -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",
Expand All @@ -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 = (
Expand Down
2 changes: 1 addition & 1 deletion ResearchKit.xcodeproj/xcshareddata/xcschemes/ResearchKit.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ResearchKit.xcodeproj/xcshareddata/xcschemes/docs.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ResearchKit/ActiveTasks/ORKReactionTimeViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ResearchKitTests/ORKDataLoggerManagerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Testing/ORKTest/ORKTest.xcodeproj/xcshareddata/xcschemes/ORKTest.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...y.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Complication).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...y.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App (Notification).xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ...RKParkinsonStudy.xcodeproj/xcshareddata/xcschemes/ORKParkinsonStudy WatchKit App.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1520"
LastUpgradeVersion = "2620"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down