Skip to content

Switch back to Sodium's original library & update to 0.9.0#157

Closed
mokagio wants to merge 22 commits intotrunkfrom
switch-back-to-sodium-trunk
Closed

Switch back to Sodium's original library & update to 0.9.0#157
mokagio wants to merge 22 commits intotrunkfrom
switch-back-to-sodium-trunk

Conversation

@mokagio
Copy link
Contributor

@mokagio mokagio commented Dec 9, 2020

This is a demo PR with a version of Tracks that builds for macOS targets on Xcode 12.2.

I don't consider it ready for merge because of the huge dependency of updating Tracks to version 5.0. Something on which @jkmassel also worked on (#131) but that I didn't realize when I worked on this.

It's handy to have the code online so that we can point to this branch in our macOS targets and use this PR for Sodium related discussions.

mokagio and others added 19 commits October 14, 2020 14:05
…ologies

Remove references to whitelist/blacklist
This is required to make the pod build with Xcode 12.2, otherwise we'd
get the following error:

> xcodebuild:
>   Sentry/Sources/SentryCrash/Recording/Tools/SentryCrashObjC.c:198:54:
>     error: use of undeclared identifier 'kCFCoreFoundationVersionNumber_iOS_8_x_Max'
@mokagio mokagio force-pushed the switch-back-to-sodium-trunk branch from 8d710e6 to 2da8c85 Compare December 9, 2020 01:47
@mokagio
Copy link
Contributor Author

mokagio commented Dec 9, 2020

The validation fails with warnings only.

This is a key required update to properly work with XCFrameworks, which
is what the Sodium library uses to distribute its static library in a
way that is compatible with Apple Silicon (see version 0.9.0 of the
library).
This is a requirement to update Sodium to the version compatible with
Apple Silicon.

I tried using 11.0 as well, but that didn't work.
Now that CocoaPods 1.10.0 is out, we can go back to the original Sodium
library and decommission the fork we've been recently to work around
some Apple Silicon related limitations.

You can verify this works by running

```
bundle exec pod lib lint --allow-warnings
```

For extra context see:

- jedisct1/swift-sodium#213
- jedisct1/swift-sodium#214
- #148
@mokagio mokagio force-pushed the switch-back-to-sodium-trunk branch from 2da8c85 to 044dad6 Compare December 9, 2020 01:51
@mokagio
Copy link
Contributor Author

mokagio commented Jan 19, 2021

Closing in favor of #166 and #163.

@mokagio mokagio closed this Jan 19, 2021
@jkmassel jkmassel deleted the switch-back-to-sodium-trunk branch January 19, 2021 17:51
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.

3 participants