Skip to content

Xcode 10.2 compatibility#1167

Merged
jtreanor merged 7 commits intorelease/1.6.0from
xcode-10-2
Apr 10, 2019
Merged

Xcode 10.2 compatibility#1167
jtreanor merged 7 commits intorelease/1.6.0from
xcode-10-2

Conversation

@jtreanor
Copy link
Copy Markdown
Contributor

@jtreanor jtreanor commented Apr 4, 2019 •
edited
Loading

This makes a number of changes for Xcode 10.2 compatibility.

  • Added Gemfile to lock CocoaPods version to 1.6.0 for predictability.
  • Updated CircleCI config to run on Xcode 10.2
  • Updated Xcode project and scheme files to recommended settings.
  • Fixed new Xcode build warnings (mainly removing visibility modifiers, using hash(into:) and replacing deprecated .encodedOffset).

The tests are currently crashing as something is not working with the encodedOffset behaviour. This was changed in SE-0241.

Note: Due to the new utf16Offset API, this breaks compatibility with Xcode 10.1.

To test:

  • All tests pass.

@jtreanor jtreanor mentioned this pull request Apr 4, 2019
Merged
5 tasks
@etoledom etoledom self-assigned this Apr 8, 2019
@etoledom
Adapt calculation of range(from nsRange: NSRange).
c2c09ca 
It seels to not accept offsets bigger than the string lenght (if it did before).
@jtreanor jtreanor marked this pull request as ready for review April 8, 2019 13:54
@jtreanor jtreanor changed the base branch from develop to release/1.6.0 April 8, 2019 15:05
etoledom
etoledom approved these changes Apr 9, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@etoledom etoledom 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 to me! ✅
Thank you @jtreanor

@jtreanor jtreanor merged commit c0596a7 into release/1.6.0 Apr 10, 2019
@jtreanor jtreanor deleted the xcode-10-2 branch April 10, 2019 11:16
@jtreanor
Copy link
Copy Markdown
Contributor Author

jtreanor commented Apr 10, 2019

This has been merged to release/1.6.0. I will release 1.6.0-beta1 now.

@jtreanor jtreanor mentioned this pull request Apr 11, 2019
Merged
@jtreanor jtreanor mentioned this pull request Apr 19, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@etoledom etoledom etoledom approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jtreanor jtreanor

@etoledom etoledom

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jtreanor @etoledom @diegoreymendez