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

Commit 530452b

Browse files
flovilmartflovilmart
authored
Version 2.0.0 (#95)
* Deprecates usage of SocketRocket in favour of Starscream * Full support and compatibility with Carthage * Removes building dependency in CocoaPods
1 parent 69c0536 commit 530452b

File tree

17 files changed

+445
-511
lines changed

17 files changed

+445
-511
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[submodule "Carthage/Checkouts/Bolts-Swift"]
55
path = Carthage/Checkouts/Bolts-Swift
66
url = https://github.com/BoltsFramework/Bolts-Swift.git
7-
[submodule "Carthage/Checkouts/SocketRocket"]
8-
path = Carthage/Checkouts/SocketRocket
9-
url = https://github.com/facebook/SocketRocket.git
107
[submodule "Carthage/Checkouts/Parse-SDK-iOS-OSX"]
118
path = Carthage/Checkouts/Parse-SDK-iOS-OSX
129
url = https://github.com/ParsePlatform/Parse-SDK-iOS-OSX.git
10+
[submodule "Carthage/Checkouts/Starscream"]
11+
path = Carthage/Checkouts/Starscream
12+
url = https://github.com/daltoniam/Starscream.git

‎.travis.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ env:
1717
install:
1818
- |
1919
bundle install
20-
bundle exec pod repo update
21-
bundle exec pod install
2220
script:
2321
- |
2422
if [ "$TEST_TYPE" = iOS ]; then
@@ -36,8 +34,8 @@ script:
3634
xcodebuild clean -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC | xcpretty -c
3735
xcodebuild build -workspace ParseLiveQuery.xcworkspace -scheme LiveQueryDemo-ObjC -configuration Debug | xcpretty -c
3836
elif [ "$TEST_TYPE" = CocoaPods ]; then
39-
# SocketRocket produces warnings on xcode8
40-
pod lib lint ParseLiveQuery.podspec --allow-warnings
37+
bundle exec pod repo update 2>&1 || exit 1
38+
pod lib lint ParseLiveQuery.podspec
4139
elif [ "$TEST_TYPE" = Carthage ]; then
4240
carthage build --no-skip-current
4341
fi

‎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"
32
github "ParsePlatform/Parse-SDK-iOS-OSX" == 1.14.2
3+
github "daltoniam/Starscream" == 2.0.3
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 "daltoniam/Starscream" "2.0.3"
44
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

‎Carthage/Checkouts/SocketRocket

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Carthage/Checkouts/Starscream

Submodule Starscream added at 1385936

‎Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8FE714A9B78962AE71BE6E5 /* Pods_LiveQueryDemo_ObjC.framework */; };
1110
F509D5461CA9E5B8007B15B0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBB41CA9CA04005295C0 /* main.m */; };
1211
F509D5471CA9E5B8007B15B0 /* Message.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBC1CA9CA2B005295C0 /* Message.m */; };
1312
F509D5481CA9E5B8007B15B0 /* Room.m in Sources */ = {isa = PBXBuildFile; fileRef = F519CBBF1CA9CA34005295C0 /* Room.m */; };
@@ -61,7 +60,6 @@
6160
buildActionMask = 2147483647;
6261
files = (
6362
F570348B1CAC837800EB3067 /* ParseLiveQuery.framework in Frameworks */,
64-
8F68026DAC07EBB6ABECA553 /* Pods_LiveQueryDemo_ObjC.framework in Frameworks */,
6563
);
6664
runOnlyForDeploymentPostprocessing = 0;
6765
};
@@ -135,15 +133,9 @@
135133
isa = PBXNativeTarget;
136134
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
137135
buildPhases = (
138-
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */,
139-
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
140136
F509D52E1CA9E597007B15B0 /* Sources */,
141137
F509D52F1CA9E597007B15B0 /* Frameworks */,
142138
F509D5301CA9E597007B15B0 /* Resources */,
143-
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
144-
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
145-
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */,
146-
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */,
147139
);
148140
buildRules = (
149141
);
@@ -220,99 +212,6 @@
220212
};
221213
/* End PBXResourcesBuildPhase section */
222214

