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.

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

Fix diff for multiple platform filters #132

Merged
merged 1 commit into from
Jan 18, 2024

Conversation

kwridan
Copy link
Contributor

@kwridan kwridan commented Dec 15, 2023

Issue number of the reported bug or feature request: #130

resolves: #130

Describe your changes

  • Multiple platform filters can now be applied to build files in Xcode
  • This includes most build files available in the various build phases (e.g. sources, resources, headers, linked, etc...)
  • A build file diff helper was introduced to allow adding the platform diff to the the existing comparators
  • Tests and fixtures were updated to account for multiple platform filters

Testing performed

  • Run xcdiff against the new fixtures, inspect and verify the results
swift run xcdiff -p1 Fixtures/app_with_platform_filters_1/AppWithPlatformFilters.xcodeproj -p2 Fixtures/app_with_platform_filters_2/AppWithPlatformFilters.xcodeproj -v

Copy link

codecov bot commented Dec 15, 2023

Codecov Report

Attention: 37 lines in your changes are missing coverage. Please review.

Comparison is base (f1d3be0) 97.04% compared to head (4e1794c) 95.99%.

❗ Current head 4e1794c differs from pull request most recent head fd1d07f. Consider uploading reports for the commit fd1d07f to get more accurate results

Files Patch % Lines
...ces/XCDiffCore/Library/Comparator+Extensions.swift 0.00% 33 Missing ⚠️
...Core/Comparator/LinkedDependenciesComparator.swift 92.30% 2 Missing ⚠️
Sources/XCDiffCore/Library/TargetsHelper.swift 95.91% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #132      +/-   ##
==========================================
- Coverage   97.04%   95.99%   -1.06%     
==========================================
  Files          50       52       +2     
  Lines        2874     3019     +145     
==========================================
+ Hits         2789     2898     +109     
- Misses         85      121      +36     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kwridan kwridan force-pushed the fix/multiple-platform-filters branch from 5664205 to 4e1794c Compare December 15, 2023 11:14
resolves: bloomberg#130

- Multiple platform filters can now be applied to build files in Xcode
- This includes most build files available in the various build phases (e.g. sources, resources, headers, linked,  etc...)
- A build file diff helper was introduced to allow adding the platform diff to the the existing comparators
- Tests and fixtures were updated to account for multiple platform filters

Test Plan:

- Run xcdiff against the new fixtures, inspect and verify the results

```sh
swift run xcdiff -p1 Fixtures/app_with_platform_filters_1/AppWithPlatformFilters.xcodeproj -p2 Fixtures/app_with_platform_filters_2/AppWithPlatformFilters.xcodeproj -v
```

Signed-off-by: Kassem Wridan <[email protected]>
@kwridan kwridan force-pushed the fix/multiple-platform-filters branch from 4e1794c to fd1d07f Compare January 15, 2024 09:25
@kwridan
Copy link
Contributor Author

kwridan commented Jan 15, 2024

@marciniwanicki this should now be ready :)

Copy link
Contributor

@marciniwanicki marciniwanicki left a comment

Choose a reason for hiding this comment

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

Looks great 👍 Thanks @kwridan

@kwridan kwridan merged commit c48fb45 into bloomberg:main Jan 18, 2024
3 checks passed
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.

Platform filters are not taken into account when diffing projects
2 participants