Skip to content

Fix XcodeGen project drift#793

Merged
FuJacob merged 1 commit into
mainfrom
codex/fix-xcodegen-drift
Jul 16, 2026
Merged

Fix XcodeGen project drift#793
FuJacob merged 1 commit into
mainfrom
codex/fix-xcodegen-drift

Conversation

@FuJacob

@FuJacob FuJacob commented Jul 16, 2026

Copy link
Copy Markdown
Owner

Summary

Regenerate the committed Xcode project so it includes OllamaPreloadWorkControllerTests.swift, matching the CotabbyTests directory declared by project.yml. This restores the XcodeGen drift gate on main after the compatibility revert removed the generated test reference.

Validation

  • xcodegen generate twice; the second generation produced byte-identical project output
  • swiftlint lint --quiet; exit 0
  • xcodebuild -project Cotabby.xcodeproj -scheme Cotabby -destination 'platform=macOS' build -derivedDataPath build/DerivedData; BUILD SUCCEEDED
  • xcodebuild -project Cotabby.xcodeproj -scheme Cotabby -destination 'platform=macOS' build-for-testing -derivedDataPath build/DerivedData; TEST BUILD SUCCEEDED

Linked issues

None.

Risk / rollout notes

Generated-project-only change. It restores one existing test file to the CotabbyTests target and does not change production runtime behavior.

Greptile Summary

This PR regenerates the committed Xcode project to restore OllamaPreloadWorkControllerTests.swift to the CotabbyTests target after a compatibility revert dropped the generated reference. The file exists on disk at CotabbyTests/OllamaPreloadWorkControllerTests.swift and is covered by the path: CotabbyTests declaration in project.yml.

  • Adds four consistent PBX entries in project.pbxproj: a PBXFileReference, a group child entry, a PBXBuildFile, and a Sources build phase reference — all with unique UUIDs and correct cross-references.
  • No production code is changed; this is a generated-file-only update that restores the XcodeGen drift gate to a passing state.

Confidence Score: 5/5

Safe to merge — only adds the missing test file reference back to the generated project, with no changes to production code.

The change is purely regenerated project scaffolding. The test file already exists on disk and is declared in project.yml; the four new PBX entries are structurally correct with unique UUIDs and consistent cross-references. No production logic, build settings, or existing entries are touched.

No files require special attention.

Important Files Changed

Filename Overview
Cotabby.xcodeproj/project.pbxproj Adds four PBX entries to include OllamaPreloadWorkControllerTests.swift in the CotabbyTests target: PBXFileReference, group child, PBXBuildFile, and Sources build phase entry — all consistent and UUID-unique.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[project.yml\nCotabbyTests source: CotabbyTests/] --> B[xcodegen generate]
    B --> C[project.pbxproj]
    C --> D{OllamaPreloadWorkControllerTests.swift\nreferenced?}
    D -- Before PR: NO --> E[XcodeGen drift gate fails\nTest file on disk but not in target]
    D -- After PR: YES --> F[CotabbyTests target\nincludes all sources]
    F --> G[Drift gate passes\nBuild & test succeed]
Loading
%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
flowchart TD
    A[project.yml\nCotabbyTests source: CotabbyTests/] --> B[xcodegen generate]
    B --> C[project.pbxproj]
    C --> D{OllamaPreloadWorkControllerTests.swift\nreferenced?}
    D -- Before PR: NO --> E[XcodeGen drift gate fails\nTest file on disk but not in target]
    D -- After PR: YES --> F[CotabbyTests target\nincludes all sources]
    F --> G[Drift gate passes\nBuild & test succeed]
Loading

Reviews (1): Last reviewed commit: "Fix XcodeGen project drift" | Re-trigger Greptile

@FuJacob FuJacob merged commit eccb788 into main Jul 16, 2026
5 checks passed
@FuJacob FuJacob deleted the codex/fix-xcodegen-drift branch July 16, 2026 05:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant