Merge pull request #902 from ably/carthage-issue

Carthage: fix public header imports
ably · Oct 9, 2019 · a99b5e7 · a99b5e7
2 parents 8a922ed + e967a05
commit a99b5e7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 8 deletions.
diff --git a/Source/ARTEncoder.h b/Source/ARTEncoder.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "CompatibilityMacros.h"
 #import "ARTTypes.h"
 
 @class ARTMessage;

diff --git a/Source/ARTJsonLikeEncoder.h b/Source/ARTJsonLikeEncoder.h
@@ -9,7 +9,6 @@
 #ifndef ARTJsonLikeEncoder_h
 #define ARTJsonLikeEncoder_h
 
-#import "CompatibilityMacros.h"
 #import <Ably/ARTRest+Private.h>
 #import <Ably/ARTEncoder.h>
 #import <Ably/ARTTokenDetails.h>
@@ -78,6 +77,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-ART_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END
 
 #endif /* ARTJsonLikeEncoder_h */
diff --git a/Source/ARTPushChannel+Private.h b/Source/ARTPushChannel+Private.h
@@ -9,7 +9,7 @@
 #ifndef ARTPushChannel_Private_h
 #define ARTPushChannel_Private_h
 
-#import "ARTPushChannel.h"
+#import <Ably/ARTPushChannel.h>
 #import "ARTQueuedDealloc.h"
 
 @class ARTRestInternal;

diff --git a/Source/ARTPushChannelSubscriptions+Private.h b/Source/ARTPushChannelSubscriptions+Private.h
@@ -9,8 +9,8 @@
 #ifndef ARTPushChannelSubscriptions_Private_h
 #define ARTPushChannelSubscriptions_Private_h
 
-#include "ARTPushChannelSubscriptions.h"
-#include "ARTQueuedDealloc.h"
+#import <Ably/ARTPushChannelSubscriptions.h>
+#import "ARTQueuedDealloc.h"
 
 @class ARTRestInternal;
 

diff --git a/Source/ARTPushDeviceRegistrations+Private.h b/Source/ARTPushDeviceRegistrations+Private.h
@@ -9,7 +9,7 @@
 #ifndef ARTPushDeviceRegistrations_Private_h
 #define ARTPushDeviceRegistrations_Private_h
 
-#include "ARTPushDeviceRegistrations.h"
+#import <Ably/ARTPushDeviceRegistrations.h>
 #import "ARTQueuedDealloc.h"
 
 @class ARTRestInternal;

diff --git a/Source/ARTTypes.h b/Source/ARTTypes.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "CompatibilityMacros.h"
 
 #import <Ably/ARTStatus.h>
 #import <Ably/ARTEventEmitter.h>