Merge pull request fuji-mak#72 from hubeen/contrib/intel-compat

Add Intel Mac source-build compatibility

Author: fuji-mak

.github/workflows/ci.yml

@@ -33,6 +33,42 @@ jobs:
           zsh -n scripts/notarize-pkg.sh
           zsh -n scripts/uninstall.sh
 
+  intel-compatibility:
+    name: Intel x86_64 compatibility
+    runs-on: macos-15-intel
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Build and test x86_64
+        run: |
+          test "$(uname -m)" = "x86_64"
+          sw_vers
+          swift --version
+          xcodebuild -version
+          swift build -c release
+          swift test
+      - name: Verify deployment targets
+        run: |
+          file .build/release/Capsomnia | grep -q 'x86_64'
+          file .build/release/capsomnia-pmset | grep -q 'x86_64'
+          otool -l .build/release/Capsomnia | grep -A3 LC_BUILD_VERSION | grep -q 'minos 13.5'
+          otool -l .build/release/capsomnia-pmset | grep -A3 LC_BUILD_VERSION | grep -q 'minos 13.5'
+          test "$(/usr/libexec/PlistBuddy -c 'Print :LSMinimumSystemVersion' resources/Info.plist)" = '13.5'
+
+  swift-59-compatibility:
+    name: Swift 5.9 language compatibility
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Build and test with Xcode 15.2
+        run: |
+          sudo xcode-select -s /Applications/Xcode_15.2.app
+          swift --version | tee "$RUNNER_TEMP/swift-version"
+          grep -Eq 'Swift version 5\.9(\.| )' "$RUNNER_TEMP/swift-version"
+          xcodebuild -version | tee "$RUNNER_TEMP/xcode-version"
+          grep -q 'Xcode 15.2' "$RUNNER_TEMP/xcode-version"
+          swift build -c release
+          swift test
+
   site:
     name: GitHub Pages site
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to Capsomnia will be documented in this file.
 
 ## Unreleased
 
+- Add Intel Mac source-install support for macOS 13.5 or later with Swift 5.9, while keeping the signed and notarized package Apple silicon-only on macOS 14 or later.
+
 ## 3.0.0 - 2026-08-10
 
 - Add an optional auto-off timer with 15-minute through 8-hour presets, a one-minute to 24-hour custom picker, a live countdown, and an explicit restart action in Advanced Settings.

Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 5.9
 
 import PackageDescription
 
 let package = Package(
     name: "Capsomnia",
     platforms: [
-        .macOS(.v14)
+        .macOS("13.5")
     ],
     products: [
         .executable(name: "Capsomnia", targets: ["Capsomnia"]),
@@ -23,5 +23,5 @@ let package = Package(
             dependencies: ["Capsomnia"]
         )
     ],
-    swiftLanguageModes: [.v5]
+    swiftLanguageVersions: [.v5]
 )

README.ja.md

@@ -16,7 +16,7 @@
 <p align="center">
   <a href="https://github.com/fuji-mak/Capsomnia/actions/workflows/ci.yml"><img alt="CI" src="https://img.shields.io/github/actions/workflow/status/fuji-mak/Capsomnia/ci.yml?branch=main&style=flat-square&label=CI&labelColor=111111&color=b7ff3c"></a>
   <img alt="macOS 14+" src="https://img.shields.io/badge/macOS-14%2B-b7ff3c?style=flat-square&labelColor=111111">
-  <img alt="Swift 6" src="https://img.shields.io/badge/Swift-6-b7ff3c?style=flat-square&labelColor=111111">
+  <img alt="Swift 5.9+" src="https://img.shields.io/badge/Swift-5.9%2B-b7ff3c?style=flat-square&labelColor=111111">
   <a href="LICENSE"><img alt="MIT License" src="https://img.shields.io/badge/License-MIT-b7ff3c?style=flat-square&labelColor=111111"></a>
 </p>
 
@@ -44,7 +44,8 @@ Capsomnia 本体はネットワーク通信を行わず、テレメトリを収
 
 必要なもの:
 
-- Apple silicon Mac（macOS 14以降）
+- 署名済み upstream パッケージ: macOS 14 以降の Apple silicon Mac
+- ソースインストール: macOS 14 以降の Apple silicon Mac、またはmacOS 13.5 以降の Intel Mac
 - インストール時の管理者権限
 
 署名済みパッケージでインストール:
@@ -58,15 +59,15 @@ Capsomnia 本体はネットワーク通信を行わず、テレメトリを収
 
 ## ソースからビルド
 
-開発者向けのソースインストールも利用できます。こちらは Swift 6 toolchain が必要です。
+開発者向けのソースインストールは、macOS 14 以降の Apple silicon MacとmacOS 13.5 以降の Intel Macに対応します。Xcode 15以降に含まれるSwift 5.9以降のtoolchainが必要です。
 
 ```sh
 git clone https://github.com/fuji-mak/Capsomnia.git
 cd Capsomnia
 ./scripts/install.sh
 ```
 
-ソースインストーラはローカルで `Capsomnia.app` をビルドし、`~/Applications/` に配置します。あわせて、同じ helper、sudoers rule、ユーザー LaunchAgent を設定します。
+ソースインストーラはローカルで`Capsomnia.app`をビルドして`~/Applications/`へ配置し、限定的なhelperとsudoers ruleをインストールして、ユーザーLaunchAgentを起動します。署名・公証済みのリリースパッケージは引き続きApple silicon専用で、macOS 14以降が必要です。
 
 ## できること
 

README.ko.md

@@ -16,7 +16,7 @@
 <p align="center">
   <a href="https://github.com/fuji-mak/Capsomnia/actions/workflows/ci.yml"><img alt="CI" src="https://img.shields.io/github/actions/workflow/status/fuji-mak/Capsomnia/ci.yml?branch=main&style=flat-square&label=CI&labelColor=111111&color=b7ff3c"></a>
   <img alt="macOS 14+" src="https://img.shields.io/badge/macOS-14%2B-b7ff3c?style=flat-square&labelColor=111111">
-  <img alt="Swift 6" src="https://img.shields.io/badge/Swift-6-b7ff3c?style=flat-square&labelColor=111111">
+  <img alt="Swift 5.9+" src="https://img.shields.io/badge/Swift-5.9%2B-b7ff3c?style=flat-square&labelColor=111111">
   <a href="LICENSE"><img alt="MIT 라이선스" src="https://img.shields.io/badge/License-MIT-b7ff3c?style=flat-square&labelColor=111111"></a>
 </p>
 
@@ -44,7 +44,8 @@ Capsomnia 자체는 네트워크 요청을 보내지 않고, 텔레메트리를
 
 필요한 환경:
 
-- macOS 14 이상을 실행하는 Apple silicon Mac
+- 업스트림 서명 패키지: macOS 14 이상을 실행하는 Apple silicon Mac
+- 소스 설치: macOS 14 이상을 실행하는 Apple silicon Mac 또는 macOS 13.5 이상을 실행하는 Intel Mac
 - 설치할 때 사용할 관리자 권한
 
 서명된 패키지 설치 방법:
@@ -58,15 +59,15 @@ Capsomnia 자체는 네트워크 요청을 보내지 않고, 텔레메트리를
 
 ## 소스에서 빌드하기
 
-개발자용 소스 설치도 지원하며 Swift 6 툴체인이 필요합니다.
+개발자용 소스 설치는 macOS 14 이상의 Apple silicon Mac과 macOS 13.5 이상의 Intel Mac을 지원합니다. Xcode 15 이상에 포함된 Swift 5.9 이상의 툴체인이 필요합니다.
 
 ```sh
 git clone https://github.com/fuji-mak/Capsomnia.git
 cd Capsomnia
 ./scripts/install.sh
 ```
 
