From 168e526d4b7ac016b4d4f3800633233f6f58c2b6 Mon Sep 17 00:00:00 2001
From: Ricardo Pereira <ricardopereira@whitesmith.co>
Date: Thu, 3 Oct 2019 11:23:44 +0100
Subject: [PATCH 1/2] Public headers should be included from Ably module

---
 Source/ARTPushChannel+Private.h              | 2 +-
 Source/ARTPushChannelSubscriptions+Private.h | 4 ++--
 Source/ARTPushDeviceRegistrations+Private.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/ARTPushChannel+Private.h b/Source/ARTPushChannel+Private.h
index c8b4bd96e..ca100f53c 100644
--- 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
index bc88a26d9..8901b5c22 100644
--- 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
index 0d77272a2..90ce64568 100644
--- 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;

From e967a05664fb0bdfbee6c80cfd3fb3d70b3bb3e2 Mon Sep 17 00:00:00 2001
From: Ricardo Pereira <ricardopereira@whitesmith.co>
Date: Thu, 3 Oct 2019 11:24:05 +0100
Subject: [PATCH 2/2] Remove unnecessary imports

---
 Source/ARTEncoder.h         | 1 -
 Source/ARTJsonLikeEncoder.h | 3 +--
 Source/ARTTypes.h           | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/Source/ARTEncoder.h b/Source/ARTEncoder.h
index 188bc4db3..cdaa81202 100644
--- 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
index cf0867e48..34f341b2f 100644
--- 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/ARTTypes.h b/Source/ARTTypes.h
index 8322ff231..14dfb8f7a 100644
--- 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>