Skip to content

Commit 39f6c5e

Browse files
danielrhodesdanielrhodes
committed
Carthage support, updated Starscream to 2.0.1
1 parent 2f57057 commit 39f6c5e

File tree

69 files changed

+1546
-5450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1546
-5450
lines changed

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ DerivedData
2222
# Bundler
2323
.bundle
2424

25-
Carthage
25+
Carthage/Build
2626
# We recommend against adding the Pods directory to your .gitignore. However
2727
# you should judge for yourself, the pros and cons are mentioned at:
2828
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
2929
#
3030
# Note: if you ignore the Pods directory, make sure to uncomment
3131
# `pod install` in .travis.yml
3232
#
33-
Pods/
34-
Example/Pods/
33+
Example/Pods

‎.gitmodules‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "Carthage/Checkouts/Starscream"]
2+
path = Carthage/Checkouts/Starscream
3+
url = https://github.com/daltoniam/Starscream
4+
[submodule "Carthage/Checkouts/Quick"]
5+
path = Carthage/Checkouts/Quick
6+
url = https://github.com/Quick/Quick
7+
[submodule "Carthage/Checkouts/Nimble"]
8+
path = Carthage/Checkouts/Nimble
9+
url = https://github.com/Quick/Nimble

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0

‎Example/ActionCableClient-Tests-tvOS/ActionCableClient_Tests_tvOS.swift‎ renamed to ‎ActionCableClient-Test-iOS/ActionCableClient_Test_iOS.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//
2-
// ActionCableClient_Tests_tvOS.swift
3-
// ActionCableClient-Tests-tvOS
2+
// ActionCableClient_Test_iOS.swift
3+
// ActionCableClient-Test-iOS
44
//
5-
// Created by Daniel Rhodes on 8/27/16.
5+
// Created by Daniel Rhodes on 10/28/16.
66
// Copyright © 2016 Daniel Rhodes. All rights reserved.
77
//
88

99
import XCTest
1010

11-
class ActionCableClient_Tests_tvOS: XCTestCase {
11+
class ActionCableClient_Test_iOS: XCTestCase {
1212

1313
override func setUp() {
1414
super.setUp()

‎Example/Tests/Info.plist‎ renamed to ‎ActionCableClient-Test-iOS/Info.plist‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
2119
<key>CFBundleVersion</key>
2220
<string>1</string>
2321
</dict>

‎ActionCableClient.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "ActionCableClient"
3-
s.version = "0.2.0"
3+
s.version = "0.2.1"
44
s.summary = "A Swift client for the Rails ActionCable WebSocket server."
55
s.description = <<-DESC
66
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|
1717
s.tvos.deployment_target = '9.0'
1818
s.requires_arc = true
1919

20-
s.source_files = 'Pod/Classes/**/*'
20+
s.source_files = 'Source/Classes/**/*'
2121
s.frameworks = 'Foundation'
22-
s.dependency 'Starscream', '~> 1.1.3'
22+
s.dependency 'Starscream', '~> 2.0.1'
2323
end

‎ActionCableClient.xcodeproj/project.pbxproj‎

Lines changed: 679 additions & 0 deletions
Large diffs are not rendered by default.

‎Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Tests-iOS.xcscheme‎ renamed to ‎ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Test-iOS.xcscheme‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
skipped = "NO">
1717
<BuildableReference
1818
BuildableIdentifier = "primary"
19-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
20-
BuildableName = "ActionCableClient-Tests-iOS.xctest"
21-
BlueprintName = "ActionCableClient-Tests-iOS"
19+
BlueprintIdentifier = "86E78D161DC330DC00FE3B71"
20+
BuildableName = "ActionCableClient-Test-iOS.xctest"
21+
BlueprintName = "ActionCableClient-Test-iOS"
2222
ReferencedContainer = "container:ActionCableClient.xcodeproj">
2323
</BuildableReference>
2424
</TestableReference>

‎Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Example-tvOS.xcscheme‎ renamed to ‎ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-iOS.xcscheme‎

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "8695DB041D723C8B0072CB81"
18-
BuildableName = "ActionCableClient-Example-tvOS.app"
19-
BlueprintName = "ActionCableClient-Example-tvOS"
17+
BlueprintIdentifier = "86D4510C1DC31840006A516E"
18+
BuildableName = "ActionCableClient.framework"
19+
BlueprintName = "ActionCableClient iOS"
2020
ReferencedContainer = "container:ActionCableClient.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -28,26 +28,7 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31-
<TestableReference
32-
skipped = "NO">
33-
<BuildableReference
34-
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "8695DB171D7242D70072CB81"
36-
BuildableName = "ActionCableClient-Tests-tvOS.xctest"
37-
BlueprintName = "ActionCableClient-Tests-tvOS"
38-
ReferencedContainer = "container:ActionCableClient.xcodeproj">
39-
</BuildableReference>
40-
</TestableReference>
4131
</Testables>
42-
<MacroExpansion>
43-
<BuildableReference
44-
BuildableIdentifier = "primary"
45-
BlueprintIdentifier = "8695DB041D723C8B0072CB81"
46-
BuildableName = "ActionCableClient-Example-tvOS.app"
47-
BlueprintName = "ActionCableClient-Example-tvOS"
48-
ReferencedContainer = "container:ActionCableClient.xcodeproj">
49-
</BuildableReference>
50-
</MacroExpansion>
5132
<AdditionalOptions>
5233
</AdditionalOptions>
5334
</TestAction>
@@ -61,16 +42,15 @@
6142
debugDocumentVersioning = "YES"
6243
debugServiceExtension = "internal"
6344
allowLocationSimulation = "YES">
64-
<BuildableProductRunnable
65-
runnableDebuggingMode = "0">
45+
<MacroExpansion>
6646
<BuildableReference
6747
BuildableIdentifier = "primary"
68-
BlueprintIdentifier = "8695DB041D723C8B0072CB81"
69-
BuildableName = "ActionCableClient-Example-tvOS.app"
70-
BlueprintName = "ActionCableClient-Example-tvOS"
48+
BlueprintIdentifier = "86D4510C1DC31840006A516E"
49+
BuildableName = "ActionCableClient.framework"
50+
BlueprintName = "ActionCableClient iOS"
7151
ReferencedContainer = "container:ActionCableClient.xcodeproj">
7252
</BuildableReference>
73-
</BuildableProductRunnable>
53+
</MacroExpansion>
7454
<AdditionalOptions>
7555
</AdditionalOptions>
7656
</LaunchAction>
@@ -80,16 +60,15 @@
8060
savedToolIdentifier = ""
8161
useCustomWorkingDirectory = "NO"
8262
debugDocumentVersioning = "YES">
83-
<BuildableProductRunnable
84-
runnableDebuggingMode = "0">
63+
<MacroExpansion>
8564
<BuildableReference
8665
BuildableIdentifier = "primary"
87-
BlueprintIdentifier = "8695DB041D723C8B0072CB81"
88-
BuildableName = "ActionCableClient-Example-tvOS.app"
89-
BlueprintName = "ActionCableClient-Example-tvOS"
66+
BlueprintIdentifier = "86D4510C1DC31840006A516E"
67+
BuildableName = "ActionCableClient.framework"
68+
BlueprintName = "ActionCableClient iOS"
9069
ReferencedContainer = "container:ActionCableClient.xcodeproj">
9170
</BuildableReference>
92-
</BuildableProductRunnable>
71+
</MacroExpansion>
9372
</ProfileAction>
9473
<AnalyzeAction
9574
buildConfiguration = "Debug">

‎Example/ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-Example-iOS.xcscheme‎ renamed to ‎ActionCableClient.xcodeproj/xcshareddata/xcschemes/ActionCableClient-tvOS.xcscheme‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,16 @@
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForTesting = "NO"
10+
buildForTesting = "YES"
1111
buildForRunning = "YES"
1212
buildForProfiling = "YES"
1313
buildForArchiving = "YES"
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
18-
BuildableName = "ActionCableClient-Example-iOS.app"
19-
BlueprintName = "ActionCableClient-Example-iOS"
20-
ReferencedContainer = "container:ActionCableClient.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "NO"
25-
buildForRunning = "NO"
26-
buildForProfiling = "NO"
27-
buildForArchiving = "NO"
28-
buildForAnalyzing = "NO">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "607FACE41AFB9204008FA782"
32-
BuildableName = "ActionCableClient-Tests-iOS.xctest"
33-
BlueprintName = "ActionCableClient-Tests-iOS"
17+
BlueprintIdentifier = "86D451321DC3189D006A516E"
18+
BuildableName = "ActionCableClient.framework"
19+
BlueprintName = "ActionCableClient tvOS"
3420
ReferencedContainer = "container:ActionCableClient.xcodeproj">
3521
</BuildableReference>
3622
</BuildActionEntry>
@@ -43,15 +29,6 @@
4329
shouldUseLaunchSchemeArgsEnv = "YES">
4430
<Testables>
4531
</Testables>
46-
<MacroExpansion>
47-
<BuildableReference
48-
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
50-
BuildableName = "ActionCableClient-Example-iOS.app"
51-
BlueprintName = "ActionCableClient-Example-iOS"
52-
ReferencedContainer = "container:ActionCableClient.xcodeproj">
53-
</BuildableReference>
54-
</MacroExpansion>
5532
<AdditionalOptions>
5633
</AdditionalOptions>
5734
</TestAction>
@@ -65,16 +42,15 @@
6542
debugDocumentVersioning = "YES"
6643
debugServiceExtension = "internal"
6744
allowLocationSimulation = "YES">
68-
<BuildableProductRunnable
69-
runnableDebuggingMode = "0">
45+
<MacroExpansion>
7046
<BuildableReference
7147
BuildableIdentifier = "primary"
72-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
73-
BuildableName = "ActionCableClient-Example-iOS.app"
74-
BlueprintName = "ActionCableClient-Example-iOS"
48+
BlueprintIdentifier = "86D451321DC3189D006A516E"
49+
BuildableName = "ActionCableClient.framework"
50+
BlueprintName = "ActionCableClient tvOS"
7551
ReferencedContainer = "container:ActionCableClient.xcodeproj">
7652
</BuildableReference>
77-
</BuildableProductRunnable>
53+
</MacroExpansion>
7854
<AdditionalOptions>
7955
</AdditionalOptions>
8056
</LaunchAction>
@@ -84,16 +60,15 @@
8460
savedToolIdentifier = ""
8561
useCustomWorkingDirectory = "NO"
8662
debugDocumentVersioning = "YES">
87-
<BuildableProductRunnable
88-
runnableDebuggingMode = "0">
63+
<MacroExpansion>
8964
<BuildableReference
9065
BuildableIdentifier = "primary"
91-
BlueprintIdentifier = "607FACCF1AFB9204008FA782"
92-
BuildableName = "ActionCableClient-Example-iOS.app"
93-
BlueprintName = "ActionCableClient-Example-iOS"
66+
BlueprintIdentifier = "86D451321DC3189D006A516E"
67+
BuildableName = "ActionCableClient.framework"
68+
BlueprintName = "ActionCableClient tvOS"
9469
ReferencedContainer = "container:ActionCableClient.xcodeproj">
9570
</BuildableReference>
96-
</BuildableProductRunnable>
71+
</MacroExpansion>
9772
</ProfileAction>
9873
<AnalyzeAction
9974
buildConfiguration = "Debug">

0 commit comments

Comments
 (0)