Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .claude/agents/ios-principal-engineer.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ CLAUDE.md is the constitution; the rules files hold the detail. Read the relevan
- `.claude/rules/git-workflow.md` — branches, commits, the gate
- `.claude/rules/anti-hallucination.md` — verification contract

**Branch discipline**: Branch off `develop`. Format: `feature/<description>`, `fix/<description>`, `refactor/<description>`.
**Branch discipline**: Branch off `release/v5`. Format: `feature/<description>`, `fix/<description>`, `refactor/<description>`.

**Build commands**: ALWAYS use `-skipPackagePluginValidation -skipMacroValidation` and target `iPhone 17 Pro` simulator:
```bash
Expand Down Expand Up @@ -98,7 +98,7 @@ Co-Authored-By: Claude <noreply@anthropic.com>
Before you declare any task complete, verify ALL of the following. If any item fails, fix it before proceeding:

- [ ] Read existing code in the affected area first
- [ ] On a feature/fix branch off `develop` (not main, not release)
- [ ] On a feature/fix branch off `release/v5` (not main, not another release line)
- [ ] Naming matches existing codebase conventions exactly
- [ ] No duplicate utilities — reused existing helpers
- [ ] Card system used correctly (NewsCard for news, AdaptivePodcastCardView for podcasts, GlassCardView for videos)
Expand Down Expand Up @@ -128,7 +128,7 @@ Handle edge cases: empty states, nil values, large data sets, iPad vs iPhone lay
1. **Understand** — Parse the request. Identify the affected modules, files, and patterns.
2. **Read** — Read all relevant existing code. At minimum 3-5 related files.
3. **Plan** — State your approach briefly. Identify what you'll create, modify, or delete.
4. **Branch** — Create or verify you're on the correct feature/fix branch off `develop`.
4. **Branch** — Create or verify you're on the correct feature/fix branch off `release/v5`.
5. **Implement** — Write code that follows every pattern and rule above.
6. **Verify** — Run the self-verification checklist. Review all changes for obvious comments, hardcoded values.
7. **Quality gates** — Build, test, lint. Fix any failures.
Expand Down
2 changes: 1 addition & 1 deletion .claude/rules/git-workflow.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Branches

- `feature/<description>`, `fix/<description>`, `hotfix/<description>`, `docs/<description>`, `refactor/<description>`
- Branch off `develop`; releases land on `release/v5`. Never commit directly to a release branch.
- Branch off `release/v5`; releases land on `release/v5`.
- One logical change per branch; keep diffs reviewable.

## Commits / PR titles
Expand Down
2 changes: 1 addition & 1 deletion .claude/skills/ios-dod/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ swiftlint lint --config ./.swiftlint.yml --strict
- [ ] New tests use Swift Testing (`@Suite`, `@Test`, `#expect`)

### Git Workflow
- [ ] On feature/fix branch off `develop`
- [ ] On feature/fix branch off `release/v5`
- [ ] Committed with Conventional Commits format:
```
feat(scope): description
Expand Down
6 changes: 3 additions & 3 deletions .claude/skills/ios-start/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ Before implementing new functionality, ALWAYS read and understand how similar fe

### 5. Set Up Feature Branch
```bash
git checkout develop
git pull origin develop
git checkout release/v5
git pull origin release/v5
git checkout -b feature/short-description
git branch --show-current
```
Expand Down Expand Up @@ -147,7 +147,7 @@ Stop and rethink if:

## Ready to Start?

- [ ] Feature branch created off `develop`
- [ ] Feature branch created off `release/v5`
- [ ] Existing code reviewed (no duplication)
- [ ] Architecture designed
- [ ] Card system understood for this content type
Expand Down
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Run `/ios-dod` for the full checklist.

## Conventions

- **Branches:** `feature/…`, `fix/…`, `hotfix/…`, `docs/…`, `refactor/…` — off `develop`;
- **Branches:** `feature/…`, `fix/…`, `hotfix/…`, `docs/…`, `refactor/…` — off `release/v5`;
releases land on `release/v5`.
- **Commits/PR titles** (CI-enforced): `feat(scope): description` · `fix(#123): description`
(bug fixes MUST include the issue number). Types: feat, fix, docs, style, refactor, perf,
Expand Down
1 change: 1 addition & 0 deletions MacMagazine/MacMagazine/MainApp/MacMagazineApp.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ struct SceneView: View {
viewModel.deepLinkPostURL = nil
}
.modelContainer(viewModel.storage.sharedModelContainer)
.environment(\.removeAds, viewModel.settingsViewModel.removeAds)
.environmentObject(viewModel.analytics)
}
}
Expand Down
Loading