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.

Sign up for GitHub

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

Jump to bottom

update ios objc and server examples for themis 0.13.3 #723

Merged
merged 3 commits into from
Oct 13, 2020
Merged

update ios objc and server examples for themis 0.13.3 #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42abd25
update ios objc and server examples for themis 0.13.3
julepka Oct 13, 2020
e923f59
Merge branch 'master' into T1824-examples-ios-cocoapods-update
julepka Oct 13, 2020
32e38ba
updated changelog
julepka Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ _Code:_
- **Objective-C**

- Switched to test on Xcode 12.0, disable ARM64 builds for Themis CocoaPods and Themis Carthage ([#721](https://github.com/cossacklabs/themis/pull/721), [#722](https://github.com/cossacklabs/themis/pull/722)).
- Updated Objective-C examples (iOS and macOS, Carthage and CocoaPods) to showcase usage of the newest Secure Cell API: generating symmetric keys and using Secure Cell with Passphrase ([#688](https://github.com/cossacklabs/themis/pull/688)) and to use latest Themis 0.13.2, 0.13.3 ([#701](https://github.com/cossacklabs/themis/pull/701), [#703](https://github.com/cossacklabs/themis/pull/703), [#706](https://github.com/cossacklabs/themis/pull/706)).
- Updated Objective-C examples (iOS and macOS, Carthage and CocoaPods) to showcase usage of the newest Secure Cell API: generating symmetric keys and using Secure Cell with Passphrase ([#688](https://github.com/cossacklabs/themis/pull/688)) and to use latest Themis 0.13.2, 0.13.3 ([#701](https://github.com/cossacklabs/themis/pull/701), [#703](https://github.com/cossacklabs/themis/pull/703), [#706](https://github.com/cossacklabs/themis/pull/706), [#723](https://github.com/cossacklabs/themis/pull/723)).
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add the same for Swift item below

- `TSSession` initializer now returns an error (`nil`) when given incorrect key type ([#710](https://github.com/cossacklabs/themis/pull/710)).

- **PHP**
Expand Down
4 changes: 2 additions & 2 deletions docs/examples/Themis-server/Obj-C/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '10.0'
platform :ios, '12.0'
project 'WorkingWithThemisServer/WorkingWithThemisServer.xcodeproj'
inhibit_all_warnings!
use_frameworks!

target :"WorkingWithThemisServer" do

pod 'themis', '0.13.1'
pod 'themis', '0.13.3'

end
34 changes: 17 additions & 17 deletions docs/examples/Themis-server/Obj-C/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
PODS:
- CLOpenSSL (1.1.107.1)
- themis (0.13.1):
- themis/openssl-1.1.1 (= 0.13.1)
- themis/openssl-1.1.1 (0.13.1):
- CLOpenSSL (~> 1.1.107)
- themis/openssl-1.1.1/core (= 0.13.1)
- themis/openssl-1.1.1/objcwrapper (= 0.13.1)
- themis/openssl-1.1.1/core (0.13.1):
- CLOpenSSL (~> 1.1.107)
- themis/openssl-1.1.1/objcwrapper (0.13.1):
- CLOpenSSL (~> 1.1.107)
- themis/openssl-1.1.1/core
- GRKOpenSSLFramework (1.0.2.18)
- themis (0.13.3):
- themis/themis-openssl (= 0.13.3)
- themis/themis-openssl (0.13.3):
- GRKOpenSSLFramework (= 1.0.2.18)
- themis/themis-openssl/core (= 0.13.3)
- themis/themis-openssl/objcwrapper (= 0.13.3)
- themis/themis-openssl/core (0.13.3):
- GRKOpenSSLFramework (= 1.0.2.18)
- themis/themis-openssl/objcwrapper (0.13.3):
- GRKOpenSSLFramework (= 1.0.2.18)
- themis/themis-openssl/core

DEPENDENCIES:
- themis (= 0.13.1)
- themis (= 0.13.3)

SPEC REPOS:
https://github.com/CocoaPods/Specs.git:
- CLOpenSSL
- GRKOpenSSLFramework
- themis

SPEC CHECKSUMS:
CLOpenSSL: e57362f6522670f6dc727d19bd6dcd98c23d7cf5
themis: ccc8859adda9668dc4fd584bbb2390bf6c696de5
GRKOpenSSLFramework: 1d65e55d569af7b23074373041a92cc8bc768a92
themis: 00b56e2cdcc5ab1fc846aa0271ef0c2895a1c476

PODFILE CHECKSUM: c1990926b3115ef550a5921173238889bef305c1
PODFILE CHECKSUM: 0842a68f8ee33c7a8170ce4747df4dd7e9ee1480

COCOAPODS: 1.9.3
Loading