From f29eabde8b42cde1d5054df8977dd719099575ae Mon Sep 17 00:00:00 2001 From: manuroe Date: Wed, 28 Sep 2016 16:06:45 +0200 Subject: [PATCH] OLMKit: Use the same version as libolm --- xcode/OLMKit/OLMKit.h | 8 ++------ xcode/OLMKit/OLMKit.m | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 xcode/OLMKit/OLMKit.m 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 -//! 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 - #import #import #import 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]; +}