Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: convert Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas projects to use folders - WPB-15572 #2425

Merged
merged 32 commits into from
Feb 21, 2025
Merged

chore: convert Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas projects to use folders - WPB-15572 #2425

merged 32 commits into from
Feb 21, 2025

Conversation

caldrian
Copy link
Contributor

@caldrian caldrian commented Jan 24, 2025 •
edited
Loading

StoryWPB-15572 [iOS] Convert groups to folders

Issue

Fixes file locations, removes unused files, converts groups to folders in Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas.

Checklist

  • Title contains a reference JIRA issue number like [WPB-XXX].
  • Description is filled and free of optional paragraphs.
  • Adds/updates automated tests.

UI accessibility checklist

If your PR includes UI changes, please utilize this checklist:

  • Make sure you use the API for UI elements that support large fonts.
  • All colors are taken from WireDesign.ColorTheme or constructed using WireDesign.BaseColorPalette.
  • New UI elements have Accessibility strings for VoiceOver.

@echoes-hq echoes-hq bot added the echoes: technical-roadmap Work contributing to the Technical Roadmap, to improve our velocity or reduce the technical debt. label Jan 24, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 24, 2025 •
edited
Loading

Test Results

    7 files      7 suites   2m 43s ⏱️
2 341 tests 2 338 ✅ 2 💤 1 ❌
2 341 runs  2 339 ✅ 2 💤 0 ❌

For more details on these failures, see this check.

Results for commit df23f68.

♻️ This comment has been updated with latest results.

@caldrian caldrian changed the title chore: convert Wire Images project to use folders - WPB-15572 chore: convert Wire Images, Transport, Protos, MockTransport, Link Preview and Wire Canvas projects to use folders - WPB-15572 Jan 24, 2025
@caldrian caldrian marked this pull request as draft January 24, 2025 14:17
@caldrian caldrian marked this pull request as ready for review January 24, 2025 15:42
@wireapp wireapp deleted a comment from datadog-wireapp bot Feb 6, 2025
@caldrian
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
3369bfb 
…nup-wire-images-WPB-15572

# Conflicts:
#	wire-ios-images/WireImages.xcodeproj/project.pbxproj
@caldrian caldrian enabled auto-merge February 6, 2025 17:11
@caldrian
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
e6cad4d 
…nup-wire-images-WPB-15572
@caldrian
set marketing versions in frameworks
7ec1a75
@caldrian
Merge branch 'develop' of github.com:wireapp/wire-ios into chore/clea…
6495bb9 
…nup-wire-images-WPB-15572

# Conflicts:
#	wire-ios-transport/WireTransport.xcodeproj/project.pbxproj
@caldrian caldrian requested review from jullianm and netbe February 17, 2025 13:23
netbe
netbe requested changes Feb 18, 2025
View reviewed changes
Copy link
Collaborator

@netbe netbe left a comment

Choose a reason for hiding this comment

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

the removing of files looks fine. On the other hand I think there's a mixup across all projects with CURRENT_PROJECT_VERSION and MARKETING_VERSION for now, I would keep the current bundle version so we need to swap the two values mentioned above for generated info.plist.

Once we clean the hotfix patches of projects we can simplify or remove these versions (or wait for switching to SPM)

@caldrian
Copy link
Contributor Author

there's a mixup across all projects with CURRENT_PROJECT_VERSION and MARKETING_VERSION for now, I would keep the current bundle version so we need to swap the two values mentioned above for generated info.plist.

@netbe I think this deserves a separate ticket, reverting any changes related to Info.plist

@caldrian caldrian requested a review from netbe February 19, 2025 09:31
jullianm
jullianm approved these changes Feb 19, 2025
View reviewed changes
Copy link
Contributor

@jullianm jullianm left a comment

Choose a reason for hiding this comment

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

Looks good 👍 I'm approving considering François' comments regarding project settings will be taken into consideration as I'm less familiar with that topic.

netbe
netbe approved these changes Feb 20, 2025
View reviewed changes
Copy link
Collaborator

@netbe netbe left a comment

Choose a reason for hiding this comment

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

Looks good 🧹

@caldrian caldrian added this pull request to the merge queue Feb 21, 2025
Merged via the queue into develop with commit eb785ca Feb 21, 2025
16 checks passed
@caldrian caldrian deleted the chore/cleanup-wire-images-WPB-15572 branch February 21, 2025 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@netbe netbe netbe approved these changes

@jullianm jullianm jullianm approved these changes

Assignees

@caldrian caldrian

Labels
echoes: technical-roadmap Work contributing to the Technical Roadmap, to improve our velocity or reduce the technical debt.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caldrian @netbe @jullianm