223-
/* Begin PBXShellScriptBuildPhase section */
224-
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */ = {
225-
isa = PBXShellScriptBuildPhase;
226-
buildActionMask = 2147483647;
227-
files = (
228-
);
229-
inputPaths = (
230-
);
231-
name = "[CP] Check Pods Manifest.lock";
232-
outputPaths = (
233-
);
234-
runOnlyForDeploymentPostprocessing = 0;
235-
shellPath = /bin/sh;
236-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
237-
showEnvVarsInLog = 0;
238-
};
239-
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */ = {
240-
isa = PBXShellScriptBuildPhase;
241-
buildActionMask = 2147483647;
242-
files = (
243-
);
244-
inputPaths = (
245-
);
246-
name = "📦 Copy Pods Resources";
247-
outputPaths = (
248-
);
249-
runOnlyForDeploymentPostprocessing = 0;
250-
shellPath = /bin/sh;
251-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
252-
showEnvVarsInLog = 0;
253-
};
254-
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
255-
isa = PBXShellScriptBuildPhase;
256-
buildActionMask = 2147483647;
257-
files = (
258-
);
259-
inputPaths = (
260-
);
261-
name = "[CP] Check Pods Manifest.lock";
262-
outputPaths = (
263-
);
264-
runOnlyForDeploymentPostprocessing = 0;
265-
shellPath = /bin/sh;
266-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
267-
showEnvVarsInLog = 0;
268-
};
269-
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = {
270-
isa = PBXShellScriptBuildPhase;
271-
buildActionMask = 2147483647;
272-
files = (
273-
);
274-
inputPaths = (
275-
);
276-
name = "[CP] Copy Pods Resources";
277-
outputPaths = (
278-
);
279-
runOnlyForDeploymentPostprocessing = 0;
280-
shellPath = /bin/sh;
281-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
282-
showEnvVarsInLog = 0;
283-
};
284-
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */ = {
285-
isa = PBXShellScriptBuildPhase;
286-
buildActionMask = 2147483647;
287-
files = (
288-
);
289-
inputPaths = (
290-
);
291-
name = "📦 Embed Pods Frameworks";
292-
outputPaths = (
293-
);
294-
runOnlyForDeploymentPostprocessing = 0;
295-
shellPath = /bin/sh;
296-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n";
297-
showEnvVarsInLog = 0;
298-
};
299-
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
300-
isa = PBXShellScriptBuildPhase;
301-
buildActionMask = 2147483647;
302-
files = (
303-
);
304-
inputPaths = (
305-
);
306-
name = "[CP] Embed Pods Frameworks";
307-
outputPaths = (
308-
);
309-
runOnlyForDeploymentPostprocessing = 0;
310-
shellPath = /bin/sh;
311-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-frameworks.sh\"\n";
312-
showEnvVarsInLog = 0;
313-
};
314-
/* End PBXShellScriptBuildPhase section */
315-
316215
/* Begin PBXSourcesBuildPhase section */
317216
F509D52E1CA9E597007B15B0 /* Sources */ = {
318217
isa = PBXSourcesBuildPhase;
@@ -338,7 +237,6 @@
338237
/* Begin XCBuildConfiguration section */
339238
F509D5401CA9E597007B15B0 /* Debug */ = {
340239
isa = XCBuildConfiguration;
341-
baseConfigurationReference = 46BB59B59BEB1C1B30D1528A /* Pods-LiveQueryDemo-ObjC.debug.xcconfig */;
342240
buildSettings = {
343241
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
344242
COMBINE_HIDPI_IMAGES = YES;
@@ -352,7 +250,6 @@
352250
};
353251
F509D5411CA9E597007B15B0 /* Release */ = {
354252
isa = XCBuildConfiguration;
355-
baseConfigurationReference = BBA908F914DAEEBB466454E2 /* Pods-LiveQueryDemo-ObjC.release.xcconfig */;
356253
buildSettings = {
357254
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
358255
COMBINE_HIDPI_IMAGES = YES;

‎Examples/LiveQueryDemo.xcodeproj/project.pbxproj

Lines changed: 0 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E6A6F02FD57E57309877DA38 /* Pods_LiveQueryDemo.framework */; };
1110
F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8199A4061CA1EF1800BF61E1 /* ParseLiveQuery.framework */; };
1211
F509D5291CA9E53D007B15B0 /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B61C9BB4B600566A29 /* Message.swift */; };
1312
F509D52A1CA9E53D007B15B0 /* Room.swift in Sources */ = {isa = PBXBuildFile; fileRef = F59F85B71C9BB4B600566A29 /* Room.swift */; };
@@ -50,7 +49,6 @@
5049
buildActionMask = 2147483647;
5150
files = (
5251
F509D5281CA9E4D9007B15B0 /* ParseLiveQuery.framework in Frameworks */,
53-
B88040BD3E7C225E22705572 /* Pods_LiveQueryDemo.framework in Frameworks */,
5452
);
5553
runOnlyForDeploymentPostprocessing = 0;
5654
};
@@ -123,15 +121,9 @@
123121
isa = PBXNativeTarget;
124122
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
125123
buildPhases = (
126-
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */,
127-
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
128124
F509D5131CA9E4AE007B15B0 /* Sources */,
129125
F509D5141CA9E4AE007B15B0 /* Frameworks */,
130126
F509D5151CA9E4AE007B15B0 /* Resources */,
131-
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
132-
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
133-
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */,
134-
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */,
135127
);
136128
buildRules = (
137129
);
@@ -209,99 +201,6 @@
209201
};
210202
/* End PBXResourcesBuildPhase section */
211203

