diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-01-18 10:46:59 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-01-18 10:46:59 +0000 |
| commit | 1761730db8c54a949ad6d12522de8eee2e0a50be (patch) | |
| tree | f3f36c250d7cf5dec0012552a1f115c508655025 /xcode | |
| parent | a45c3cc80957d61065626089eee4ce664ad1615f (diff) | |
| parent | 757be9aeba67d609942c54c1bbe0461e120a392e (diff) | |
Swift project support
Merge patch required to support Swift projects, from Avery Pierce.
Patch taken from https://github.com/matrix-org/matrix-ios-sdk/files/712987/olm_patch.txt.
Sign-off at https://github.com/matrix-org/matrix-ios-sdk/pull/220#issue-201470911.
Diffstat (limited to 'xcode')
| -rw-r--r-- | xcode/OLMKit/OLMKit.h | 11 | ||||
| -rw-r--r-- | xcode/OLMKit/OLMKit.m | 10 |
2 files changed, 14 insertions, 7 deletions
diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h index e23a9f1..455d11b 100644 --- a/xcode/OLMKit/OLMKit.h +++ b/xcode/OLMKit/OLMKit.h @@ -18,10 +18,6 @@ #import <Foundation/Foundation.h> - -//! Project version string for OLMKit, the same as libolm. -NSString *OLMKitVersionString(); - // In this header, you should import all the public headers of your framework using statements like #import <OLMKit/PublicHeader.h> #import <OLMKit/OLMAccount.h> @@ -30,3 +26,10 @@ NSString *OLMKitVersionString(); #import <OLMKit/OLMUtility.h> #import <OLMKit/OLMInboundGroupSession.h> #import <OLMKit/OLMOutboundGroupSession.h> + +@interface OLMKit : NSObject + +//! Project version string for OLMKit, the same as libolm. ++ (NSString*)versionString; + +@end diff --git a/xcode/OLMKit/OLMKit.m b/xcode/OLMKit/OLMKit.m index e7bfd25..c383650 100644 --- a/xcode/OLMKit/OLMKit.m +++ b/xcode/OLMKit/OLMKit.m @@ -19,11 +19,15 @@ #include "olm/olm.h" -NSString *OLMKitVersionString() +@implementation OLMKit + ++ (NSString*)versionString { uint8_t major, minor, patch; - + olm_get_library_version(&major, &minor, &patch); - + return [NSString stringWithFormat:@"%tu.%tu.%tu", major, minor, patch]; } + +@end |