aboutsummaryrefslogtreecommitdiff
path: root/xcode
diff options
context:
space:
mode:
authormanuroe <manu@matrix.org>2016-09-28 16:06:45 +0200
committermanuroe <manu@matrix.org>2016-09-28 16:06:45 +0200
commitf29eabde8b42cde1d5054df8977dd719099575ae (patch)
tree279e271deb3129936c2949dffe3f9f0cb50bf600 /xcode
parent103de505182e569bc811eac1e8ded216e5ae0908 (diff)
OLMKit: Use the same version as libolm
Diffstat (limited to 'xcode')
-rw-r--r--xcode/OLMKit/OLMKit.h8
-rw-r--r--xcode/OLMKit/OLMKit.m28
2 files changed, 30 insertions, 6 deletions
diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h
index 954d6db..65fedc8 100644
--- a/xcode/OLMKit/OLMKit.h
+++ b/xcode/OLMKit/OLMKit.h
@@ -8,15 +8,11 @@
#import <UIKit/UIKit.h>
-//! Project version number for OLMKit.
-FOUNDATION_EXPORT double OLMKitVersionNumber;
-
-//! Project version string for OLMKit.
-FOUNDATION_EXPORT const unsigned char OLMKitVersionString[];
+//! 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>
#import <OLMKit/OLMSession.h>
#import <OLMKit/OLMMessage.h>
diff --git a/xcode/OLMKit/OLMKit.m b/xcode/OLMKit/OLMKit.m
new file mode 100644
index 0000000..0cd4ed5
--- /dev/null
+++ b/xcode/OLMKit/OLMKit.m
@@ -0,0 +1,28 @@
+/*
+ Copyright 2016 OpenMarket Ltd
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "OLMKit.h"
+
+#include "olm/olm.h"
+
+NSString *OLMKitVersionString()
+{
+ uint8_t major, minor, patch;
+
+ olm_get_library_version(&major, &minor, &patch);
+
+ return [NSString stringWithFormat:@"%tu.%tu.%tu", major, minor, patch];
+}