Skip to content

Fixes for the xcodeproj file#133

Merged
freak4pc merged 8 commits intoCombineCommunity:mainfrom
jasdeepsaini:fix-xcodeproj
Jul 25, 2022
Merged

Fixes for the xcodeproj file#133
freak4pc merged 8 commits intoCombineCommunity:mainfrom
jasdeepsaini:fix-xcodeproj

Conversation

@jasdeepsaini
Copy link
Contributor

@jasdeepsaini jasdeepsaini commented Jul 12, 2022

Fixes to get the project and tests to build:

  • Deleted the missing MapTo and MapToTests files.
  • Change the deployment target for the CombineExtTests target to 13.0 so the latest version of CombineSchedulers can be used.
  • Removed CombineSchedulers from the CombineExt target and added it to CombineExtTests. This allows the project to build since CombineExt supports iOS 10.0 and CombineSchedulers requires iOS 13.
  • Updated the CombineSchedulers package to 0.5.3 to match the Package file.
  • The Package.resolved file automatically got updated to v2 since I am using Xcode 13.

Project cleanup

  • Deleted the missing Carthage and CHANGELOG.MD files.

Missing library and test files added to the project:

  • MapToValue.swift
  • MapToValueTests.swift
  • MapToResult.swift
  • MapToResultTests.swift
  • Enumerated.swift
  • EnumeratedTests.swift

- Deleted the missing `MapTo` and `MapToTests` files.
- Changed the deployment target to iOS 13 to match the minimum target of the Package file.
- Updated the CombineSchedulers package to 0.5.3 to match the Package file.
- The Package.resolved file automatically got updated to v2 since I am using Xcode 13.

Project cleanup
- Deleted the missing `Carthage` and `CHANGELOG.MD` files.

Missing library and test files added to the project:
- `MapToValue.swift`
- `MapToValueTests.swift`
- `MapToResult.swift`
- `MapToResultTests.swift`
- `Enumerated.swift`
- `EnumeratedTests.swift`
DerivedData/
Carthage
CombineExt.framework.zip No newline at end of file
CombineExt.framework.zip
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think the .DS_Store file should be added to .gitignore, but I didn't make that change in this PR. Is there a reason to commit this file?

Copy link
Member

Choose a reason for hiding this comment

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

Would be great to add it ! Thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@jasdeepsaini jasdeepsaini marked this pull request as ready for review July 12, 2022 03:23
@freak4pc
Copy link
Member

I'll tryto find some time to review this - I'll start by saying I'd prefer keeping the deployment target low (iOS 10 or 11), because thjere could be some older codebases that don't necessarily use Combine all over the place but can still benefit from using CombineExt in some places that are guarded by availability clauses.

@jasdeepsaini
Copy link
Contributor Author

I'll tryto find some time to review this - I'll start by saying I'd prefer keeping the deployment target low (iOS 10 or 11), because thjere could be some older codebases that don't necessarily use Combine all over the place but can still benefit from using CombineExt in some places that are guarded by availability clauses.

The deployment target is an issue if you want to use the latest version of Combine-Schedulers which requires iOS 13. With the lower deployment target, the library and unit tests won't build. The Package.swift file has a minimum iOS version of 13 so older projects won't be able to pull in this package.

@freak4pc
Copy link
Member

I'll have to look. I'm not sure if there's a way to give a different deploymetn target to the test target.

@freak4pc
Copy link
Member

Anyways if that's the case we can leave the old version of combine-schedulers, It's just a test utility so I'm not sure it matters too much.

- Change the deployment target for the CombineExtTests target to 13.0.
- Removed CombineSchedulers from the CombineExt target and added it to CombineExtTests.
@jasdeepsaini
Copy link
Contributor Author

Anyways if that's the case we can leave the old version of combine-schedulers, It's just a test utility so I'm not sure it matters too much.

I reverted the deployment target of CombineExt to iOS 10.0 and changed the deployment target of CombineExtTests to iOS 13.0. Then I moved the CombineSchedulers package from CombineExt to CombineExtTests.

This should do what you wanted while allowing tests to be run if CombineExt is modified in Xcode instead of the command line.

@freak4pc
Copy link
Member

LGTM. Let's just fix the conflicts :)
(Or add DS_Store to .gitignore which would be even better)

@jasdeepsaini
Copy link
Contributor Author

LGTM. Let's just fix the conflicts :)
(Or add DS_Store to .gitignore which would be even better)

I added .DS_Store to .gitignore.

@codecov
Copy link

codecov bot commented Jul 25, 2022

Codecov Report

Merging #133 (1cd51ba) into main (5c17b57) will not change coverage.
The diff coverage is n/a.

❗ Current head 1cd51ba differs from pull request most recent head 72e610b. Consider uploading reports for the commit 72e610b to get more accurate results

@@           Coverage Diff           @@
##             main     #133   +/-   ##
=======================================
  Coverage   95.51%   95.51%           
=======================================
  Files          70       70           
  Lines        4166     4166           
=======================================
  Hits         3979     3979           
  Misses        187      187           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5c17b57...72e610b. Read the comment docs.

@freak4pc freak4pc merged commit 047d9bc into CombineCommunity:main Jul 25, 2022
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