Carthage support, updated Starscream to 2.0.1

.gitignore

@@ -22,13 +22,12 @@ DerivedData
 # Bundler
 .bundle
 
-Carthage
+Carthage/Build
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 # 
 # Note: if you ignore the Pods directory, make sure to uncomment
 # `pod install` in .travis.yml
 #
-Pods/
-Example/Pods/
+Example/Pods

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "Carthage/Checkouts/Starscream"]
+ path = Carthage/Checkouts/Starscream
+ url = https://github.com/daltoniam/Starscream
+[submodule "Carthage/Checkouts/Quick"]
+ path = Carthage/Checkouts/Quick
+ url = https://github.com/Quick/Quick
+[submodule "Carthage/Checkouts/Nimble"]
+ path = Carthage/Checkouts/Nimble
+ url = https://github.com/Quick/Nimble

.swift-version

@@ -0,0 +1 @@
+3.0

Example/ActionCableClient-Tests-tvOS/ActionCableClient_Tests_tvOS.swift → ActionCableClient-Test-iOS/ActionCableClient_Test_iOS.swift

@@ -1,14 +1,14 @@
 //
-// ActionCableClient_Tests_tvOS.swift
-// ActionCableClient-Tests-tvOS
+// ActionCableClient_Test_iOS.swift
+// ActionCableClient-Test-iOS
 //
-// Created by Daniel Rhodes on 8/27/16.
+// Created by Daniel Rhodes on 10/28/16.
 // Copyright © 2016 Daniel Rhodes. All rights reserved.
 //
 
 import XCTest
 