-소스 설치 프로그램은 `Capsomnia.app`을 로컬에서 빌드해 `~/Applications/`에 넣고, 같은 helper와 sudoers 규칙을 설치한 뒤 사용자 LaunchAgent를 시작합니다.
+소스 설치 프로그램은 로컬에서 `Capsomnia.app`을 빌드해 `~/Applications/`에 배치하고, 제한된 helper와 sudoers 규칙을 설치한 뒤 사용자 LaunchAgent를 시작합니다. 서명 및 공증된 릴리스 패키지는 계속 Apple silicon 전용이며 macOS 14 이상이 필요합니다.
 
 ## 작동 방식
 

README.md

@@ -16,7 +16,7 @@
 <p align="center">
   <a href="https://github.com/fuji-mak/Capsomnia/actions/workflows/ci.yml"><img alt="CI" src="https://img.shields.io/github/actions/workflow/status/fuji-mak/Capsomnia/ci.yml?branch=main&style=flat-square&label=CI&labelColor=111111&color=b7ff3c"></a>
   <img alt="macOS 14+" src="https://img.shields.io/badge/macOS-14%2B-b7ff3c?style=flat-square&labelColor=111111">
-  <img alt="Swift 6" src="https://img.shields.io/badge/Swift-6-b7ff3c?style=flat-square&labelColor=111111">
+  <img alt="Swift 5.9+" src="https://img.shields.io/badge/Swift-5.9%2B-b7ff3c?style=flat-square&labelColor=111111">
   <a href="LICENSE"><img alt="MIT License" src="https://img.shields.io/badge/License-MIT-b7ff3c?style=flat-square&labelColor=111111"></a>
 </p>
 
@@ -44,7 +44,8 @@ Capsomnia itself does not make network requests, collect telemetry, or require a
 
 Requirements:
 
-- Apple silicon Mac with macOS 14 or later
+- Signed upstream package: Apple silicon Mac with macOS 14 or later
+- Source install: Apple silicon Mac with macOS 14 or later, or Intel Mac with macOS 13.5 or later
 - Administrator access during installation
 
 Install the signed package:
