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

Merging Themis Carthage changes, and minor docs update to master #484

Merged
merged 2 commits into from
Jun 26, 2019

Conversation

vixentael
Copy link
Contributor

Cherry pick changes from #483 (re-link Themis Carthage to 1.0.2.17 OpenSSL), and add some minor docs updates.

Regarding linkage – on next release I plan to switch Themis Carthage back to ~> 1.0.2 notation.

@vixentael vixentael added the O-iOS 📱 Operating system: iOS label Jun 25, 2019
Copy link
Collaborator

@ilammy ilammy left a comment

Choose a reason for hiding this comment

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

LGTM

@vixentael vixentael merged commit 9200a95 into master Jun 26, 2019
@vixentael vixentael deleted the vxtl/themis-new-xcode branch June 26, 2019 11:50
ilammy added a commit to ilammy/themis that referenced this pull request Sep 17, 2019
Previously, krzyzanowskim/OpenSSL 1.0.2.18 was broken and we were not
even able to revert to 1.0.2.17 because Carthage mandates three-part
semver-compatible versions of dependencies (though packages themselves
can have more version parts). Since then Marcin has pushed an update
to 1.0.2.18 which fixes the original linkage issue. It also introduces
new versioning scheme (1.0.218) which allows reverting, just in case.

We can go back to using "~> 1.0.2" as our dependency spec. Remove the
workaround and update the lock file as well.

You can read the whole backstory here:

  cossacklabs#483
  cossacklabs#484

and in other pull requests and issues linked from there.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-iOS 📱 Operating system: iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants