refactor: Include ctanker headers relative to Tanker framework

Instead of including them from the TankerDeps XCFramework We need this to have a modular framework, where the modulemap only refers to headers files inside the current framework module And we want a modular framework so that Swift can use ctanker
TankerHQ · Apr 19, 2024 · 18b3a6d · 18b3a6d
1 parent 32c3552
commit 18b3a6d
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/Tanker/Headers/TKRAsyncStreamReader+Private.h b/Tanker/Headers/TKRAsyncStreamReader+Private.h
@@ -1,7 +1,7 @@
 
 #import <Foundation/Foundation.h>
 
-#include "ctanker/stream.h"
+#include <Tanker/ctanker/stream.h>
 
 void readInput(uint8_t* _Nonnull out,
                int64_t n,

diff --git a/Tanker/Headers/TKRStreamsFromNative+Private.h b/Tanker/Headers/TKRStreamsFromNative+Private.h
@@ -3,7 +3,7 @@
 #import <Tanker/TKRAsyncStreamReader+Private.h>
 #import <Tanker/TKRStreamBase.h>
 
-#include "ctanker/stream.h"
+#include <Tanker/ctanker/stream.h>
 
 @interface TKRStreamsFromNative : TKRStreamBase
 

diff --git a/Tanker/Sources/Storage/TKRDatastoreBindings.m b/Tanker/Sources/Storage/TKRDatastoreBindings.m
@@ -2,7 +2,7 @@
 
 #import <Tanker/Storage/TKRDatastore.h>
 
-#import "ctanker/datastore.h"
+#import <Tanker/ctanker/datastore.h>
 
 static void report_error(void* error_handle, NSError* _Nonnull err)
 {

diff --git a/Tanker/Sources/TKREncryptionSession+Private.m b/Tanker/Sources/TKREncryptionSession+Private.m
@@ -2,7 +2,7 @@
 #import <Tanker/TKREncryptionSession+Private.h>
 #import <Tanker/Utils/TKRUtils.h>
 
-#include <ctanker/encryptionsession.h>
+#include <Tanker/ctanker/encryptionsession.h>
 
 #include <objc/runtime.h>
 

diff --git a/Tanker/Sources/TKREncryptionSession.m b/Tanker/Sources/TKREncryptionSession.m
@@ -4,7 +4,7 @@
 #import <Tanker/TKRTanker+Private.h>
 #import <Tanker/Utils/TKRUtils.h>
 
-#include "ctanker/encryptionsession.h"
+#include <Tanker/ctanker/encryptionsession.h>
 
 @implementation TKREncryptionSession
 

diff --git a/Tanker/Sources/TKRNetwork.m b/Tanker/Sources/TKRNetwork.m
@@ -4,7 +4,7 @@
 
 #include <libkern/OSAtomic.h>
 
-#include "ctanker.h"
+#include <Tanker/ctanker.h>
 
 @interface HTTPClient : NSObject <NSURLSessionTaskDelegate>
 

diff --git a/Tanker/Sources/TKRTanker+Private.m b/Tanker/Sources/TKRTanker+Private.m
@@ -6,7 +6,7 @@
 #import <Tanker/TKRTanker+Private.h>
 #import <Tanker/Utils/TKRUtils.h>
 
-#include "ctanker.h"
+#include <Tanker/ctanker.h>
 
 #include <objc/runtime.h>
 

diff --git a/Tanker/Sources/TKRTanker.m b/Tanker/Sources/TKRTanker.m
@@ -19,8 +19,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "ctanker.h"
-#include "ctanker/stream.h"
+#include <Tanker/ctanker.h>
+#include <Tanker/ctanker/stream.h>
 
 NSString* const TKRErrorDomain = @"TKRErrorDomain";
 

diff --git a/Tanker/Sources/Utils/TKRUtils.m b/Tanker/Sources/Utils/TKRUtils.m
@@ -2,7 +2,7 @@
 
 #import <Tanker/Utils/TKRUtils.h>
 
-#include "ctanker.h"
+#include <Tanker/ctanker.h>
 
 @implementation TKRPtrAndSizePair
 

diff --git a/Tanker/Tests/TankerTests-Bridging-Header.h b/Tanker/Tests/TankerTests-Bridging-Header.h
@@ -1,4 +1,4 @@
 #import "TKRTestAdmin.h"
 
-#include "ctanker.h"
-#include "ctanker/identity.h"
+#include <Tanker/ctanker.h>
+#include <Tanker/ctanker/identity.h>
diff --git a/Tanker/Tests/Tests.m b/Tanker/Tests/Tests.m
@@ -25,9 +25,9 @@
 #import <PromiseKit/PromiseKit.h>
 #import <Specta/Specta.h>
 
-#include "ctanker.h"
-#include "ctanker/identity.h"
-#include "ctanker/private/datastore-tests/test.h"
+#include <Tanker/ctanker.h>
+#include <Tanker/ctanker/identity.h>
+#include <Tanker/ctanker/private/datastore-tests/test.h>
 
 static NSString* createIdentity(NSString* userID, NSString* appID, NSString* appSecret)
 {