Carthage support

.gitignore

@@ -42,8 +42,7 @@ Pods/
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
+Carthage/Checkouts
 Carthage/Build
 
 ### Objective-C Patch ###

Ably.xcodeproj/xcshareddata/xcschemes/Ably.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Ably.xcodeproj/xcshareddata/xcschemes/AblySpec.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Cartfile

@@ -1 +1,3 @@
-github "square/SocketRocket" == 0.5.0
+github "facebook/SocketRocket" "master"
+github "rvi/msgpack-objective-C" "master"
+github "ably-forks/KSCrash" "1.15.8-ably-1"

Cartfile.resolved

@@ -0,0 +1,3 @@
+github "ably-forks/KSCrash" "1.15.8-ably-1"
+github "facebook/SocketRocket" "28035e1a98a427853e4038ff1b70479fa8374cfa"
+github "rvi/msgpack-objective-C" "ad0a627becfd27ca45dfa6684b3fc79f058f5ce9"

Podfile

@@ -1,26 +1,14 @@
 platform :ios, '8.0'
 use_frameworks!
-podspec :path => 'Ably.podspec'
-
-def project_pods
-    pod 'SocketRocket', '0.5.1'
-    pod 'msgpack', '0.1.8'
-    pod 'KSCrashAblyFork', '1.15.8-ably-1'
-end
 
 def test_pods
-    project_pods
     pod 'Quick', '1.1.0'
     pod 'Nimble', '7.0.0'
     # Helpers
     pod 'Aspects'
     pod 'SwiftyJSON', '3.1.4'
 end
 
-target 'Ably' do
-    project_pods
-end
-
 target 'AblySpec' do
     test_pods
 end

Podfile.lock

@@ -1,92 +1,21 @@
 PODS:
   - Aspects (1.4.1)
