chore: drop iOS 18–25 / non-iPhone support, require iOS 26

Two related cleanups the user asked for in one shot:

1. iPhone-only is now enforced at every target — Mac Catalyst and
   visionOS were never configured in `project.yml`, but the
   `OSGKeyboardShared` framework and the two test bundles were
   still defaulting to `TARGETED_DEVICE_FAMILY = "1,2"` (iPhone +
   iPad). All four targets now explicitly set `"1"`. SDK is
   `iphoneos` for everyone, no `xros` / `macosx`.

2. Deployment target bumped from iOS 18.0 to iOS 26.0 across the
   board (`project.yml` + the ext's per-target setting). With
   iOS 26 as the floor, the iOS 18–25 SFSpeechRecognizer path
   became dead code and several `#available` checks became
   always-true. Removed:

   - `AppleSpeechASR` (the entire SFSpeechRecognizer-based ASR
     backend) and the `#available(iOS 26.0, *)` factory branch.
     `ASRServiceFactory.make()` now returns `SpeechAnalyzerASR()`
     directly. SpeechAnalyzer is always fully on-device, which
     also made the `requiresOnDevice` flag meaningless.
   - `requiresOnDevice` from the `ASRService.transcribe` protocol
     signature, from `ProviderConfig`, `AppGroupStore`,
     `KeyboardState`, `AppGroupPersistor`, and the ext's
     `KeyboardViewController` (`state.requiresOnDevice`,
     `state.setRequiresOnDevice`, `persistRequiresOnDevice`).
   - `#available(iOS 17.0, *)` branch in
     `PreviewASRController.requestMicrophonePermission` and the
     ext's `PermissionManager.requestMicPermission` — both now
     just call the iOS 17+ `AVAudioApplication` API directly.
   - The `else` (iOS 18–25) branch in `SettingsView.asrEngineRow`
     — the on-device-only toggle is gone, the row is a static
     "SpeechAnalyzer active" badge. Same for the `else` branch
     in `EnginePickerSection.localSubtitle`.
   - `makeMicAuthHandler` (the iOS < 17 mic permission callback
     wrapper) from `PreviewASRController`.

   No `#available` / `@available` checks remain in the codebase
   except for the SpeechAnalyzer class itself (now unnecessary
   too, but kept for clarity — `AVAudioApplication` and
   `SpeechAnalyzer` are both iOS 17+ / iOS 26+ respectively,
   and the deployment target of 26 makes the explicit
   `@available` redundant; I left the SpeechAnalyzer class
   un-`@available` and removed the `@available(iOS 26.0, *)`
   decoration since it's no longer needed).

   The Keyboard ext's existing ASRService usage
   (`asr.transcribe(stream:locale:)`) is unchanged at the
   call-site level — just the third argument is gone.

3. Updated `info.plist` UISupportedInterfaceOrientations is
   already `[UIInterfaceOrientationPortrait]` only, which is
   correct for an iPhone-only app; no change needed.

Build: BUILD SUCCEEDED.
Tests: 22/22 pass.
Verified: `TARGETED_DEVICE_FAMILY = 1` on all four targets,
`SDKROOT = iphoneos` on all four.

🤖 Generated with Claude Code
This commit is contained in:
Rocky
2026-06-18 20:24:26 +08:00
parent a803a27a88
commit 81581f0e5f
11 changed files with 85 additions and 291 deletions
+1 -8
View File
@@ -86,7 +86,6 @@ public final class KeyboardViewController: UIInputViewController {
state.openSettings = { [weak self] in self?.openHostApp() }
state.setMode = { [weak self] m in self?.persistMode(m) }
state.setLocale = { [weak self] l in self?.persistLocale(l) }
state.setRequiresOnDevice = { [weak self] v in self?.persistRequiresOnDevice(v) }
state.setEngineMode = { [weak self] m in self?.persistEngineMode(m) }
state.insertNewline = { [weak self] in self?.textDocumentProxy.insertText("\n") }
state.insertSpace = { [weak self] in self?.textDocumentProxy.insertText(" ") }
@@ -185,8 +184,7 @@ public final class KeyboardViewController: UIInputViewController {
let locale = resolveLocale(state.localeId)
let events = asr.transcribe(
stream: session.audio,
locale: locale,
requiresOnDevice: state.requiresOnDevice
locale: locale
)
asrTask = Task { @MainActor [weak self] in
@@ -334,11 +332,6 @@ public final class KeyboardViewController: UIInputViewController {
persistor.persist(localeId: id)
}
private func persistRequiresOnDevice(_ value: Bool) {
state.requiresOnDevice = value
persistor.persist(requiresOnDevice: value)
}
private func persistEngineMode(_ mode: String) {
state.engineMode = mode
persistor.persist(engineMode: mode)
@@ -32,7 +32,6 @@ public struct AppGroupPersistor {
let store = AppGroupStore()
state.localeId = store.localeId
state.mode = KeyboardViewController.State.InputMode(rawValue: store.modeId) ?? .polish
state.requiresOnDevice = store.requiresOnDevice
state.engineMode = store.engineMode
#if DEBUG
@@ -71,11 +70,6 @@ public struct AppGroupPersistor {
AppGroupStore().setLocaleId(localeId)
}
/// Persist the `requiresOnDevice` flag to the App Group store.
public func persist(requiresOnDevice: Bool) {
AppGroupStore().setRequiresOnDevice(requiresOnDevice)
}
/// Persist `engineMode` to the App Group store.
public func persist(engineMode: String) {
AppGroupStore().setEngineMode(engineMode)
+15 -31
View File
@@ -25,43 +25,27 @@ public final class PermissionManager: @unchecked Sendable {
private var didRequestMicOnce: Bool = false
/// Request microphone access. Returns true if granted (already or
/// after this call). iOS 17 uses `AVAudioApplication.recordPermission`;
/// older systems fall back to `AVAudioSession.recordPermission`.
/// after this call). Uses the iOS 17+ `AVAudioApplication` API.
public func requestMicPermission() async -> Bool {
if #available(iOS 17.0, *) {
switch AVAudioApplication.shared.recordPermission {
case .granted: return true
case .denied: return false
case .undetermined:
if !didRequestMicOnce {
didRequestMicOnce = true
return await AVAudioApplication.requestRecordPermission()
}
return false
@unknown default: return false
}
} else {
let session = AVAudioSession.sharedInstance()
switch session.recordPermission {
case .granted: return true
case .denied: return false
case .undetermined:
if !didRequestMicOnce {
didRequestMicOnce = true
return await withCheckedContinuation { cont in
session.requestRecordPermission { cont.resume(returning: $0) }
}
}
return false
@unknown default: return false
switch AVAudioApplication.shared.recordPermission {
case .granted: return true
case .denied: return false
case .undetermined:
if !didRequestMicOnce {
didRequestMicOnce = true
return await AVAudioApplication.requestRecordPermission()
}
return false
@unknown default: return false
}
}
/// Request Speech Recognition permission. Returns true if granted
/// (already or after this call). For iOS 18 SFSpeechRecognizer this
/// is required before recognition can begin; for iOS 26 SpeechAnalyzer
/// the framework prompts on first use, so this call is a no-op there.
/// (already or after this call). The `SFSpeechRecognizer` plist
/// key + this call are still required even on iOS 26 the
/// `SpeechAnalyzer` API does not expose an explicit request
/// method of its own and the framework checks the same TCC
/// entry on first use.
public func requestSpeechPermission() async -> Bool {
await withCheckedContinuation { (cont: CheckedContinuation<Bool, Never>) in
SFSpeechRecognizer.requestAuthorization { status in