@@ -58,15 +59,15 @@ The package build and install scripts are public in [`scripts/build-pkg.sh`](scr
 
 ## Build From Source
 
-Developer source install still works and requires a Swift 6 toolchain:
+Developer source installation supports Apple silicon Macs on macOS 14 or later and Intel Macs on macOS 13.5 or later. It requires Swift 5.9 or later, included with Xcode 15 or later:
 
 ```sh
 git clone https://github.com/fuji-mak/Capsomnia.git
 cd Capsomnia
 ./scripts/install.sh
 ```
 
-The source installer builds `Capsomnia.app` locally, places it in `~/Applications/`, installs the same helper and sudoers rule, and starts a user LaunchAgent.
+The source installer builds `Capsomnia.app` locally, places it in `~/Applications/`, installs the restricted helper and sudoers rule, and starts a user LaunchAgent. The signed and notarized release package remains Apple silicon-only and requires macOS 14 or later.
 
 ## What It Does
 

README.zh-Hans.md

@@ -16,7 +16,7 @@
 <p align="center">
   <a href="https://github.com/fuji-mak/Capsomnia/actions/workflows/ci.yml"><img alt="CI" src="https://img.shields.io/github/actions/workflow/status/fuji-mak/Capsomnia/ci.yml?branch=main&style=flat-square&label=CI&labelColor=111111&color=b7ff3c"></a>
   <img alt="macOS 14+" src="https://img.shields.io/badge/macOS-14%2B-b7ff3c?style=flat-square&labelColor=111111">
-  <img alt="Swift 6" src="https://img.shields.io/badge/Swift-6-b7ff3c?style=flat-square&labelColor=111111">
+  <img alt="Swift 5.9+" src="https://img.shields.io/badge/Swift-5.9%2B-b7ff3c?style=flat-square&labelColor=111111">
   <a href="LICENSE"><img alt="MIT 许可证" src="https://img.shields.io/badge/License-MIT-b7ff3c?style=flat-square&labelColor=111111"></a>
 </p>
 
@@ -46,7 +46,8 @@ Capsomnia本身不会发起网络请求、收集遥测数据，也不需要账
 
 要求：
 
-- 搭载Apple芯片、运行macOS 14或更高版本的Mac
+- 上游签名软件包：运行macOS 14或更高版本的Apple芯片Mac
+- 源代码安装：运行macOS 14或更高版本的Apple芯片Mac，或运行macOS 13.5或更高版本的Intel Mac
 - 安装时拥有管理员权限
 
 安装已签名的软件包：
@@ -60,15 +61,15 @@ Capsomnia本身不会发起网络请求、收集遥测数据，也不需要账
 
 ## 从源代码构建
 
-开发者仍可从源代码安装，需要Swift 6工具链：
+开发者源代码安装支持运行macOS 14或更高版本的Apple芯片Mac，以及运行macOS 13.5或更高版本的Intel Mac。需要Xcode 15或更高版本附带的Swift 5.9或更高版本工具链：
 
 ```sh
 git clone https://github.com/fuji-mak/Capsomnia.git
 cd Capsomnia
 ./scripts/install.sh
 ```
 
-源代码安装器会在本地构建`Capsomnia.app`，将其放入`~/Applications/`，安装同样的辅助程序和sudoers规则，并启动用户LaunchAgent。
+源代码安装程序会在本地构建`Capsomnia.app`，将其放入`~/Applications/`，安装权限受限的辅助程序和sudoers规则，并启动用户LaunchAgent。已签名并经过公证的发布软件包仍仅支持Apple芯片，并要求macOS 14或更高版本。
 
 ## 功能
 

Tests/CapsomniaTests/SettingsWindowControllerTests.swift

@@ -23,7 +23,9 @@ final class SettingsWindowControllerTests: XCTestCase {
         let contentView = try XCTUnwrap(controller.window?.contentView)
         contentView.layoutSubtreeIfNeeded()
 
-        var renderedText = Set(visibleDescendants(of: contentView).map(\NSTextField.stringValue))
+        var renderedText = Set(
+            (visibleDescendants(of: contentView) as [NSTextField]).map(\.stringValue)
+        )
         XCTAssertTrue(renderedText.contains(strings.initialPreferencesHeading))
         XCTAssertTrue(renderedText.contains(strings.dedicatedCapsLockMode))
         XCTAssertFalse(renderedText.contains(strings.preferencesHeading))
@@ -39,7 +41,9 @@ final class SettingsWindowControllerTests: XCTestCase {
         controller.show(page: .settings)
         contentView.layoutSubtreeIfNeeded()
 
-        renderedText = Set(visibleDescendants(of: contentView).map(\NSTextField.stringValue))
+        renderedText = Set(
+            (visibleDescendants(of: contentView) as [NSTextField]).map(\.stringValue)
+        )
         XCTAssertTrue(renderedText.contains(strings.preferencesHeading))
         XCTAssertFalse(renderedText.contains(strings.displaySleepOnLidClose))
         XCTAssertFalse(renderedText.contains(strings.openAtLogin))
@@ -155,7 +159,7 @@ final class SettingsWindowControllerTests: XCTestCase {
         XCTAssertEqual(advancedWindow.title, strings.advancedSettings)
 
         let visibleLabels: [NSTextField] = visibleDescendants(of: contentView)
-        let renderedText = Set(visibleLabels.map(\NSTextField.stringValue))
+        let renderedText = Set(visibleLabels.map { $0.stringValue })
         for expected in [
             strings.advancedSettings,
             strings.preferencesHeading.uppercased(),

resources/Info.plist

@@ -34,7 +34,7 @@
   <string>3.0.0</string>
 
   <key>LSMinimumSystemVersion</key>
-  <string>14.0</string>
+  <string>13.5</string>
 
   <key>LSUIElement</key>
   <true/>