-class ActionCableClient_Tests_tvOS: XCTestCase {
+class ActionCableClient_Test_iOS: XCTestCase {
 
  override func setUp() {
  super.setUp()

Example/Tests/Info.plist → ActionCableClient-Test-iOS/Info.plist

@@ -16,8 +16,6 @@
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
  <string>1.0</string>
- <key>CFBundleSignature</key>
- <string>????</string>
  <key>CFBundleVersion</key>
  <string>1</string>
 </dict>

ActionCableClient.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "ActionCableClient"
- s.version = "0.2.0"
+ s.version = "0.2.1"
  s.summary = "A Swift client for the Rails ActionCable WebSocket server."
  s.description = <<-DESC
  ActionCable is a new WebSocket server being released with Rails 5 which makes it easy to add real-time features to your app. This Swift client makes it dead-simple to connect with that server, abstracting away everything except what you need to get going.
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
  s.tvos.deployment_target = '9.0'
  s.requires_arc = true
 
- s.source_files = 'Pod/Classes/**/*'
+ s.source_files = 'Source/Classes/**/*'
  s.frameworks = 'Foundation'
- s.dependency 'Starscream', '~> 1.1.3'
+ s.dependency 'Starscream', '~> 2.0.1'
 end

Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Tests-iOS.xcscheme → ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Test-iOS.xcscheme

@@ -16,9 +16,9 @@
  skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACE41AFB9204008FA782"
- BuildableName = "ActionCableClient-Tests-iOS.xctest"
- BlueprintName = "ActionCableClient-Tests-iOS"
+ BlueprintIdentifier = "86E78D161DC330DC00FE3B71"
+ BuildableName = "ActionCableClient-Test-iOS.xctest"
+ BlueprintName = "ActionCableClient-Test-iOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
  </TestableReference>

Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Example-tvOS.xcscheme → ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-iOS.xcscheme

@@ -14,9 +14,9 @@
  buildForAnalyzing = "YES">
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "8695DB041D723C8B0072CB81"
- BuildableName = "ActionCableClient-Example-tvOS.app"
- BlueprintName = "ActionCableClient-Example-tvOS"
+ BlueprintIdentifier = "86D4510C1DC31840006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient iOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
  </BuildActionEntry>
@@ -28,26 +28,7 @@
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "8695DB171D7242D70072CB81"
- BuildableName = "ActionCableClient-Tests-tvOS.xctest"
- BlueprintName = "ActionCableClient-Tests-tvOS"
- ReferencedContainer = "container:ActionCableClient.xcodeproj">
- </BuildableReference>
- </TestableReference>
  </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "8695DB041D723C8B0072CB81"
- BuildableName = "ActionCableClient-Example-tvOS.app"
- BlueprintName = "ActionCableClient-Example-tvOS"
- ReferencedContainer = "container:ActionCableClient.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
  <AdditionalOptions>
  </AdditionalOptions>
  </TestAction>
@@ -61,16 +42,15 @@
  debugDocumentVersioning = "YES"
  debugServiceExtension = "internal"
  allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
+ <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "8695DB041D723C8B0072CB81"
- BuildableName = "ActionCableClient-Example-tvOS.app"
- BlueprintName = "ActionCableClient-Example-tvOS"
+ BlueprintIdentifier = "86D4510C1DC31840006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient iOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
- </BuildableProductRunnable>
+ </MacroExpansion>
  <AdditionalOptions>
  </AdditionalOptions>
  </LaunchAction>
@@ -80,16 +60,15 @@
  savedToolIdentifier = ""
  useCustomWorkingDirectory = "NO"
  debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
+ <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "8695DB041D723C8B0072CB81"
- BuildableName = "ActionCableClient-Example-tvOS.app"
- BlueprintName = "ActionCableClient-Example-tvOS"
+ BlueprintIdentifier = "86D4510C1DC31840006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient iOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
- </BuildableProductRunnable>
+ </MacroExpansion>
  </ProfileAction>
  <AnalyzeAction
  buildConfiguration = "Debug">

Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Example-iOS.xcscheme → ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-tvOS.xcscheme

@@ -7,30 +7,16 @@
  buildImplicitDependencies = "YES">
  <BuildActionEntries>
  <BuildActionEntry
- buildForTesting = "NO"
+ buildForTesting = "YES"
  buildForRunning = "YES"
  buildForProfiling = "YES"
  buildForArchiving = "YES"
  buildForAnalyzing = "YES">
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "ActionCableClient-Example-iOS.app"
- BlueprintName = "ActionCableClient-Example-iOS"
- ReferencedContainer = "container:ActionCableClient.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "NO"
- buildForRunning = "NO"
- buildForProfiling = "NO"
- buildForArchiving = "NO"
- buildForAnalyzing = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACE41AFB9204008FA782"
- BuildableName = "ActionCableClient-Tests-iOS.xctest"
- BlueprintName = "ActionCableClient-Tests-iOS"
+ BlueprintIdentifier = "86D451321DC3189D006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient tvOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
  </BuildActionEntry>
@@ -43,15 +29,6 @@
  shouldUseLaunchSchemeArgsEnv = "YES">
  <Testables>
  </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "ActionCableClient-Example-iOS.app"
- BlueprintName = "ActionCableClient-Example-iOS"
- ReferencedContainer = "container:ActionCableClient.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
  <AdditionalOptions>
  </AdditionalOptions>
  </TestAction>
@@ -65,16 +42,15 @@
  debugDocumentVersioning = "YES"
  debugServiceExtension = "internal"
  allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
+ <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "ActionCableClient-Example-iOS.app"
- BlueprintName = "ActionCableClient-Example-iOS"
+ BlueprintIdentifier = "86D451321DC3189D006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient tvOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
- </BuildableProductRunnable>
+ </MacroExpansion>
  <AdditionalOptions>
  </AdditionalOptions>
  </LaunchAction>
@@ -84,16 +60,15 @@
  savedToolIdentifier = ""
  useCustomWorkingDirectory = "NO"
  debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
+ <MacroExpansion>
  <BuildableReference
  BuildableIdentifier = "primary"
- BlueprintIdentifier = "607FACCF1AFB9204008FA782"
- BuildableName = "ActionCableClient-Example-iOS.app"
- BlueprintName = "ActionCableClient-Example-iOS"
+ BlueprintIdentifier = "86D451321DC3189D006A516E"
+ BuildableName = "ActionCableClient.framework"
+ BlueprintName = "ActionCableClient tvOS"
  ReferencedContainer = "container:ActionCableClient.xcodeproj">
  </BuildableReference>
- </BuildableProductRunnable>
+ </MacroExpansion>
  </ProfileAction>
  <AnalyzeAction
  buildConfiguration = "Debug">

ActionCableClient.xcworkspace/xcshareddata/ActionCableClient.xcscmblueprint

@@ -0,0 +1,44 @@
+{
+ "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "2CCDC1610803362D85FD5515E3EF8513D933EF35",
+ "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+ },
+ "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+ "95438028B10BBB846574013D29F154A00556A9D1" : 9223372036854775807,
+ "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : 9223372036854775807,
+ "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : 9223372036854775807,
+ "2CCDC1610803362D85FD5515E3EF8513D933EF35" : 9223372036854775807
+ },
+ "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "36685242-4428-4E9A-B5C4-0BC2C0F51CCF",
+ "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+ "95438028B10BBB846574013D29F154A00556A9D1" : "Swift-ActionCableClient\/Carthage\/Checkouts\/Nimble\/",
+ "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64" : "Swift-ActionCableClient\/Carthage\/Checkouts\/Quick\/",
+ "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D" : "Swift-ActionCableClient\/Carthage\/Checkouts\/Starscream\/",
+ "2CCDC1610803362D85FD5515E3EF8513D933EF35" : "Swift-ActionCableClient\/"
+ },
+ "DVTSourceControlWorkspaceBlueprintNameKey" : "ActionCableClient",
+ "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+ "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "ActionCableClient.xcworkspace",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+ {
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:danielrhodes\/Swift-ActionCableClient.git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "2CCDC1610803362D85FD5515E3EF8513D933EF35"
+ },
+ {
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Nimble",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "95438028B10BBB846574013D29F154A00556A9D1"
+ },
+ {
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/daltoniam\/Starscream",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C86D95FCAEB1FEA0694B5D4AC7241D7E5F42F31D"
+ },
+ {
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/Quick\/Quick",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+ "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D0725CAC6FF2D66F2C83C2C48DC12106D42DAA64"
+ }
+ ]
+}

Cartfile

@@ -0,0 +1 @@
+github "daltoniam/starscream"

Cartfile.resolved

@@ -0,0 +1 @@
+github "daltoniam/Starscream" "v2.0.1"

Example/ActionCableClient-Example-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+// Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

Example/ActionCableClient-Example-tvOS/AppDelegate.swift → Example/ActionCableClient-Example-tVOS/AppDelegate.swift

@@ -1,21 +1,20 @@
 //
 // AppDelegate.swift
-// ActionCableClient-Example-tvOS
+// ActionCableClient-Example-tVOS
 //
-// Created by Daniel Rhodes on 8/27/16.
+// Created by Daniel Rhodes on 10/27/16.
 // Copyright © 2016 Daniel Rhodes. All rights reserved.
 //
 
 import UIKit
-import ActionCableClient
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
  var window: UIWindow?
 
 
- func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: Any]?) -> Bool {
+ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
  // Override point for customization after application launch.
  return true
  }
@@ -31,7 +30,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  }
 
  func applicationWillEnterForeground(_ application: UIApplication) {
- // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
+ // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
  }
 
  func applicationDidBecomeActive(_ application: UIApplication) {

Example/ActionCableClient-Example-tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json → Example/ActionCableClient-Example-tVOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json

@@ -12,6 +12,12 @@
  "filename" : "App Icon - Small.imagestack",
  "role" : "primary-app-icon"
  },
+ {
+ "size" : "2320x720",
+ "idiom" : "tv",
+ "filename" : "Top Shelf Image Wide.imageset",
+ "role" : "top-shelf-image-wide"
+ },
  {
  "size" : "1920x720",
  "idiom" : "tv",