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

Commit 364134b

Browse files
flovilmartflovilmart
committed
Improves carthage settings
1 parent 422d3f7 commit 364134b

File tree

11 files changed

+199
-33
lines changed

11 files changed

+199
-33
lines changed

‎Cartfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
github "BoltsFramework/Bolts-Swift"
2-
github "facebook/SocketRocket" "0.4.2"
3-
github "ParsePlatform/Parse-SDK-iOS-OSX"
1+
github "BoltsFramework/Bolts-Swift" == 1.3.0
2+
github "facebook/SocketRocket" "master"
3+
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" "0.4.2"
3+
github "facebook/SocketRocket" "41b57bb2fc292a814f758441a05243eb38457027"
44
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.14.2"

‎Carthage/Checkouts/SocketRocket‎

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,15 @@
135135
isa = PBXNativeTarget;
136136
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
137137
buildPhases = (
138+
208FAA4977FAE6125655600F /* [CP] Check Pods Manifest.lock */,
138139
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
139140
F509D52E1CA9E597007B15B0 /* Sources */,
140141
F509D52F1CA9E597007B15B0 /* Frameworks */,
141142
F509D5301CA9E597007B15B0 /* Resources */,
142143
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
143144
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
145+
AEF3C7E9E62737C95CCEDF15 /* 📦 Embed Pods Frameworks */,
146+
6527F5DEB5EFD1866B2614D7 /* 📦 Copy Pods Resources */,
144147
);
145148
buildRules = (
146149
);
@@ -218,6 +221,36 @@
218221
/* End PBXResourcesBuildPhase section */
219222

220223
/* 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+
};
221254
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
222255
isa = PBXShellScriptBuildPhase;
223256
buildActionMask = 2147483647;
@@ -248,6 +281,21 @@
248281
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
249282
showEnvVarsInLog = 0;
250283
};
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+
};
251299
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
252300
isa = PBXShellScriptBuildPhase;
253301
buildActionMask = 2147483647;
@@ -298,6 +346,7 @@
298346
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
299347
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
300348
PRODUCT_NAME = "$(TARGET_NAME)";
349+
SWIFT_VERSION = 3.0;
301350
};
302351
name = Debug;
303352
};
@@ -311,6 +360,7 @@
311360
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
312361
PRODUCT_BUNDLE_IDENTIFIER = com.parse.LiveQueryDemo;
313362
PRODUCT_NAME = "$(TARGET_NAME)";
363+
SWIFT_VERSION = 3.0;
314364
};
315365
name = Release;
316366
};

‎Examples/LiveQueryDemo.xcodeproj/project.pbxproj‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,15 @@
123123
isa = PBXNativeTarget;
124124
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
125125
buildPhases = (
126+
9D539417025C30ADB0E1A1F6 /* [CP] Check Pods Manifest.lock */,
126127
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
127128
F509D5131CA9E4AE007B15B0 /* Sources */,
128129
F509D5141CA9E4AE007B15B0 /* Frameworks */,
129130
F509D5151CA9E4AE007B15B0 /* Resources */,
130131
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
131132
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
133+
EAD62EF23FE70C6E3984EDE6 /* 📦 Embed Pods Frameworks */,
134+
E3F143CFD9CCD46782420827 /* 📦 Copy Pods Resources */,
132135
);
133136
buildRules = (
134137
);
@@ -222,6 +225,21 @@
222225
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
223226
showEnvVarsInLog = 0;
224227
};
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+
};
225243
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
226244
isa = PBXShellScriptBuildPhase;
227245
buildActionMask = 2147483647;
@@ -237,6 +255,21 @@
237255
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
238256
showEnvVarsInLog = 0;
239257
};
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+
};
240273
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
241274
isa = PBXShellScriptBuildPhase;
242275
buildActionMask = 2147483647;
@@ -252,6 +285,21 @@
252285
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";
253286
showEnvVarsInLog = 0;
254287
};
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+
};
255303
/* End PBXShellScriptBuildPhase section */
256304

257305
/* Begin PBXSourcesBuildPhase section */

‎Gemfile‎

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

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

