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

Commit 19845eb

Browse files
authored
Merge pull request #53 from ParsePlatform/nlutsenko.dependencies
Update all dependencies and fix usage of deprecated APIs.
2 parents e9eea48 + 6a6204d commit 19845eb

File tree

12 files changed

+97
-98
lines changed

12 files changed

+97
-98
lines changed

.ruby-version

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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ branches:
33
- master
44
language: objective-c
55
os: osx
6-
osx_image: xcode7.2
6+
osx_image: xcode7.3
77
cache:
88
- cocoapods
99
env:

Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@
135135
isa = PBXNativeTarget;
136136
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
137137
buildPhases = (
138-
87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */,
138+
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
139139
F509D52E1CA9E597007B15B0 /* Sources */,
140140
F509D52F1CA9E597007B15B0 /* Frameworks */,
141141
F509D5301CA9E597007B15B0 /* Resources */,
142-
EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */,
143-
A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */,
142+
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
143+
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
144144
);
145145
buildRules = (
146146
);
@@ -218,44 +218,44 @@
218218
/* End PBXResourcesBuildPhase section */
219219

220220
/* Begin PBXShellScriptBuildPhase section */
221-
87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */ = {
221+
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
222222
isa = PBXShellScriptBuildPhase;
223223
buildActionMask = 2147483647;
224224
files = (
225225
);
226226
inputPaths = (
227227
);
228-
name = "📦 Check Pods Manifest.lock";
228+
name = "[CP] Check Pods Manifest.lock";
229229
outputPaths = (
230230
);
231231
runOnlyForDeploymentPostprocessing = 0;
232232
shellPath = /bin/sh;
233233
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";
234234
showEnvVarsInLog = 0;
235235
};
236-
A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */ = {
236+
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = {
237237
isa = PBXShellScriptBuildPhase;
238238
buildActionMask = 2147483647;
239239
files = (
240240
);
241241
inputPaths = (
242242
);
243-
name = "📦 Copy Pods Resources";
243+
name = "[CP] Copy Pods Resources";
244244
outputPaths = (
245245
);
246246
runOnlyForDeploymentPostprocessing = 0;
247247
shellPath = /bin/sh;
248248
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
249249
showEnvVarsInLog = 0;
250250
};
251-
EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */ = {
251+
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
252252
isa = PBXShellScriptBuildPhase;
253253
buildActionMask = 2147483647;
254254
files = (
255255
);
256256
inputPaths = (
257257
);
258-
name = "📦 Embed Pods Frameworks";
258+
name = "[CP] Embed Pods Frameworks";
259259
outputPaths = (
260260
);
261261
runOnlyForDeploymentPostprocessing = 0;

Examples/LiveQueryDemo.xcodeproj/project.pbxproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,12 @@
123123
isa = PBXNativeTarget;
124124
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
125125
buildPhases = (
126-
E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */,
126+
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
127127
F509D5131CA9E4AE007B15B0 /* Sources */,
128128
F509D5141CA9E4AE007B15B0 /* Frameworks */,
129129
F509D5151CA9E4AE007B15B0 /* Resources */,
130-
045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */,
131-
D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */,
130+
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
131+
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
132132
);
133133
buildRules = (
134134
);
@@ -206,44 +206,44 @@
206206
/* End PBXResourcesBuildPhase section */
207207

208208
/* Begin PBXShellScriptBuildPhase section */
209-
045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */ = {
209+
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = {
210210
isa = PBXShellScriptBuildPhase;
211211
buildActionMask = 2147483647;
212212
files = (
213213
);
214214
inputPaths = (
215215
);
216-
name = "📦 Embed Pods Frameworks";
216+
name = "[CP] Embed Pods Frameworks";
217217
outputPaths = (
218218
);
219219
runOnlyForDeploymentPostprocessing = 0;
220220
shellPath = /bin/sh;
221221
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
222222
showEnvVarsInLog = 0;
223223
};
224-
D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */ = {
224+
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
225225
isa = PBXShellScriptBuildPhase;
226226
buildActionMask = 2147483647;
227227
files = (
228228
);
229229
inputPaths = (
230230
);
231-
name = "📦 Copy Pods Resources";
231+
name = "[CP] Copy Pods Resources";
232232
outputPaths = (
233233
);
234234
runOnlyForDeploymentPostprocessing = 0;
235235
shellPath = /bin/sh;
236236
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
237237
showEnvVarsInLog = 0;
238238
};
239-
E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */ = {
239+
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
240240
isa = PBXShellScriptBuildPhase;
241241
buildActionMask = 2147483647;
242242
files = (
243243
);
244244
inputPaths = (
245245
);
246-
name = "📦 Check Pods Manifest.lock";
246+
name = "[CP] Check Pods Manifest.lock";
247247
outputPaths = (
248248
);
249249
runOnlyForDeploymentPostprocessing = 0;

Gemfile

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

33
gem 'xcpretty'
4-
gem 'cocoapods', '>= 1.0.0.beta.6'
4+
gem 'cocoapods'

Gemfile.lock

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.6)
4+
activesupport (5.0.0)
5+
concurrent-ruby (~> 1.0, >= 1.0.2)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
claide (1.0.0.beta.3)
11-
cocoapods (1.0.0.beta.6)
9+
claide (1.0.0)
10+
cocoapods (1.0.1)
1211
activesupport (>= 4.0.2)
13-
claide (>= 1.0.0.beta.3, < 2.0)
14-
cocoapods-core (= 1.0.0.beta.6)
15-
cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
16-
cocoapods-downloader (>= 1.0.0.beta.2, < 2.0)
17-
cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
18-
cocoapods-search (>= 1.0.0.beta.1, < 2.0)
19-
cocoapods-stats (>= 1.0.0.beta.3, < 2.0)
20-
cocoapods-trunk (>= 1.0.0.beta.2, < 2.0)
21-
cocoapods-try (>= 1.0.0.beta.3, < 2.0)
12+
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)
16+
cocoapods-plugins (>= 1.0.0, < 2.0)
17+
cocoapods-search (>= 1.0.0, < 2.0)
18+
cocoapods-stats (>= 1.0.0, < 2.0)
19+
cocoapods-trunk (>= 1.0.0, < 2.0)
20+
cocoapods-try (>= 1.0.0, < 2.0)
2221
colored (~> 1.2)
2322
escape (~> 0.0.4)
2423
fourflusher (~> 0.3.0)
25-
molinillo (~> 0.4.4)
24+
molinillo (~> 0.4.5)
2625
nap (~> 1.0)
27-
xcodeproj (>= 1.0.0.beta.3, < 2.0)
28-
cocoapods-core (1.0.0.beta.6)
26+
xcodeproj (>= 1.1.0, < 2.0)
27+
cocoapods-core (1.0.1)
2928
activesupport (>= 4.0.2)
3029
fuzzy_match (~> 2.0.4)
3130
nap (~> 1.0)
32-
cocoapods-deintegrate (1.0.0.beta.1)
33-
cocoapods-downloader (1.0.0.beta.2)
34-
cocoapods-plugins (1.0.0.beta.1)
31+
cocoapods-deintegrate (1.0.0)
32+
cocoapods-downloader (1.1.0)
33+
cocoapods-plugins (1.0.0)
3534
nap
36-
cocoapods-search (1.0.0.beta.1)
37-
cocoapods-stats (1.0.0.beta.3)
38-
cocoapods-trunk (1.0.0.beta.2)
35+
cocoapods-search (1.0.0)
36+
cocoapods-stats (1.0.0)
37+
cocoapods-trunk (1.0.0)
3938
nap (>= 0.8, < 2.0)
4039
netrc (= 0.7.8)
41-
cocoapods-try (1.0.0.beta.3)
40+
cocoapods-try (1.1.0)
4241
colored (1.2)
42+
concurrent-ruby (1.0.2)
4343
escape (0.0.4)
44-
fourflusher (0.3.0)
44+
fourflusher (0.3.2)
4545
fuzzy_match (2.0.4)
4646
i18n (0.7.0)
47-
json (1.8.3)
48-
minitest (5.8.4)
49-
molinillo (0.4.4)
47+
minitest (5.9.0)
48+
molinillo (0.4.5)
5049
nap (1.1.0)
5150
netrc (0.7.8)
52-
rouge (1.10.1)
51+
rouge (1.11.1)
5352
thread_safe (0.3.5)
5453
tzinfo (1.2.2)
5554
thread_safe (~> 0.1)
56-
xcodeproj (1.0.0.beta.3)
55+
xcodeproj (1.2.0)
5756
activesupport (>= 3)
58-
claide (>= 1.0.0.beta.1, < 2.0)
57+
claide (>= 1.0.0, < 2.0)
5958
colored (~> 1.2)
6059
xcpretty (0.2.2)
6160
rouge (~> 1.8)
@@ -64,8 +63,8 @@ PLATFORMS
6463
ruby
6564

6665
DEPENDENCIES
67-
cocoapods (>= 1.0.0.beta.6)
66+
cocoapods
6867
xcpretty
6968

7069
BUNDLED WITH
71-
1.11.2
70+
1.12.5

ParseLiveQuery.podspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
s.source_files = 'Sources/ParseLiveQuery/**/*.swift'
1717
s.module_name = 'ParseLiveQuery'
1818

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

Podfile

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
1-
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '8.0'
3-
# Uncomment this line if you're using Swift
41
use_frameworks!
52
workspace 'ParseLiveQuery.xcworkspace'
63

7-
target 'ParseLiveQuery-OSX' do
8-
project 'Sources/ParseLiveQuery.xcodeproj'
9-
platform :osx, '10.9'
4+
def commonPods
105
pod 'Parse'
116
pod 'Bolts-Swift'
127
pod 'SocketRocket'
138
end
149

10+
target 'ParseLiveQuery-OSX' do
11+
project 'Sources/ParseLiveQuery.xcodeproj'
12+
platform :osx, '10.9'
13+
14+
commonPods
15+
end
16+
1517
target 'ParseLiveQuery-iOS' do
1618
project 'Sources/ParseLiveQuery.xcodeproj'
1719
platform :ios, '8.0'
18-
pod 'Parse'
19-
pod 'Bolts-Swift'
20-
pod 'SocketRocket'
20+
21+
commonPods
2122
end
2223

2324
target 'LiveQueryDemo' do
2425
project 'Examples/LiveQueryDemo.xcodeproj'
2526
platform :osx, '10.9'
26-
pod 'Parse'
27-
pod 'Bolts-Swift'
28-
pod 'SocketRocket'
27+
28+
commonPods
2929
end
3030

3131
target 'LiveQueryDemo-ObjC' do
3232
project 'Examples/LiveQueryDemo-ObjC.xcodeproj'
3333
platform :osx, '10.9'
34-
pod 'Parse'
35-
pod 'Bolts-Swift'
36-
pod 'SocketRocket'
34+
35+
commonPods
3736
end

Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
PODS:
2-
- Bolts-Swift (1.0.1)
3-
- Bolts/Tasks (1.7.0)
4-
- Parse (1.13.0):
5-
- Bolts/Tasks (~> 1.6)
6-
- SocketRocket (0.5.0)
2+
- Bolts-Swift (1.2.0)
3+
- Bolts/Tasks (1.8.4)
4+
- Parse (1.14.2):
5+
- Bolts/Tasks (~> 1.8)
6+
- SocketRocket (0.5.1)
77

88
DEPENDENCIES:
99
- Bolts-Swift
1010
- Parse
1111
- SocketRocket
1212

1313
SPEC CHECKSUMS:
14-
Bolts: a0058fa3b331c5a1e4402d534f2dae36dbff31e4
15-
Bolts-Swift: 1c4c4955b1aacfc83f6a1998f6ad9627c35f8c4f
16-
Parse: f51c24d2feb412e4b2d6cc73d37cb24e8d0089bc
17-
SocketRocket: 2c51efccd2d73c99a923407ca4b06e7e9da95dbf
14+
Bolts: 8a7995239dbe724f9cba2248b766d48b7ebdd322
15+
Bolts-Swift: ac4e7d26719ed0f73aa85b9310da1648105fbde3
16+
Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230
17+
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
1818

19-
PODFILE CHECKSUM: 8b4289d8be4dced36d3871d24ac231402f0c5dfd
19+
PODFILE CHECKSUM: f78cfa7c25dd713e93d9018d0086646c1d4623bc
2020

21-
COCOAPODS: 1.0.0.beta.6
21+
COCOAPODS: 1.0.1

0 commit comments

Comments
 (0)