-  - KSCrashAblyFork (1.15.8-ably-1):
-    - KSCrashAblyFork/Installations (= 1.15.8-ably-1)
-  - KSCrashAblyFork/Installations (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting
-  - KSCrashAblyFork/Recording (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording/Tools (= 1.15.8-ably-1)
-  - KSCrashAblyFork/Recording/Tools (1.15.8-ably-1)
-  - KSCrashAblyFork/Reporting (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/MessageUI (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Sinks (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Tools (= 1.15.8-ably-1)
-  - KSCrashAblyFork/Reporting/Filters (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Alert (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/AppleFmt (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/Base (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/Basic (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/GZip (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/JSON (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/Sets (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/Stringify (= 1.15.8-ably-1)
-    - KSCrashAblyFork/Reporting/Filters/Tools (= 1.15.8-ably-1)
-  - KSCrashAblyFork/Reporting/Filters/Alert (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/AppleFmt (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/Base (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-  - KSCrashAblyFork/Reporting/Filters/Basic (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/GZip (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/JSON (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/Sets (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/AppleFmt
-    - KSCrashAblyFork/Reporting/Filters/Base
-    - KSCrashAblyFork/Reporting/Filters/Basic
-    - KSCrashAblyFork/Reporting/Filters/GZip
-    - KSCrashAblyFork/Reporting/Filters/JSON
-    - KSCrashAblyFork/Reporting/Filters/Stringify
-  - KSCrashAblyFork/Reporting/Filters/Stringify (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters/Base
-  - KSCrashAblyFork/Reporting/Filters/Tools (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-  - KSCrashAblyFork/Reporting/MessageUI (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-  - KSCrashAblyFork/Reporting/Sinks (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-    - KSCrashAblyFork/Reporting/Filters
-    - KSCrashAblyFork/Reporting/Tools
-  - KSCrashAblyFork/Reporting/Tools (1.15.8-ably-1):
-    - KSCrashAblyFork/Recording
-  - msgpack (0.1.8)
   - Nimble (7.0.0)
   - Quick (1.1.0)
-  - SocketRocket (0.5.1)
   - SwiftyJSON (3.1.4)
 
 DEPENDENCIES:
   - Aspects
-  - KSCrashAblyFork (= 1.15.8-ably-1)
-  - msgpack (= 0.1.8)
   - Nimble (= 7.0.0)
   - Quick (= 1.1.0)
-  - SocketRocket (= 0.5.1)
   - SwiftyJSON (= 3.1.4)
 
 SPEC CHECKSUMS:
   Aspects: 7595ba96a6727a58ebcbfc954497fc5d2fdde546
-  KSCrashAblyFork: 6d0dd5b033710109a8fdde28103eeb0e7f9ba1f7
-  msgpack: 97491d2ea799408f4694f2c7d7fd79baf77853dd
   Nimble: 874982b605d4d752fcac6be695d13c502de84b1b
   Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
-  SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
   SwiftyJSON: c2842d878f95482ffceec5709abc3d05680c0220
 
-PODFILE CHECKSUM: 803f8969b4a606dfb2d42f997c1542238c37ab5b
+PODFILE CHECKSUM: 7dc8141f83a4fb2abc77efcba70e9d8aee44d85e
 
 COCOAPODS: 1.3.1

Source/ARTAuth+Private.h

@@ -6,15 +6,15 @@
 //  Copyright (c) 2015 Ably. All rights reserved.
 //
 
-#import "ARTAuth.h"
-#import "ARTEventEmitter+Private.h"
+#import <Ably/ARTAuth.h>
+#import <Ably/ARTEventEmitter.h>
 
 typedef NS_ENUM(NSUInteger, ARTAuthorizationState) {
     ARTAuthorizationSucceeded, //ItemType: nil
     ARTAuthorizationFailed //ItemType: NSError
 };
 
-ART_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /// Messages related to the ARTAuth
 @protocol ARTAuthDelegate <NSObject>
@@ -30,16 +30,16 @@ ART_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, assign) ARTAuthMethod method;
 
 @property (nonatomic, weak) ARTLog *logger;
-@property (art_nullable, nonatomic, readonly, strong) ARTTokenDetails *tokenDetails;
+@property (nullable, nonatomic, readonly, strong) ARTTokenDetails *tokenDetails;
 @property (nonatomic, readonly, assign) NSTimeInterval timeOffset;
 
-@property (art_nullable, weak) id<ARTAuthDelegate> delegate;
+@property (nullable, weak) id<ARTAuthDelegate> delegate;
 @property (readonly, assign) BOOL authorizing;
 
-- (void)_authorize:(art_nullable ARTTokenParams *)tokenParams options:(art_nullable ARTAuthOptions *)authOptions
-         callback:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
+- (void)_authorize:(nullable ARTTokenParams *)tokenParams options:(nullable ARTAuthOptions *)authOptions
+         callback:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
 
-- (void)_requestToken:(ARTTokenParams *__art_nullable)tokenParams withOptions:(ARTAuthOptions *__art_nullable)authOptions callback:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
+- (void)_requestToken:(ARTTokenParams *_Nullable)tokenParams withOptions:(ARTAuthOptions *_Nullable)authOptions callback:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
 
 @end
 
@@ -54,7 +54,7 @@ ART_ASSUME_NONNULL_BEGIN
 - (NSMutableURLRequest *)buildRequest:(nullable ARTAuthOptions *)options withParams:(nullable ARTTokenParams *)params;
 
 // Execute the received ARTTokenRequest
-- (void)executeTokenRequest:(ARTTokenRequest *)tokenRequest callback:(void (^)(ARTTokenDetails *__art_nullable tokenDetails, NSError *__art_nullable error))callback;
+- (void)executeTokenRequest:(ARTTokenRequest *)tokenRequest callback:(void (^)(ARTTokenDetails *_Nullable tokenDetails, NSError *_Nullable error))callback;
 
 // CONNECTED ProtocolMessage may contain a clientId
 - (void)setProtocolClientId:(NSString *)clientId;
@@ -88,4 +88,4 @@ ART_ASSUME_NONNULL_BEGIN
 + (instancetype)newWithAuthorizationState:(ARTAuthorizationState)value;
 @end
 
-ART_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Source/ARTAuth.h

@@ -7,8 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "ARTTypes.h"
-#import "ARTLog.h"
+
+#import <Ably/ARTTypes.h>
+#import <Ably/ARTLog.h>
 
 @class ARTRest;
 @class ARTLog;
@@ -18,15 +19,15 @@
 @class ARTTokenDetails;
 @class ARTTokenRequest;
 
-ART_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark - ARTAuth
 
 @interface ARTAuth : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
 
-@property (art_nullable, readonly, getter=getClientId) NSString *clientId;
+@property (nullable, readonly, getter=getClientId) NSString *clientId;
 
 /**
  # (RSA8) Auth#requestToken
@@ -40,20 +41,20 @@ ART_ASSUME_NONNULL_BEGIN
  - Parameter authOptions: Authentication options (optional).
  - Parameter callback: Completion callback (ARTTokenDetails, NSError).
  */
-- (void)requestToken:(art_nullable ARTTokenParams *)tokenParams withOptions:(art_nullable ARTAuthOptions *)authOptions
-            callback:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
-- (void)requestToken:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
+- (void)requestToken:(nullable ARTTokenParams *)tokenParams withOptions:(nullable ARTAuthOptions *)authOptions
+            callback:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
+- (void)requestToken:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
 
-- (void)authorise:(art_nullable ARTTokenParams *)tokenParams options:(art_nullable ARTAuthOptions *)authOptions callback:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback DEPRECATED_MSG_ATTRIBUTE("method will be removed in v1.0. Use 'authorize:' method instead.");
+- (void)authorise:(nullable ARTTokenParams *)tokenParams options:(nullable ARTAuthOptions *)authOptions callback:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback DEPRECATED_MSG_ATTRIBUTE("method will be removed in v1.0. Use 'authorize:' method instead.");
 
-- (void)authorize:(art_nullable ARTTokenParams *)tokenParams options:(art_nullable ARTAuthOptions *)authOptions
-         callback:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
-- (void)authorize:(void (^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable))callback;
+- (void)authorize:(nullable ARTTokenParams *)tokenParams options:(nullable ARTAuthOptions *)authOptions
+         callback:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
+- (void)authorize:(void (^)(ARTTokenDetails *_Nullable, NSError *_Nullable))callback;
 
-- (void)createTokenRequest:(art_nullable ARTTokenParams *)tokenParams options:(art_nullable ARTAuthOptions *)options
-                  callback:(void (^)(ARTTokenRequest *__art_nullable tokenRequest, NSError *__art_nullable error))callback;
-- (void)createTokenRequest:(void (^)(ARTTokenRequest *__art_nullable tokenRequest, NSError *__art_nullable error))callback;
+- (void)createTokenRequest:(nullable ARTTokenParams *)tokenParams options:(nullable ARTAuthOptions *)options
+                  callback:(void (^)(ARTTokenRequest *_Nullable tokenRequest, NSError *_Nullable error))callback;
+- (void)createTokenRequest:(void (^)(ARTTokenRequest *_Nullable tokenRequest, NSError *_Nullable error))callback;
 
 @end
 
-ART_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Source/ARTAuth.m

@@ -272,7 +272,7 @@ - (void)_requestToken:(ARTTokenParams *)tokenParams withOptions:(ARTAuthOptions
         return;
     }
 
-    void (^checkerCallback)(ARTTokenDetails *__art_nullable, NSError *__art_nullable) = ^(ARTTokenDetails *tokenDetails, NSError *error) {
+    void (^checkerCallback)(ARTTokenDetails *_Nullable, NSError *_Nullable) = ^(ARTTokenDetails *tokenDetails, NSError *error) {
         if (error) {
             callback(nil, error);
             return;
@@ -298,7 +298,7 @@ - (void)_requestToken:(ARTTokenParams *)tokenParams withOptions:(ARTAuthOptions
             }
         }];
     } else {
-        void (^tokenDetailsFactory)(ARTTokenParams *, void(^)(ARTTokenDetails *__art_nullable, NSError *__art_nullable));
+        void (^tokenDetailsFactory)(ARTTokenParams *, void(^)(ARTTokenDetails *_Nullable, NSError *_Nullable));
         if (replacedOptions.authCallback) {
             void (^userCallback)(ARTTokenParams *, void(^)(id<ARTTokenDetailsCompatible>, NSError *)) = ^(ARTTokenParams *tokenParams, void(^callback)(id<ARTTokenDetailsCompatible>, NSError *)){
                 ART_EXITING_ABLY_CODE(_rest);
@@ -307,7 +307,7 @@ - (void)_requestToken:(ARTTokenParams *)tokenParams withOptions:(ARTAuthOptions
                 });
             };
 
-            tokenDetailsFactory = ^(ARTTokenParams *tokenParams, void(^callback)(ARTTokenDetails *__art_nullable, NSError *__art_nullable)) {
+            tokenDetailsFactory = ^(ARTTokenParams *tokenParams, void(^callback)(ARTTokenDetails *_Nullable, NSError *_Nullable)) {
                 userCallback(tokenParams, ^(id<ARTTokenDetailsCompatible> tokenDetailsCompat, NSError *error) {
                     dispatch_async(_queue, ^{
                     ART_TRY_OR_REPORT_CRASH_START(_rest) {
@@ -322,7 +322,7 @@ - (void)_requestToken:(ARTTokenParams *)tokenParams withOptions:(ARTAuthOptions
             };
             [self.logger debug:@"RS:%p ARTAuth: using authCallback", _rest];
         } else {
-            tokenDetailsFactory = ^(ARTTokenParams *tokenParams, void(^callback)(ARTTokenDetails *__art_nullable, NSError *__art_nullable)) {
+            tokenDetailsFactory = ^(ARTTokenParams *tokenParams, void(^callback)(ARTTokenDetails *_Nullable, NSError *_Nullable)) {
                 // Create a TokenRequest and execute it
                 [self _createTokenRequest:currentTokenParams options:replacedOptions callback:^(ARTTokenRequest *tokenRequest, NSError *error) {
                     if (error) {

Source/ARTAuthDetails.h

@@ -7,9 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "CompatibilityMacros.h"
 
-ART_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /// Used with an AUTH protocol messages to send authentication details
 @interface ARTAuthDetails : NSObject<NSCopying>
@@ -20,4 +19,4 @@ ART_ASSUME_NONNULL_BEGIN
 
 @end
 
-ART_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Source/ARTAuthOptions+Private.h

@@ -6,15 +6,15 @@
 //  Copyright © 2016 Ably. All rights reserved.
 //
 
-#import "ARTAuthOptions.h"
-#import "CompatibilityMacros.h"
+#import <Ably/ARTAuthOptions.h>
+#import <Ably/CompatibilityMacros.h>
 
-ART_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 @interface ARTAuthOptions ()
 
 - (instancetype)initDefaults;
 
 @end
 
-ART_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END