From 719eb543a8d08c4f536ea7933ffb3af0a8553e87 Mon Sep 17 00:00:00 2001
From: Chris Ballinger <chrisballinger@gmail.com>
Date: Fri, 8 Apr 2016 17:24:41 -0700
Subject: Xcode, podspec, wrapper

---
 xcode/OLMKit/OLMKit.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 xcode/OLMKit/OLMKit.h

(limited to 'xcode/OLMKit/OLMKit.h')

diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h
new file mode 100644
index 0000000..745af43
--- /dev/null
+++ b/xcode/OLMKit/OLMKit.h
@@ -0,0 +1,23 @@
+//
+//  OLMKit.h
+//  OLMKit
+//
+//  Created by Chris Ballinger on 4/8/16.
+//
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for OLMKit.
+FOUNDATION_EXPORT double OLMKitVersionNumber;
+
+//! Project version string for OLMKit.
+FOUNDATION_EXPORT const unsigned char OLMKitVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <OLMKit/PublicHeader.h>
+
+
+#import "OLMAccount.h"
+#import "OLMSession.h"
+#import "OLMMessage.h"
+#import "OLMUtility.h"
\ No newline at end of file
-- 
cgit v1.2.3


From 6f113dd7b3b4de918c4efb81d38a1ffe1d391b5b Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Tue, 27 Sep 2016 11:57:29 +0200
Subject: OLMKit: Make the project build Make OLMKit CocoaPods expose the obj-c
 wrapper of libolm

---
 xcode/OLMKit/OLMKit.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'xcode/OLMKit/OLMKit.h')

diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h
index 745af43..954d6db 100644
--- a/xcode/OLMKit/OLMKit.h
+++ b/xcode/OLMKit/OLMKit.h
@@ -17,7 +17,7 @@ FOUNDATION_EXPORT const unsigned char OLMKitVersionString[];
 // In this header, you should import all the public headers of your framework using statements like #import <OLMKit/PublicHeader.h>
 
 
-#import "OLMAccount.h"
-#import "OLMSession.h"
-#import "OLMMessage.h"
-#import "OLMUtility.h"
\ No newline at end of file
+#import <OLMKit/OLMAccount.h>
+#import <OLMKit/OLMSession.h>
+#import <OLMKit/OLMMessage.h>
+#import <OLMKit/OLMUtility.h>
-- 
cgit v1.2.3


From f29eabde8b42cde1d5054df8977dd719099575ae Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Wed, 28 Sep 2016 16:06:45 +0200
Subject: OLMKit: Use the same version as libolm

---
 xcode/OLMKit/OLMKit.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'xcode/OLMKit/OLMKit.h')

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>
-- 
cgit v1.2.3


From 2bd912990fb82bf3cdd54a9268143d8b3a2889ef Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 10 Oct 2016 17:10:51 +0200
Subject: OLMKit: Add megolm api: OLMInboundGroupSession and
 OLMOutboundGroupSession

---
 xcode/OLMKit/OLMKit.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'xcode/OLMKit/OLMKit.h')

diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h
index 65fedc8..3865e74 100644
--- a/xcode/OLMKit/OLMKit.h
+++ b/xcode/OLMKit/OLMKit.h
@@ -17,3 +17,5 @@ NSString *OLMKitVersionString();
 #import <OLMKit/OLMSession.h>
 #import <OLMKit/OLMMessage.h>
 #import <OLMKit/OLMUtility.h>
+#import <OLMKit/OLMInboundGroupSession.h>
+#import <OLMKit/OLMOutboundGroupSession.h>
-- 
cgit v1.2.3


From 29de7825c9607955d061c5fe75c7f29d78dfaec5 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 17 Nov 2016 15:50:23 +0100
Subject: OLMKit: Update Copyrights

---
 xcode/OLMKit/OLMKit.h | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'xcode/OLMKit/OLMKit.h')

diff --git a/xcode/OLMKit/OLMKit.h b/xcode/OLMKit/OLMKit.h
index 3865e74..34db111 100644
--- a/xcode/OLMKit/OLMKit.h
+++ b/xcode/OLMKit/OLMKit.h
@@ -1,10 +1,20 @@
-//
-//  OLMKit.h
-//  OLMKit
-//
-//  Created by Chris Ballinger on 4/8/16.
-//
-//
+/*
+ Copyright 2016 Chris Ballinger
+ Copyright 2016 OpenMarket Ltd
+ Copyright 2016 Vector Creations 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 <UIKit/UIKit.h>
 
-- 
cgit v1.2.3