Skip to content

Migrate main LoopFollow target to a synchronized folder group#702

Merged
marionbarker merged 4 commits into
devfrom
migrate-synchronized-groups
Jul 20, 2026
Merged

Migrate main LoopFollow target to a synchronized folder group#702
marionbarker merged 4 commits into
devfrom
migrate-synchronized-groups

Conversation

@bjorkert

Copy link
Copy Markdown
Member

Converts the main LoopFollow/ group to a PBXFileSystemSynchronizedRootGroup, so files are synced from disk instead of enumerated by hand. project.pbxproj drops from ~2900 to ~880 lines and stops generating merge conflicts when files are added, moved, or removed.

  • Sources shared with the Live Activity extension move to a new Shared/ folder referenced by both targets.
  • Info.plist is excluded from the copy phase via a membership exception.
  • Removes dead code that was on disk but never built: a stale duplicate RestartLiveActivityIntent, four unreferenced orphan files, and a Core Data model unused since the initial commit.

Builds clean via the workspace (app + embedded extension).

Convert the main LoopFollow/ group from explicit file enumeration to a
PBXFileSystemSynchronizedRootGroup so files are picked up from disk. This
shrinks project.pbxproj from ~2900 to ~880 lines and removes it as a source
of merge conflicts when files are added, moved, or deleted.

Shared LiveActivity/GlucoseConversion sources that also build into the Live
Activity extension are moved to a new Shared/ folder referenced by both
targets. Info.plist is kept out of the copy phase via a membership exception.

Also remove dead code that was on disk but never in the build: a stale
duplicate RestartLiveActivityIntent, four unreferenced orphan files, and a
leftover Core Data model unused since the initial commit.
bjorkert added 3 commits July 19, 2026 14:04
…roups

# Conflicts:
#	LoopFollow.xcodeproj/project.pbxproj
…roups

# Conflicts:
#	LoopFollow.xcodeproj/project.pbxproj
#	LoopFollow/LiveActivity/RestartLiveActivityIntent.swift
#	RestartLiveActivityIntent.swift
…roups

# Conflicts:
#	LoopFollow.xcodeproj/project.pbxproj

@marionbarker marionbarker left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve by test. Builds to iOS 18, iOS 26.
The Mac Catalyst build was fixed with PR #715. Apply that fix to this PR and builds to Mac Catalyst.

@marionbarker
marionbarker merged commit 0501faf into dev Jul 20, 2026
1 check passed
@marionbarker
marionbarker deleted the migrate-synchronized-groups branch July 20, 2026 00:41
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.

2 participants