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

Updated Carthage examples to use XCF #823

Merged
merged 4 commits into from
May 17, 2021

Conversation

julepka
Copy link
Contributor

@julepka julepka commented May 14, 2021

Updated Carthage examples:

  • Bumped Themis version to 0.13.9 that updates OpenSSL to 1.1.1k
  • Updated test projects to use themis.xcframework
  • Updated Carthage CI tests to build Themis XCFramework: added --use-xcframeworks flag

Note: Bitrise doesn't support the required Carthage version 0.38 to build XCF properly. They are going to update to 0.38 about in a week: https://discuss.bitrise.io/t/how-to-upgrade-carthage-to-version-0-38-0/16796. If we are not in hurry, this PR can wait for the Bitrise update.

Checklist

  • Change is covered by automated tests
  • The coding guidelines are followed
  • Public API has proper documentation
  • Example projects and code samples are up-to-date (in case of API changes)
  • Changelog is updated (in case of notable or breaking changes)

@julepka julepka added M-Carthage Package manager: Carthage, Objective-C and Swift, iOS and macOS O-iOS 📱 Operating system: iOS O-macOS 💻 Operating system: macOS labels May 14, 2021
@julepka julepka marked this pull request as ready for review May 14, 2021 19:44
CHANGELOG.md Outdated Show resolved Hide resolved
@vixentael
Copy link
Contributor

If we are not in hurry, this PR can wait for the Bitrise update.

I suggest merge it, and then in a week, tweak Bitrise tests

@vixentael vixentael mentioned this pull request May 16, 2021
4 tasks
@julepka julepka merged commit 213e665 into cossacklabs:master May 17, 2021
julepka added a commit to julepka/themis that referenced this pull request May 26, 2021
julepka added a commit to julepka/themis that referenced this pull request May 26, 2021
julepka added a commit to julepka/themis that referenced this pull request May 26, 2021
vixentael pushed a commit that referenced this pull request May 26, 2021
* Cherry-pick: Updated Carthage examples to use XCF (#823)

* Fixing Carthage examples embed settings (#827)

* fix changelog conflict
vixentael pushed a commit that referenced this pull request May 26, 2021
* Updated podspec to support OpenSSL-XCF

* versions update

* update changelog

* Cherry-pick: Updated Carthage examples to use XCF (#823)

* Fixing Carthage examples embed settings (#827)

* Revert "Fixing Carthage examples embed settings (#827)"

This reverts commit d9403c5.

* Revert "Cherry-pick: Updated Carthage examples to use XCF (#823)"

This reverts commit 6c14677.

* update changelog

* added deprecation notice to podspec and changelog

* update changelog
julepka added a commit that referenced this pull request May 27, 2021
* Carthage XCF support and OpenSSL 1.1.1k (#817)
* Update Carthage examples to unbreak tests (#829)
* Cherry-pick: Updated Carthage examples to use XCF (#823)
* Fixing Carthage examples embed settings (#827)
* fix changelog conflict
* Themis CocoaPods now support CLOpenSSL-XCF (#828)
* Updated podspec to support OpenSSL-XCF
* versions update
* update changelog
* Cherry-pick: Updated Carthage examples to use XCF (#823)
* Fixing Carthage examples embed settings (#827)
* Revert "Fixing Carthage examples embed settings (#827)"
This reverts commit d9403c5.
* Revert "Cherry-pick: Updated Carthage examples to use XCF (#823)"
This reverts commit 6c14677.
* update changelog
* added deprecation notice to podspec and changelog
* update changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
M-Carthage Package manager: Carthage, Objective-C and Swift, iOS and macOS O-iOS 📱 Operating system: iOS O-macOS 💻 Operating system: macOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants