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

Update all dependencies and fix usage of deprecated APIs. #53

Merged
merged 6 commits into from
Jul 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branches:
- master
language: objective-c
os: osx
osx_image: xcode7.2
osx_image: xcode7.3
cache:
- cocoapods
env:
Expand Down
18 changes: 9 additions & 9 deletions Examples/LiveQueryDemo-ObjC.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@
isa = PBXNativeTarget;
buildConfigurationList = F509D5431CA9E597007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo-ObjC" */;
buildPhases = (
87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */,
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */,
F509D52E1CA9E597007B15B0 /* Sources */,
F509D52F1CA9E597007B15B0 /* Frameworks */,
F509D5301CA9E597007B15B0 /* Resources */,
EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */,
A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */,
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */,
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -218,44 +218,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
87DA45B46CF98727F2E13351 /* 📦 Check Pods Manifest.lock */ = {
87DA45B46CF98727F2E13351 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
A8851B9B8AD727FB055366F2 /* 📦 Copy Pods Resources */ = {
A8851B9B8AD727FB055366F2 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo-ObjC/Pods-LiveQueryDemo-ObjC-resources.sh\"\n";
showEnvVarsInLog = 0;
};
EA41B3F790AE39BE08641EBB /* 📦 Embed Pods Frameworks */ = {
EA41B3F790AE39BE08641EBB /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
18 changes: 9 additions & 9 deletions Examples/LiveQueryDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@
isa = PBXNativeTarget;
buildConfigurationList = F509D5251CA9E4AE007B15B0 /* Build configuration list for PBXNativeTarget "LiveQueryDemo" */;
buildPhases = (
E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */,
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */,
F509D5131CA9E4AE007B15B0 /* Sources */,
F509D5141CA9E4AE007B15B0 /* Frameworks */,
F509D5151CA9E4AE007B15B0 /* Resources */,
045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */,
D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */,
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */,
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -206,44 +206,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
045C33FD1807E3932888A2F9 /* 📦 Embed Pods Frameworks */ = {
045C33FD1807E3932888A2F9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
D9EF05A29B9F1AAC9B62408C /* 📦 Copy Pods Resources */ = {
D9EF05A29B9F1AAC9B62408C /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-LiveQueryDemo/Pods-LiveQueryDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E6F699DDDA9E6B861F705AD5 /* 📦 Check Pods Manifest.lock */ = {
E6F699DDDA9E6B861F705AD5 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'https://rubygems.org'

gem 'xcpretty'
gem 'cocoapods', '>= 1.0.0.beta.6'
gem 'cocoapods'
65 changes: 32 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,61 +1,60 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (4.2.6)
activesupport (5.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0.beta.3)
cocoapods (1.0.0.beta.6)
claide (1.0.0)
cocoapods (1.0.1)
activesupport (>= 4.0.2)
claide (>= 1.0.0.beta.3, < 2.0)
cocoapods-core (= 1.0.0.beta.6)
cocoapods-deintegrate (>= 1.0.0.beta.1, < 2.0)
cocoapods-downloader (>= 1.0.0.beta.2, < 2.0)
cocoapods-plugins (>= 1.0.0.beta.1, < 2.0)
cocoapods-search (>= 1.0.0.beta.1, < 2.0)
cocoapods-stats (>= 1.0.0.beta.3, < 2.0)
cocoapods-trunk (>= 1.0.0.beta.2, < 2.0)
cocoapods-try (>= 1.0.0.beta.3, < 2.0)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.0.1)
cocoapods-deintegrate (>= 1.0.0, < 2.0)
cocoapods-downloader (>= 1.0.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.0.0, < 2.0)
cocoapods-try (>= 1.0.0, < 2.0)
colored (~> 1.2)
escape (~> 0.0.4)
fourflusher (~> 0.3.0)
molinillo (~> 0.4.4)
molinillo (~> 0.4.5)
nap (~> 1.0)
xcodeproj (>= 1.0.0.beta.3, < 2.0)
cocoapods-core (1.0.0.beta.6)
xcodeproj (>= 1.1.0, < 2.0)
cocoapods-core (1.0.1)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.0.beta.1)
cocoapods-downloader (1.0.0.beta.2)
cocoapods-plugins (1.0.0.beta.1)
cocoapods-deintegrate (1.0.0)
cocoapods-downloader (1.1.0)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0.beta.1)
cocoapods-stats (1.0.0.beta.3)
cocoapods-trunk (1.0.0.beta.2)
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.0.0)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
cocoapods-try (1.0.0.beta.3)
cocoapods-try (1.1.0)
colored (1.2)
concurrent-ruby (1.0.2)
escape (0.0.4)
fourflusher (0.3.0)
fourflusher (0.3.2)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.4)
molinillo (0.4.4)
minitest (5.9.0)
molinillo (0.4.5)
nap (1.1.0)
netrc (0.7.8)
rouge (1.10.1)
rouge (1.11.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.0.0.beta.3)
xcodeproj (1.2.0)
activesupport (>= 3)
claide (>= 1.0.0.beta.1, < 2.0)
claide (>= 1.0.0, < 2.0)
colored (~> 1.2)
xcpretty (0.2.2)
rouge (~> 1.8)
Expand All @@ -64,8 +63,8 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (>= 1.0.0.beta.6)
cocoapods
xcpretty

BUNDLED WITH
1.11.2
1.12.5
6 changes: 3 additions & 3 deletions ParseLiveQuery.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
s.source_files = 'Sources/ParseLiveQuery/**/*.swift'
s.module_name = 'ParseLiveQuery'

s.dependency 'Parse'
s.dependency 'Bolts-Swift'
s.dependency 'SocketRocket'
s.dependency 'Parse', '~> 1.14'
s.dependency 'Bolts-Swift', '~> 1.2'
s.dependency 'SocketRocket', '~> 0.5'
end
29 changes: 14 additions & 15 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '8.0'
# Uncomment this line if you're using Swift
use_frameworks!
workspace 'ParseLiveQuery.xcworkspace'

target 'ParseLiveQuery-OSX' do
project 'Sources/ParseLiveQuery.xcodeproj'
platform :osx, '10.9'
def commonPods
pod 'Parse'
pod 'Bolts-Swift'
pod 'SocketRocket'
end

target 'ParseLiveQuery-OSX' do
project 'Sources/ParseLiveQuery.xcodeproj'
platform :osx, '10.9'

commonPods
end

target 'ParseLiveQuery-iOS' do
project 'Sources/ParseLiveQuery.xcodeproj'
platform :ios, '8.0'
pod 'Parse'
pod 'Bolts-Swift'
pod 'SocketRocket'

commonPods
end

target 'LiveQueryDemo' do
project 'Examples/LiveQueryDemo.xcodeproj'
platform :osx, '10.9'
pod 'Parse'
pod 'Bolts-Swift'
pod 'SocketRocket'

commonPods
end

target 'LiveQueryDemo-ObjC' do
project 'Examples/LiveQueryDemo-ObjC.xcodeproj'
platform :osx, '10.9'
pod 'Parse'
pod 'Bolts-Swift'
pod 'SocketRocket'

commonPods
end
22 changes: 11 additions & 11 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
PODS:
- Bolts-Swift (1.0.1)
- Bolts/Tasks (1.7.0)
- Parse (1.13.0):
- Bolts/Tasks (~> 1.6)
- SocketRocket (0.5.0)
- Bolts-Swift (1.2.0)
- Bolts/Tasks (1.8.4)
- Parse (1.14.2):
- Bolts/Tasks (~> 1.8)
- SocketRocket (0.5.1)

DEPENDENCIES:
- Bolts-Swift
- Parse
- SocketRocket

SPEC CHECKSUMS:
Bolts: a0058fa3b331c5a1e4402d534f2dae36dbff31e4
Bolts-Swift: 1c4c4955b1aacfc83f6a1998f6ad9627c35f8c4f
Parse: f51c24d2feb412e4b2d6cc73d37cb24e8d0089bc
SocketRocket: 2c51efccd2d73c99a923407ca4b06e7e9da95dbf
Bolts: 8a7995239dbe724f9cba2248b766d48b7ebdd322
Bolts-Swift: ac4e7d26719ed0f73aa85b9310da1648105fbde3
Parse: 4335d65f40cb3d43190d723144bbe1afb9c38230
SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531

PODFILE CHECKSUM: 8b4289d8be4dced36d3871d24ac231402f0c5dfd
PODFILE CHECKSUM: f78cfa7c25dd713e93d9018d0086646c1d4623bc

COCOAPODS: 1.0.0.beta.6
COCOAPODS: 1.0.1
Loading