From 0fdbc9220d074b2600304d54d416f7c0aebc313b Mon Sep 17 00:00:00 2001 From: Wesley Keetch Date: Sat, 26 Sep 2026 00:32:43 -0400 Subject: [PATCH 1/2] Move iOS/watchOS deployment target to 26.0 Wes corrected the platform floor to 26.0 everywhere (not 27.0 as originally planned 2026-09-25). This lands both directions at 26.0: iOS 26.4 -> 26.0 (decrease) and watchOS 11.5 -> 26.0 (large increase). RHOIDSShared's Package.swift also moves .iOS(.v18) -> .iOS("26.0"); it isn't linked by any watchOS target so no .watchOS platform entry was added. project.yml edited, regenerated with the pinned XcodeGen 2.45.4. Diff is target-lines-only. Clean build on generic/iOS Simulator (RHOIDS scheme) and generic/watchOS (RHOIDSWatch target); no watchOS 27 runtime installed locally so device/simulator tests aren't possible here. Follow-up: dead-code recheck against the new 26.0 floor (not 27.0): - Sources/RHOIDS/Models/AlarmSound.swift:144 (iOS 15.2) - dead. - Sources/RHOIDSShieldConfiguration/FocusLockShieldConfig.swift:49,56 and Sources/RHOIDSShieldAction/FocusLockShieldAction.swift:31 (iOS 26.5) - still above the 26.0 floor, not dead. - Sources/Shared/AlarmKitService.swift:99 (iOS 26.1) - NOT dead at a 26.0 floor (26.1 > 26.0); the plan doc listed this as dead, which looks like an error - flagging for Darrow rather than silently correcting the plan. None of these guards were touched in this pass. Co-Authored-By: Claude Sonnet 5 --- RHOIDS.xcodeproj/project.pbxproj | 16 ++++++++-------- Sources/RHOIDSShared/Package.swift | 2 +- project.yml | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RHOIDS.xcodeproj/project.pbxproj b/RHOIDS.xcodeproj/project.pbxproj index 6029d72..ce964d2 100644 --- a/RHOIDS.xcodeproj/project.pbxproj +++ b/RHOIDS.xcodeproj/project.pbxproj @@ -1914,7 +1914,7 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RHOIDSWatch.app/RHOIDSWatch"; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Release; }; @@ -1947,7 +1947,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Release; }; @@ -1962,7 +1962,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Debug; }; @@ -2069,7 +2069,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Debug; }; @@ -2088,7 +2088,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Release; }; @@ -2125,7 +2125,7 @@ SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 4; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/RHOIDSWatch.app/RHOIDSWatch"; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Debug; }; @@ -2221,7 +2221,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 26.4; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; MARKETING_VERSION = 1.1.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -2285,7 +2285,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 26.4; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; MARKETING_VERSION = 1.1.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; diff --git a/Sources/RHOIDSShared/Package.swift b/Sources/RHOIDSShared/Package.swift index 8650ef9..5f84322 100644 --- a/Sources/RHOIDSShared/Package.swift +++ b/Sources/RHOIDSShared/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "RHOIDSShared", - platforms: [.iOS(.v18)], + platforms: [.iOS("26.0")], products: [ .library(name: "RHOIDSShared", targets: ["RHOIDSShared"]), ], diff --git a/project.yml b/project.yml index dccb981..8bc854f 100644 --- a/project.yml +++ b/project.yml @@ -10,7 +10,7 @@ options: settings: base: SWIFT_VERSION: 6.0 - IPHONEOS_DEPLOYMENT_TARGET: 26.4 + IPHONEOS_DEPLOYMENT_TARGET: 26.0 CODE_SIGN_STYLE: Automatic DEVELOPMENT_TEAM: HD39MR492X CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION: YES @@ -235,7 +235,7 @@ targets: - rhoids settings: base: - WATCHOS_DEPLOYMENT_TARGET: 11.5 + WATCHOS_DEPLOYMENT_TARGET: 26.0 PRODUCT_BUNDLE_IDENTIFIER: com.wesley.RHOIDS.watchkitapp ASSETCATALOG_COMPILER_APPICON_NAME: WatchAppIcon CODE_SIGN_ENTITLEMENTS: Sources/RHOIDSWatch/RHOIDSWatch.entitlements @@ -267,7 +267,7 @@ targets: NSExtensionPointIdentifier: com.apple.widgetkit-extension settings: base: - WATCHOS_DEPLOYMENT_TARGET: 11.5 + WATCHOS_DEPLOYMENT_TARGET: 26.0 PRODUCT_BUNDLE_IDENTIFIER: com.wesley.RHOIDS.watchkitapp.widget CODE_SIGN_ENTITLEMENTS: Sources/RHOIDSWatchWidget/RHOIDSWatchWidget.entitlements PRODUCT_NAME: "$(TARGET_NAME)" @@ -385,4 +385,4 @@ targets: settings: base: GENERATE_INFOPLIST_FILE: YES - WATCHOS_DEPLOYMENT_TARGET: 11.5 + WATCHOS_DEPLOYMENT_TARGET: 26.0 From 000cf0f6dba84659549a6fe2dd84aecfe5c81f64 Mon Sep 17 00:00:00 2001 From: Wesley Keetch Date: Sat, 26 Sep 2026 00:38:31 -0400 Subject: [PATCH 2/2] Fix leftover project-default deployment target in rhoids The prior commit (0fdbc92) updated the per-target settings.base overrides to 26.0 but missed project.yml's top-level `deploymentTarget` key (iOS 26.4, watchOS 11.5), which XcodeGen also uses for the project's default build configuration. That left a stray WATCHOS_DEPLOYMENT_TARGET = 11.5 in the generated pbxproj even though every target-level config was already correct. Regenerated with the pinned XcodeGen 2.45.4; diff is target-lines-only, no other keys touched. Verified no remaining 11.5/26.4 in the pbxproj. Clean build: RHOIDS scheme on generic/iOS Simulator, RHOIDSWatch target on generic/watchOS Simulator (no watchOS 27 runtime installed locally, so no on-device/simulator run). Co-Authored-By: Claude Sonnet 5 --- RHOIDS.xcodeproj/project.pbxproj | 4 ++-- project.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RHOIDS.xcodeproj/project.pbxproj b/RHOIDS.xcodeproj/project.pbxproj index ce964d2..af294ed 100644 --- a/RHOIDS.xcodeproj/project.pbxproj +++ b/RHOIDS.xcodeproj/project.pbxproj @@ -2231,7 +2231,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 6.0; VERSIONING_SYSTEM = "apple-generic"; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Debug; }; @@ -2294,7 +2294,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 6.0; VERSIONING_SYSTEM = "apple-generic"; - WATCHOS_DEPLOYMENT_TARGET = 11.5; + WATCHOS_DEPLOYMENT_TARGET = 26.0; }; name = Release; }; diff --git a/project.yml b/project.yml index 8bc854f..005f2e2 100644 --- a/project.yml +++ b/project.yml @@ -4,8 +4,8 @@ options: developmentLanguage: en knownRegions: [en, es, zh-Hans, ja, de, ko, fr, pt-BR, it, ru, ar, hi, tr] deploymentTarget: - iOS: 26.4 - watchOS: 11.5 + iOS: 26.0 + watchOS: 26.0 swiftVersion: 6.0 settings: base: