Skip to content
This repository was archived by the owner on Jun 13, 2023. It is now read-only.

Commit 317e13d

Browse files
committed
Proper carthage support
- Uses tagged fork 0.6.0 for compatibility with podspec - fork is located on parse-server modules - fork is published on CocoaPods under SocketRocketParseLiveQuery
1 parent c8fca2d commit 317e13d

File tree

7 files changed

+26
-22
lines changed

7 files changed

+26
-22
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
url = https://github.com/BoltsFramework/Bolts-Swift.git
77
[submodule "Carthage/Checkouts/SocketRocket"]
88
path = Carthage/Checkouts/SocketRocket
9-
url = https://github.com/facebook/SocketRocket.git
9+
url = https://github.com/parse-server-modules/SocketRocket.git
1010
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
1111
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
1212
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "BoltsFramework/Bolts-Swift" == 1.3.0
2-
github "facebook/SocketRocket" "master"
2+
github "parse-server-modules/SocketRocket" == 0.6.0
33
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
44

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
github "BoltsFramework/Bolts-ObjC" "1.8.4"
22
github "BoltsFramework/Bolts-Swift" "1.3.0"
3-
github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027"
3+
github "parse-server-modules/SocketRocket" "0.6.0"
44
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
22

33
gem 'xcpretty'
44
# xcode8 compat
5-
gem 'cocoapods', '1.1.0.rc.2'
5+
gem 'cocoapods', '1.1.1'

Gemfile.lock

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,76 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
CFPropertyList (2.3.4)
45
activesupport (4.2.7.1)
56
i18n (~> 0.7)
67
json (~> 1.7, >= 1.7.7)
78
minitest (~> 5.1)
89
thread_safe (~> 0.3, >= 0.3.4)
910
tzinfo (~> 1.1)
10-
claide (1.0.0)
11-
cocoapods (1.1.0.rc.2)
11+
claide (1.0.1)
12+
cocoapods (1.1.1)
1213
activesupport (>= 4.0.2, < 5)
13-
claide (>= 1.0.0, < 2.0)
14-
cocoapods-core (= 1.1.0.rc.2)
14+
claide (>= 1.0.1, < 2.0)
15+
cocoapods-core (= 1.1.1)
1516
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16-
cocoapods-downloader (>= 1.1.1, < 2.0)
17+
cocoapods-downloader (>= 1.1.2, < 2.0)
1718
cocoapods-plugins (>= 1.0.0, < 2.0)
1819
cocoapods-search (>= 1.0.0, < 2.0)
1920
cocoapods-stats (>= 1.0.0, < 2.0)
20-
cocoapods-trunk (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.1.1, < 2.0)
2122
cocoapods-try (>= 1.1.0, < 2.0)
2223
colored (~> 1.2)
2324
escape (~> 0.0.4)
24-
fourflusher (~> 1.0.1)
25+
fourflusher (~> 2.0.1)
2526
gh_inspector (~> 1.0)
2627
molinillo (~> 0.5.1)
2728
nap (~> 1.0)
28-
xcodeproj (>= 1.3.1, < 2.0)
29-
cocoapods-core (1.1.0.rc.2)
29+
xcodeproj (>= 1.3.3, < 2.0)
30+
cocoapods-core (1.1.1)
3031
activesupport (>= 4.0.2, < 5)
3132
fuzzy_match (~> 2.0.4)
3233
nap (~> 1.0)
3334
cocoapods-deintegrate (1.0.1)
34-
cocoapods-downloader (1.1.1)
35+
cocoapods-downloader (1.1.3)
3536
cocoapods-plugins (1.0.0)
3637
nap
3738
cocoapods-search (1.0.0)
3839
cocoapods-stats (1.0.0)
39-
cocoapods-trunk (1.0.0)
40+
cocoapods-trunk (1.1.2)
4041
nap (>= 0.8, < 2.0)
4142
netrc (= 0.7.8)
4243
cocoapods-try (1.1.0)
4344
colored (1.2)
4445
escape (0.0.4)
45-
fourflusher (1.0.1)
46+
fourflusher (2.0.1)
4647
fuzzy_match (2.0.4)
4748
gh_inspector (1.0.2)
4849
i18n (0.7.0)
4950
json (1.8.3)
5051
minitest (5.9.0)
51-
molinillo (0.5.1)
52+
molinillo (0.5.5)
53+
nanaimo (0.2.3)
5254
nap (1.1.0)
5355
netrc (0.7.8)
5456
rouge (1.11.1)
5557
thread_safe (0.3.5)
5658
tzinfo (1.2.2)
5759
thread_safe (~> 0.1)
58-
xcodeproj (1.3.1)
60+
xcodeproj (1.4.2)
61+
CFPropertyList (~> 2.3.3)
5962
activesupport (>= 3)
60-
claide (>= 1.0.0, < 2.0)
63+
claide (>= 1.0.1, < 2.0)
6164
colored (~> 1.2)
65+
nanaimo (~> 0.2.3)
6266
xcpretty (0.2.2)
6367
rouge (~> 1.8)
6468

6569
PLATFORMS
6670
ruby
6771

6872
DEPENDENCIES
69-
cocoapods (= 1.1.0.rc.2)
73+
cocoapods (= 1.1.1)
7074
xcpretty
7175

7276
BUNDLED WITH

ParseLiveQuery.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ Pod::Spec.new do |s|
2121

2222
s.dependency 'Parse', '~> 1.14.2'
2323
s.dependency 'Bolts-Swift', '~> 1.3'
24-
s.dependency 'SocketRocket', '~> 0.5'
24+
s.dependency 'SocketRocketParseLiveQuery', '~> 0.6'
2525
end

0 commit comments

Comments
 (0)