Mac support

.travis.yml

@@ -10,20 +10,20 @@ matrix:
     - env: NAME="ably-iOS" LANE=test_iOS11
     - env: NAME="ably-iOS" LANE=test_iOS10
     - env: NAME="ably-iOS" LANE=test_iOS9
-before_install:
-  - gem install cocoapods -v '1.5.3'
-  - pod repo update > /dev/null
+    - env: NAME="ably-macOS" LANE=test_macOS
 install:
-  # CocoaPods
-  - pod install
   # Carthage
-  - carthage bootstrap --platform iOS
+  - if [[ ${NAME} == "ably-iOS" ]]; then carthage update --platform iOS --cache-builds; fi
+  - if [[ ${NAME} == "ably-macOS" ]]; then carthage update --platform macOS --cache-builds; fi
   # Update fastlane
-  - gem install fastlane -v '2.100.1'
+  - gem install fastlane -v '2.108.0'
 before_script:
   - xcrun simctl erase all
 script:
   - export ABLY_ENV="sandbox"
   - fastlane $LANE
 after_success:
   - sleep 5
+cache:
+  directories:
+  - Carthage

Ably.podspec

@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   s.version           = `Scripts/get-version.sh`
   s.summary           = "iOS client for Ably"
   s.description       = <<-DESC
-                        iOS client library for ably.io, the realtime messaging service, written in Objective-C and ready for Swift 3.0.
+                        iOS client library for ably.io, the realtime messaging service, written in Objective-C and ready for Swift 4.0 and later.
                         DESC
   s.homepage          = "https://www.ably.io"
   s.license           = { :type => 'Apache 2.0', :file => 'LICENSE' }
@@ -14,12 +14,12 @@ Pod::Spec.new do |s|
   s.platform          = :ios, '8.0'
   s.requires_arc      = true
   s.swift_version     = '4.2'
-  s.source_files      = 'Source/*.{h,m}'
-  s.private_header_files = 'Source/*+Private.h'
+  s.source_files      = 'Source/**/*.{h,m}'
+  s.private_header_files = 'Source/*+Private.h', 'Source/Private/*.h'
   s.module_map        = 'Source/Ably.modulemap'
   s.dependency 'SocketRocketAblyFork', '0.5.2-ably-2'
-  s.dependency 'msgpack', '0.1.8'
+  s.dependency 'MsgPackAblyFork', '0.2.0-ably-1'
   s.dependency 'KSCrashAblyFork', '1.15.8-ably-2'
-  s.dependency 'ULID', '1.0.3'
+  s.dependency 'ULID', '1.0.4'
   s.dependency 'SAMKeychain', '1.5.3'
 end

Ably.xcodeproj/xcshareddata/xcschemes/AblySpec.xcscheme → Ably.xcodeproj/xcshareddata/xcschemes/Ably-iOS-Tests.xcscheme

@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "856AAC891B6E304B00B07119"
-               BuildableName = "AblySpec.xctest"
-               BlueprintName = "AblySpec"
+               BuildableName = "Ably-iOS-Tests.xctest"
+               BlueprintName = "Ably-iOS-Tests"
                ReferencedContainer = "container:Ably.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "856AAC891B6E304B00B07119"
-               BuildableName = "AblySpec.xctest"
-               BlueprintName = "AblySpec"
+               BuildableName = "Ably-iOS-Tests.xctest"
+               BlueprintName = "Ably-iOS-Tests"
                ReferencedContainer = "container:Ably.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -63,8 +63,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "856AAC891B6E304B00B07119"
-            BuildableName = "AblySpec.xctest"
-            BlueprintName = "AblySpec"
+            BuildableName = "Ably-iOS-Tests.xctest"
+            BlueprintName = "Ably-iOS-Tests"
             ReferencedContainer = "container:Ably.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -81,8 +81,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "856AAC891B6E304B00B07119"
-            BuildableName = "AblySpec.xctest"
-            BlueprintName = "AblySpec"
+            BuildableName = "Ably-iOS-Tests.xctest"
+            BlueprintName = "Ably-iOS-Tests"
             ReferencedContainer = "container:Ably.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Ably.xcodeproj/xcshareddata/xcschemes/Ably.xcscheme → Ably.xcodeproj/xcshareddata/xcschemes/Ably-iOS.xcscheme

@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
                BuildableName = "Ably.framework"
-               BlueprintName = "Ably"
+               BlueprintName = "Ably-iOS"
                ReferencedContainer = "container:Ably.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -33,8 +33,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "856AAC891B6E304B00B07119"