212-
/* Begin PBXShellScriptBuildPhase section */
213-
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = {
214-
isa = PBXShellScriptBuildPhase;
215-
buildActionMask = 2147483647;
216-
files = (
217-
);
218-
inputPaths = (
219-
);
220-
name = "[CP] Embed Pods Frameworks";
221-
outputPaths = (
222-
);
223-
runOnlyForDeploymentPostprocessing = 0;
224-
shellPath = /bin/sh;
225-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
226-
showEnvVarsInLog = 0;
227-
};
228-
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */ = {
229-
isa = PBXShellScriptBuildPhase;
230-
buildActionMask = 2147483647;
231-
files = (
232-
);
233-
inputPaths = (
234-
);
235-
name = "[CP] Check Pods Manifest.lock";
236-
outputPaths = (
237-
);
238-
runOnlyForDeploymentPostprocessing = 0;
239-
shellPath = /bin/sh;
240-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
241-
showEnvVarsInLog = 0;
242-
};
243-
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
244-
isa = PBXShellScriptBuildPhase;
245-
buildActionMask = 2147483647;
246-
files = (
247-
);
248-
inputPaths = (
249-
);
250-
name = "[CP] Copy Pods Resources";
251-
outputPaths = (
252-
);
253-
runOnlyForDeploymentPostprocessing = 0;
254-
shellPath = /bin/sh;
255-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
256-
showEnvVarsInLog = 0;
257-
};
258-
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */ = {
259-
isa = PBXShellScriptBuildPhase;
260-
buildActionMask = 2147483647;
261-
files = (
262-
);
263-
inputPaths = (
264-
);
265-
name = "📦 Copy Pods Resources";
266-
outputPaths = (
267-
);
268-
runOnlyForDeploymentPostprocessing = 0;
269-
shellPath = /bin/sh;
270-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
271-
showEnvVarsInLog = 0;
272-
};
273-
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
274-
isa = PBXShellScriptBuildPhase;
275-
buildActionMask = 2147483647;
276-
files = (
277-
);
278-
inputPaths = (
279-
);
280-
name = "[CP] Check Pods Manifest.lock";
281-
outputPaths = (
282-
);
283-
runOnlyForDeploymentPostprocessing = 0;
284-
shellPath = /bin/sh;
285-
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
286-
showEnvVarsInLog = 0;
287-
};
288-
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */ = {
289-
isa = PBXShellScriptBuildPhase;
290-
buildActionMask = 2147483647;
291-
files = (
292-
);
293-
inputPaths = (
294-
);
295-
name = "📦 Embed Pods Frameworks";
296-
outputPaths = (
297-
);
298-
runOnlyForDeploymentPostprocessing = 0;
299-
shellPath = /bin/sh;
300-
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
301-
showEnvVarsInLog = 0;
302-
};
303-
/* End PBXShellScriptBuildPhase section */
304-
305204
/* Begin PBXSourcesBuildPhase section */
306205
F509D5131CA9E4AE007B15B0 /* Sources */ = {
307206
isa = PBXSourcesBuildPhase;
@@ -318,7 +217,6 @@
318217
/* Begin XCBuildConfiguration section */
319218
F509D5261CA9E4AE007B15B0 /* Debug */ = {
320219
isa = XCBuildConfiguration;
321-
baseConfigurationReference = 3AC9312CEDA0007F8EAA9880 /* Pods-LiveQueryDemo.debug.xcconfig */;
322220
buildSettings = {
323221
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
324222
CLANG_ANALYZER_NONNULL = YES;
@@ -333,7 +231,6 @@
333231
};
334232
F509D5271CA9E4AE007B15B0 /* Release */ = {
335233
isa = XCBuildConfiguration;
336-
baseConfigurationReference = 497772719B97C861F0896BFC /* Pods-LiveQueryDemo.release.xcconfig */;
337234
buildSettings = {
338235
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
339236
CLANG_ANALYZER_NONNULL = YES;

‎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'

0 commit comments

Comments
 (0)