‎Gemfile.lock‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.0.0)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (4.2.7.1)
65
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
89
tzinfo (~> 1.1)
910
claide (1.0.0)
10-
cocoapods (1.0.1)
11-
activesupport (>= 4.0.2)
11+
cocoapods (1.1.0.rc.2)
12+
activesupport (>= 4.0.2, < 5)
1213
claide (>= 1.0.0, < 2.0)
13-
cocoapods-core (= 1.0.1)
14-
cocoapods-deintegrate (>= 1.0.0, < 2.0)
15-
cocoapods-downloader (>= 1.0.0, < 2.0)
14+
cocoapods-core (= 1.1.0.rc.2)
15+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
16+
cocoapods-downloader (>= 1.1.1, < 2.0)
1617
cocoapods-plugins (>= 1.0.0, < 2.0)
1718
cocoapods-search (>= 1.0.0, < 2.0)
1819
cocoapods-stats (>= 1.0.0, < 2.0)
1920
cocoapods-trunk (>= 1.0.0, < 2.0)
20-
cocoapods-try (>= 1.0.0, < 2.0)
21+
cocoapods-try (>= 1.1.0, < 2.0)
2122
colored (~> 1.2)
2223
escape (~> 0.0.4)
23-
fourflusher (~> 0.3.0)
24-
molinillo (~> 0.4.5)
24+
fourflusher (~> 1.0.1)
25+
gh_inspector (~> 1.0)
26+
molinillo (~> 0.5.1)
2527
nap (~> 1.0)
26-
xcodeproj (>= 1.1.0, < 2.0)
27-
cocoapods-core (1.0.1)
28-
activesupport (>= 4.0.2)
28+
xcodeproj (>= 1.3.1, < 2.0)
29+
cocoapods-core (1.1.0.rc.2)
30+
activesupport (>= 4.0.2, < 5)
2931
fuzzy_match (~> 2.0.4)
3032
nap (~> 1.0)
31-
cocoapods-deintegrate (1.0.0)
32-
cocoapods-downloader (1.1.0)
33+
cocoapods-deintegrate (1.0.1)
34+
cocoapods-downloader (1.1.1)
3335
cocoapods-plugins (1.0.0)
3436
nap
3537
cocoapods-search (1.0.0)
@@ -39,20 +41,21 @@ GEM
3941
netrc (= 0.7.8)
4042
cocoapods-try (1.1.0)
4143
colored (1.2)
42-
concurrent-ruby (1.0.2)
4344
escape (0.0.4)
44-
fourflusher (0.3.2)
45+
fourflusher (1.0.1)
4546
fuzzy_match (2.0.4)
47+
gh_inspector (1.0.2)
4648
i18n (0.7.0)
49+
json (1.8.3)
4750
minitest (5.9.0)
48-
molinillo (0.4.5)
51+
molinillo (0.5.1)
4952
nap (1.1.0)
5053
netrc (0.7.8)
5154
rouge (1.11.1)
5255
thread_safe (0.3.5)
5356
tzinfo (1.2.2)
5457
thread_safe (~> 0.1)
55-
xcodeproj (1.2.0)
58+
xcodeproj (1.3.1)
5659
activesupport (>= 3)
5760
claide (>= 1.0.0, < 2.0)
5861
colored (~> 1.2)
@@ -63,8 +66,8 @@ PLATFORMS
6366
ruby
6467

6568
DEPENDENCIES
66-
cocoapods
69+
cocoapods (= 1.1.0.rc.2)
6770
xcpretty
6871

6972
BUNDLED WITH
70-
1.12.5
73+
1.13.1

‎ParseLiveQuery.podspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ Pod::Spec.new do |s|
1111
s.requires_arc = true
1212

1313
s.ios.deployment_target = '8.0'
14-
s.osx.deployment_target = '10.9'
14+
s.osx.deployment_target = '10.10'
1515

1616
s.source_files = 'Sources/ParseLiveQuery/**/*.swift'
1717
s.module_name = 'ParseLiveQuery'
1818

19-
s.dependency 'Parse', '~> 1.14'
20-
s.dependency 'Bolts-Swift', '~> 1.2'
19+
s.dependency 'Parse', '~> 1.14.2'
20+
s.dependency 'Bolts-Swift', '~> 1.3'
2121
s.dependency 'SocketRocket', '~> 0.5'
2222
end

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def commonPods
88
end
99

1010
post_install do |installer|
11-
# Disable bitcode for now. Specifically needed for HockeySDK and ARAnalytics.
11+
# Force Swift version for Xcode 8
1212
installer.pods_project.targets.each do |target|
1313
target.build_configurations.each do |config|
1414
config.build_settings['SWIFT_VERSION'] = '3.0'

‎Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
2626
Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230
2727
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
2828

29-
PODFILE CHECKSUM: 6e85eacd328c6d22732f2290677ff90162634615
29+
PODFILE CHECKSUM: ccd9b68a1b8b06aee68db55ab458175ae7383cef
3030

31-
COCOAPODS: 1.0.1
31+
COCOAPODS: 1.1.0.rc.2

0 commit comments

Comments
 (0)