diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bb54b5..8ba5326 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,14 +8,14 @@ on: jobs: build: - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v4 - - name: Select Xcode 16 (Swift 6.1 for PermissionFlow) + - name: Select Xcode 26.3 (PermissionFlow needs swift-tools-version 6.2) uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16' + xcode-version: '26.3' - name: Build Aware run: | diff --git a/.github/workflows/publish-appcast.yml b/.github/workflows/publish-appcast.yml index 44de1f1..90b22a7 100644 --- a/.github/workflows/publish-appcast.yml +++ b/.github/workflows/publish-appcast.yml @@ -15,14 +15,14 @@ permissions: jobs: build-appcast: - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v4 - - name: Select Xcode 16 (Swift 6.1 for PermissionFlow) + - name: Select Xcode 26.3 (PermissionFlow needs swift-tools-version 6.2) uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16' + xcode-version: '26.3' - name: Resolve Sparkle tools run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 083120c..8fc02e0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,16 +15,16 @@ env: jobs: build: - runs-on: macos-15 + runs-on: macos-26 outputs: sparkle_enabled: ${{ steps.sparkle_settings.outputs.enabled }} steps: - uses: actions/checkout@v4 - - name: Select Xcode 16 (Swift 6 for DMGMaker, 6.1 for PermissionFlow) + - name: Select Xcode 26.3 (PermissionFlow needs swift-tools-version 6.2) uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16' + xcode-version: '26.3' - name: Determine Sparkle publishing settings id: sparkle_settings @@ -49,7 +49,7 @@ jobs: - name: Build release run: | xcodebuild -scheme Aware -configuration Release -derivedDataPath build \ - build -quiet + ARCHS="arm64 x86_64" ONLY_ACTIVE_ARCH=NO build -quiet - name: Create DMG with DMGMaker run: | diff --git a/AGENTS.md b/AGENTS.md index c907946..8df0dd5 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -49,4 +49,15 @@ Repo-agnostic skills (`sharpen-the-tip`, `prototype-mode`, `housekeeping`, `proa - Before reporting a commit as missing required provenance fields, verify against the exact commit messages as they exist on GitHub. If the fields are present, do not claim they are missing. - The provenance contract is defined in `records/REPO.md` and enforced by `scripts/new-commit-message.sh`. Cite the specific field that is missing and the rule it violates; do not review commits against an assumed format. - \ No newline at end of file + + +## Local Divergence + +- Build verification: `xcodebuild -scheme Aware -configuration Debug -derivedDataPath build build` +- PermissionFlow comes from upstream jaywcjlove/PermissionFlow, pinned to v2.11.2, and requires Xcode 26+ to resolve (its manifest uses `swift-tools-version: 6.2`). The old LPFchan/PermissionFlow fork exists for reference: it carried a `@Sendable` fix in `SettingsNavigator` without which apps built with Xcode 16's SDK crash opening System Settings. If the build ever drops back to Xcode 16, restore the fork or re-apply that fix. +- Commit provenance setup: `scripts/install-hooks.sh` configures the tracked `commit-msg` hook locally. +- Commit provenance checks: `scripts/check-commit-standards.sh ` and `scripts/check-commit-range.sh ` +- There is no dedicated automated test suite in the repo today. For runtime changes, use the build plus focused manual validation. +- Preserve the product and workflow constraints in `records/SPEC.md`: menu bar-only UX, local presence detection, no telemetry or analytics, and safe failure when camera access is denied or unavailable. +- `AWARE-AGENT-PROMPT.md` is a legacy bootstrap helper. Do not treat it as a second policy layer. +- `upstream-intake/` is omitted in Aware because the repo does not currently track upstream review. diff --git a/Aware.xcodeproj/project.pbxproj b/Aware.xcodeproj/project.pbxproj index 8f55407..0ec4567 100644 --- a/Aware.xcodeproj/project.pbxproj +++ b/Aware.xcodeproj/project.pbxproj @@ -359,10 +359,10 @@ }; F5A6B7C80001 /* XCRemoteSwiftPackageReference "PermissionFlow" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/LPFchan/PermissionFlow"; + repositoryURL = "https://github.com/jaywcjlove/PermissionFlow"; requirement = { kind = exactVersion; - version = "2.11.2-swift6.1.1"; + version = "2.11.2"; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/Aware.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Aware.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 9a27067..0802a7b 100644 --- a/Aware.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Aware.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,13 +1,13 @@ { - "originHash" : "af57ec271e51d6743d8d5de17d0378c5c593331081bd3c110c5ca46764ecc95b", + "originHash" : "8545bb74948975b3cfec42d80d499dcc86f5a1014cba74c9e2c97a21fa9d4227", "pins" : [ { "identity" : "permissionflow", "kind" : "remoteSourceControl", - "location" : "https://github.com/LPFchan/PermissionFlow", + "location" : "https://github.com/jaywcjlove/PermissionFlow", "state" : { - "revision" : "9ac6e773bf21df8693d7a93f7e0775e8db2a6db6", - "version" : "2.11.2-swift6.1.1" + "revision" : "2f2a4b76b1eb2ff7ab815b977be8229853f10bf8", + "version" : "2.11.2" } }, {