Skip to content

Feature/issue 529 update pods#535

Merged
tomholub merged 6 commits intomasterfrom
feature/issue-529-update-pods
Sep 24, 2021
Merged

Feature/issue 529 update pods#535
tomholub merged 6 commits intomasterfrom
feature/issue-529-update-pods

Conversation

@sosnovsky
Copy link
Collaborator

@sosnovsky sosnovsky commented Sep 24, 2021

This PR includes:

  • all pods and gems updated to the latest versions
  • use Swift Package Manager for mailcore2 library (Cocoapods version doesn't work on M1 Macs)
  • building and running tests fixed for M1 Macs
  • swiftformat is used from embedded pod (instead of system one). This change is recommended in swiftformat repository - https://github.com/nicklockwood/SwiftFormat#alternative-locally-installed-swiftformat, as previous config could lead to inconsistencies in formatting for different team members (initially swiftformat failed to run for me, possibly because I'm using zsh instead of bash and Xcode failed to find system swiftformat)

close #529
close #285 // edited tom - this also fixed this issue
close #302 // edited tom - also this


Tests:

  • I ran unit_tests - all tests passed
  • wasn't able to run UI tests as I need flowcrypt-ios/FlowCryptUITests/test-ci-secrets.json file

To be filled by reviewers

I have reviewed that this PR... (tick whichever items you personally focused on during this review):

  • addresses the issue it closes (if any)
  • code is readable and understandable
  • is accompanied with tests, or tests are not needed
  • is free of vulnerabilities
  • is documented clearly and usefully, or doesn't need documentation

@sosnovsky sosnovsky added the dependencies Pull requests that update a dependency file label Sep 24, 2021
@sosnovsky sosnovsky added this to the 0.2.0: Refreshed beta milestone Sep 24, 2021
@sosnovsky sosnovsky requested a review from tomholub September 24, 2021 13:42
@tomholub
Copy link
Collaborator

@sosnovsky
Copy link
Collaborator Author

@tomholub no, I get 404 error there

@tomholub
Copy link
Collaborator

Try again now - sent invite (you may need to log in with GitHub)

@sosnovsky
Copy link
Collaborator Author

Yes, now I can see them, checking, thanks!

tomholub
tomholub previously approved these changes Sep 24, 2021
Copy link
Collaborator

@tomholub tomholub left a comment

Choose a reason for hiding this comment

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

Changes all look good.

It seems maybe you also fixed #302 as a side effect? Since we are checking a particular commit from master now, where the http issue was supposed to be fixed?

tomholub
tomholub previously approved these changes Sep 24, 2021
@tomholub tomholub enabled auto-merge (squash) September 24, 2021 14:01
@tomholub
Copy link
Collaborator

Your Ruby version is 2.5.1, but your Gemfile specified 3.0.2 00:06

Semaphore has a command for this, something like sem-version ruby 3.0.2 could do. So you don't have to manually change the ruby version on the machine.

@tomholub
Copy link
Collaborator

@sosnovsky
Copy link
Collaborator Author

Yes, http issue should be fixed too ✅

I checked Semaphore documentation - for macOS images they have only ruby 2.3.7 and 2.5.1 preinstalled (https://docs.semaphoreci.com/ci-cd-environment/macos-xcode-11-image/#ruby), so I changed ruby version back to 2.5.1 and installed previous Cocoapods version which supports ruby 2.5

@tomholub tomholub merged commit c058049 into master Sep 24, 2021
@tomholub tomholub deleted the feature/issue-529-update-pods branch September 24, 2021 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

update cocoapods libraries to the latest versions mailcore2-ios http support building / running on M1

2 participants