-               BuildableName = "AblySpec.xctest"
-               BlueprintName = "AblySpec"
+               BuildableName = "Ably-iOS-Tests.xctest"
+               BlueprintName = "Ably-iOS-Tests"
                ReferencedContainer = "container:Ably.xcodeproj">
             </BuildableReference>
          </TestableReference>
@@ -44,7 +44,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
             BuildableName = "Ably.framework"
-            BlueprintName = "Ably"
+            BlueprintName = "Ably-iOS"
             ReferencedContainer = "container:Ably.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -73,7 +73,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
             BuildableName = "Ably.framework"
-            BlueprintName = "Ably"
+            BlueprintName = "Ably-iOS"
             ReferencedContainer = "container:Ably.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -91,7 +91,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "96BF61301A35B2AB004CF2B3"
             BuildableName = "Ably.framework"
-            BlueprintName = "Ably"
+            BlueprintName = "Ably-iOS"
             ReferencedContainer = "container:Ably.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

Ably.xcodeproj/xcshareddata/xcschemes/Ably-macOS-Tests.xcscheme

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D7093C09219E2DB200723F17"
+               BuildableName = "Ably-macOS-Tests.xctest"
+               BlueprintName = "Ably-macOS-Tests"
+               ReferencedContainer = "container:Ably.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D7093C09219E2DB200723F17"
+               BuildableName = "Ably-macOS-Tests.xctest"
+               BlueprintName = "Ably-macOS-Tests"
+               ReferencedContainer = "container:Ably.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D7093C09219E2DB200723F17"
+            BuildableName = "Ably-macOS-Tests.xctest"
+            BlueprintName = "Ably-macOS-Tests"
+            ReferencedContainer = "container:Ably.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D7093C09219E2DB200723F17"
+            BuildableName = "Ably-macOS-Tests.xctest"
+            BlueprintName = "Ably-macOS-Tests"
+            ReferencedContainer = "container:Ably.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Ably.xcodeproj/xcshareddata/xcschemes/Ably-macOS.xcscheme

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1010"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D710D45A219495E2008F54AD"
+               BuildableName = "Ably.framework"
+               BlueprintName = "Ably-macOS"
+               ReferencedContainer = "container:Ably.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D7093C09219E2DB200723F17"
+               BuildableName = "Ably-macOS-Tests.xctest"
+               BlueprintName = "Ably-macOS-Tests"
+               ReferencedContainer = "container:Ably.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D710D45A219495E2008F54AD"
+            BuildableName = "Ably.framework"
+            BlueprintName = "Ably-macOS"
+            ReferencedContainer = "container:Ably.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D710D45A219495E2008F54AD"
+            BuildableName = "Ably.framework"
+            BlueprintName = "Ably-macOS"
+            ReferencedContainer = "container:Ably.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D710D45A219495E2008F54AD"
+            BuildableName = "Ably.framework"
+            BlueprintName = "Ably-macOS"
+            ReferencedContainer = "container:Ably.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Cartfile

@@ -1,5 +1,5 @@
 github "ably-forks/SocketRocket" == 0.5.2-ably-2
-github "rvi/msgpack-objective-C" "ad0a627becfd27ca45dfa6684b3fc79f058f5ce9"
-github "ably-forks/KSCrash" "1.15.8-ably-2"
-github "whitesmith/ulid" == 1.0.3
+github "ably-forks/msgpack-objective-C" == 0.2.0-ably-1
+github "ably-forks/KSCrash" == 1.15.8-ably-2
+github "whitesmith/ulid" == 1.0.4
 github "soffes/SAMKeychain" == 1.5.3

Cartfile.private

@@ -0,0 +1,4 @@
+github "Quick/Quick" == 1.3.2
+github "Quick/Nimble" == 7.3.1
+github "steipete/Aspects" == 1.4.2
+github "SwiftyJSON/SwiftyJSON" == 4.2.0

Cartfile.resolved

@@ -1,5 +1,9 @@
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
+github "SwiftyJSON/SwiftyJSON" "4.2.0"
 github "ably-forks/KSCrash" "1.15.8-ably-2"
 github "ably-forks/SocketRocket" "0.5.2-ably-2"
-github "rvi/msgpack-objective-C" "ad0a627becfd27ca45dfa6684b3fc79f058f5ce9"
+github "ably-forks/msgpack-objective-C" "0.2.0-ably-1"
 github "soffes/SAMKeychain" "v1.5.3"
-github "whitesmith/ulid" "1.0.3"
+github "steipete/Aspects" "1.4.2"
+github "whitesmith/ulid" "1.0.4"