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

Commit 2f483a6

Browse files
committed
⚡ Release 2.4.0 (#151)
* Account for failable encoder in Parse 1.17.0 * Min Parse to alpha.1 * set swift_version in podspec (#154) As of cocoapods 1.4.0 the `.swift-version` file is deprecated in favor of the podspec property * Bumps parse to release version * bumps version in bundle * nits
1 parent 601a538 commit 2f483a6

File tree

15 files changed

+88
-55
lines changed

15 files changed

+88
-55
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
[submodule "Carthage/Checkouts/common-crypto-spm"]
1717
path = Carthage/Checkouts/common-crypto-spm
1818
url = https://github.com/daltoniam/common-crypto-spm.git
19+
[submodule "Carthage/Checkouts/facebook-ios-sdk"]
20+
path = Carthage/Checkouts/facebook-ios-sdk
21+
url = https://github.com/facebook/facebook-ios-sdk.git

.swift-version

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

Cartfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "BoltsFramework/Bolts-Swift" ~> 1.3.0
2-
github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.16.0
1+
github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02"
2+
github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.0
33
github "daltoniam/Starscream" ~> 3.0.4

Cartfile.resolved

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
github "BoltsFramework/Bolts-ObjC" "1.9.0"
2-
github "BoltsFramework/Bolts-Swift" "1.3.0"
3-
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0"
2+
github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02"
3+
github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.0"
44
github "daltoniam/Starscream" "3.0.4"
55
github "daltoniam/common-crypto-spm" "1.1.0"
66
github "daltoniam/zlib-spm" "1.1.0"
7+
github "facebook/facebook-ios-sdk" "sdk-version-4.31.1"

Carthage/Checkouts/facebook-ios-sdk

Submodule facebook-ios-sdk added at 2ef44b3

Examples/LiveQueryDemo-ObjC/ChatRoomManager.m

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ - (void)connect {
3838
self.query = [self.dataSource queryForChatRoomManager:self];
3939

4040
__weak typeof(self) weakSelf = self;
41+
4142
self.subscription = [[self.client subscribeToQuery:self.query] addCreateHandler:^(PFQuery *query, PFObject *message) {
4243
[weakSelf.delegate chatRoomManager:weakSelf didReceiveMessage:(Message *)message];
4344
}];

Gemfile

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

33
gem 'xcpretty'
44
# xcode8 compat
5-
gem 'cocoapods', '1.1.1'
5+
gem 'cocoapods', '1.4.0'
66
gem 'jazzy'

Gemfile.lock

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (2.3.4)
5-
activesupport (4.2.7.1)
4+
CFPropertyList (2.3.6)
5+
activesupport (4.2.10)
66
i18n (~> 0.7)
7-
json (~> 1.7, >= 1.7.7)
87
minitest (~> 5.1)
98
thread_safe (~> 0.3, >= 0.3.4)
109
tzinfo (~> 1.1)
11-
claide (1.0.1)
12-
cocoapods (1.1.1)
10+
atomos (0.1.2)
11+
claide (1.0.2)
12+
cocoapods (1.4.0)
1313
activesupport (>= 4.0.2, < 5)
14-
claide (>= 1.0.1, < 2.0)
15-
cocoapods-core (= 1.1.1)
16-
cocoapods-deintegrate (>= 1.0.1, < 2.0)
17-
cocoapods-downloader (>= 1.1.2, < 2.0)
14+
claide (>= 1.0.2, < 2.0)
15+
cocoapods-core (= 1.4.0)
16+
cocoapods-deintegrate (>= 1.0.2, < 2.0)
17+
cocoapods-downloader (>= 1.1.3, < 2.0)
1818
cocoapods-plugins (>= 1.0.0, < 2.0)
1919
cocoapods-search (>= 1.0.0, < 2.0)
2020
cocoapods-stats (>= 1.0.0, < 2.0)
21-
cocoapods-trunk (>= 1.1.1, < 2.0)
21+
cocoapods-trunk (>= 1.3.0, < 2.0)
2222
cocoapods-try (>= 1.1.0, < 2.0)
23-
colored (~> 1.2)
23+
colored2 (~> 3.1)
2424
escape (~> 0.0.4)
2525
fourflusher (~> 2.0.1)
2626
gh_inspector (~> 1.0)
27-
molinillo (~> 0.5.1)
27+
molinillo (~> 0.6.4)
2828
nap (~> 1.0)
29-
xcodeproj (>= 1.3.3, < 2.0)
30-
cocoapods-core (1.1.1)
31-
activesupport (>= 4.0.2, < 5)
29+
ruby-macho (~> 1.1)
30+
xcodeproj (>= 1.5.4, < 2.0)
31+
cocoapods-core (1.4.0)
32+
activesupport (>= 4.0.2, < 6)
3233
fuzzy_match (~> 2.0.4)
3334
nap (~> 1.0)
34-
cocoapods-deintegrate (1.0.1)
35+
cocoapods-deintegrate (1.0.2)
3536
cocoapods-downloader (1.1.3)
3637
cocoapods-plugins (1.0.0)
3738
nap
3839
cocoapods-search (1.0.0)
3940
cocoapods-stats (1.0.0)
40-
cocoapods-trunk (1.1.2)
41+
cocoapods-trunk (1.3.0)
4142
nap (>= 0.8, < 2.0)
42-
netrc (= 0.7.8)
43+
netrc (~> 0.11)
4344
cocoapods-try (1.1.0)
44-
colored (1.2)
45+
colored2 (3.1.2)
46+
concurrent-ruby (1.0.5)
4547
escape (0.0.4)
4648
ffi (1.9.18)
4749
fourflusher (2.0.1)
4850
fuzzy_match (2.0.4)
49-
gh_inspector (1.0.2)
50-
i18n (0.7.0)
51+
gh_inspector (1.1.3)
52+
i18n (0.9.5)
53+
concurrent-ruby (~> 1.0)
5154
jazzy (0.9.0)
5255
cocoapods (~> 1.0)
5356
mustache (~> 0.99)
@@ -57,36 +60,36 @@ GEM
5760
sass (~> 3.4)
5861
sqlite3 (~> 1.3)
5962
xcinvoke (~> 0.3.0)
60-
json (1.8.3)
6163
liferaft (0.0.6)
62-
minitest (5.9.0)
63-
molinillo (0.5.5)
64+
minitest (5.11.3)
65+
molinillo (0.6.4)
6466
mustache (0.99.8)
6567
nanaimo (0.2.3)
6668
nap (1.1.0)
67-
netrc (0.7.8)
69+
netrc (0.11.0)
6870
open4 (1.3.4)
6971
rb-fsevent (0.10.2)
7072
rb-inotify (0.9.10)
7173
ffi (>= 0.5.0, < 2)
7274
redcarpet (3.4.0)
7375
rouge (1.11.1)
76+
ruby-macho (1.1.0)
7477
sass (3.5.3)
7578
sass-listen (~> 4.0.0)
7679
sass-listen (4.0.0)
7780
rb-fsevent (~> 0.9, >= 0.9.4)
7881
rb-inotify (~> 0.9, >= 0.9.7)
7982
sqlite3 (1.3.13)
80-
thread_safe (0.3.5)
81-
tzinfo (1.2.2)
83+
thread_safe (0.3.6)
84+
tzinfo (1.2.5)
8285
thread_safe (~> 0.1)
8386
xcinvoke (0.3.0)
8487
liferaft (~> 0.0.6)
85-
xcodeproj (1.4.2)
88+
xcodeproj (1.5.6)
8689
CFPropertyList (~> 2.3.3)
87-
activesupport (>= 3)
88-
claide (>= 1.0.1, < 2.0)
89-
colored (~> 1.2)
90+
atomos (~> 0.1.2)
91+
claide (>= 1.0.2, < 2.0)
92+
colored2 (~> 3.1)
9093
nanaimo (~> 0.2.3)
9194
xcpretty (0.2.2)
9295
rouge (~> 1.8)
@@ -95,9 +98,9 @@ PLATFORMS
9598
ruby
9699

97100
DEPENDENCIES
98-
cocoapods (= 1.1.1)
101+
cocoapods (= 1.4.0)
99102
jazzy
100103
xcpretty
101104

102105
BUNDLED WITH
103-
1.16.0
106+
1.16.1

ParseLiveQuery.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'ParseLiveQuery'
3-
s.version = '2.3.0'
3+
s.version = '2.4.0'
44
s.license = { :type => 'BSD' }
55
s.summary = 'Allows for subscriptions to queries in conjunction with parse-server.'
66
s.homepage = 'http://parseplatform.org'
@@ -12,6 +12,8 @@ Pod::Spec.new do |s|
1212
s.requires_arc = true
1313

1414
s.platform = :ios, :osx, :tvos
15+
s.swift_version = '3.2'
16+
s.cocoapods_version = '>= 1.4'
1517

1618
s.ios.deployment_target = '8.0'
1719
s.tvos.deployment_target = '9.0'
@@ -20,7 +22,7 @@ Pod::Spec.new do |s|
2022
s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}'
2123
s.module_name = 'ParseLiveQuery'
2224

23-
s.dependency 'Parse', '~> 1.16.0'
25+
s.dependency 'Parse', '~> 1.17.0'
2426
s.dependency 'Bolts-Swift', '~> 1.3.0'
2527
s.dependency 'Starscream', '~> 3.0.4'
2628
end

Sources/ParseLiveQuery.xcodeproj/project.pbxproj

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
094AE9041E25AF4300F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9031E25AF4300F408BC /* Security.framework */; };
1919
094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9051E25AF5A00F408BC /* CFNetwork.framework */; };
2020
09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C841E25C5100037C3BC /* Parse.framework */; };
21-
09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */; };
2221
09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */; };
2322
09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */; };
2423
09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */; };
@@ -27,7 +26,6 @@
2726
09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; };
2827
09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; };
2928
4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE319200FB23E007CA404 /* Parse.framework */; };
30-
4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE348200FB569007CA404 /* Bolts.framework */; };
3129
4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */; };
3230
4A6AE37E200FC9DF007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; };
3331
4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; };
@@ -213,6 +211,13 @@
213211
remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
214212
remoteInfo = "Starscream Tests";
215213
};
214+
4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */ = {
215+
isa = PBXContainerItemProxy;
216+
containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */;
217+
proxyType = 1;
218+
remoteGlobalIDString = 81C582E11C3B0A98000063C6;
219+
remoteInfo = "Parse-iOS-Dynamic";
220+
};
216221
/* End PBXContainerItemProxy section */
217222

218223
/* Begin PBXFileReference section */
@@ -267,7 +272,6 @@
267272
094AE9041E25AF4300F408BC /* Security.framework in Frameworks */,
268273
094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */,
269274
09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */,
270-
09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */,
271275
);
272276
runOnlyForDeploymentPostprocessing = 0;
273277
};
@@ -277,7 +281,6 @@
277281
files = (
278282
4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */,
279283
4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */,
280-
4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */,
281284
4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */,
282285
09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */,
283286
094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */,
@@ -468,6 +471,7 @@
468471
buildRules = (
469472
);
470473
dependencies = (
474+
4ABA29FA205C346700ABF9CB /* PBXTargetDependency */,
471475
);
472476
name = "ParseLiveQuery-iOS";
473477
productName = ParseLiveQuery;
@@ -485,10 +489,10 @@
485489
TargetAttributes = {
486490
F5903CE91BD999C500C3EFFE = {
487491
CreatedOnToolsVersion = 7.1;
488-
LastSwiftMigration = 0800;
492+
LastSwiftMigration = 0920;
489493
};
490494
F5A9BFB61BE0248D00E78326 = {
491-
LastSwiftMigration = 0800;
495+
LastSwiftMigration = 0920;
492496
};
493497
};
494498
};
@@ -743,6 +747,14 @@
743747
};
744748
/* End PBXSourcesBuildPhase section */
745749

750+
/* Begin PBXTargetDependency section */
751+
4ABA29FA205C346700ABF9CB /* PBXTargetDependency */ = {
752+
isa = PBXTargetDependency;
753+
name = "Parse-iOS-Dynamic";
754+
targetProxy = 4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */;
755+
};
756+
/* End PBXTargetDependency section */
757+
746758
/* Begin XCBuildConfiguration section */
747759
F5256FE01BD71F9A0052FB8A /* Debug */ = {
748760
isa = XCBuildConfiguration;
@@ -776,6 +788,7 @@
776788
MACOSX_DEPLOYMENT_TARGET = 10.10;
777789
ONLY_ACTIVE_ARCH = YES;
778790
SWIFT_OBJC_BRIDGING_HEADER = "";
791+
SWIFT_VERSION = 4.0;
779792
};
780793
name = Debug;
781794
};
@@ -810,6 +823,7 @@
810823
MACOSX_DEPLOYMENT_TARGET = 10.10;
811824
SWIFT_OBJC_BRIDGING_HEADER = "";
812825
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
826+
SWIFT_VERSION = 4.0;
813827
};
814828
name = Release;
815829
};
@@ -834,7 +848,7 @@
834848
SDKROOT = macosx;
835849
SKIP_INSTALL = YES;
836850
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
837-
SWIFT_VERSION = 3.0;
851+
SWIFT_VERSION = 4.0;
838852
};
839853
name = Debug;
840854
};
@@ -858,7 +872,7 @@
858872
PRODUCT_NAME = ParseLiveQuery;
859873
SDKROOT = macosx;
860874
SKIP_INSTALL = YES;
861-
SWIFT_VERSION = 3.0;
875+
SWIFT_VERSION = 4.0;
862876
};
863877
name = Release;
864878
};
@@ -884,7 +898,7 @@
884898
SKIP_INSTALL = YES;
885899
SWIFT_INSTALL_OBJC_HEADER = YES;
886900
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
887-
SWIFT_VERSION = 3.0;
901+
SWIFT_VERSION = 4.0;
888902
TARGETED_DEVICE_FAMILY = "1,2";
889903
};
890904
name = Debug;
@@ -910,7 +924,7 @@
910924
SDKROOT = iphoneos;
911925
SKIP_INSTALL = YES;
912926
SWIFT_INSTALL_OBJC_HEADER = YES;
913-
SWIFT_VERSION = 3.0;
927+
SWIFT_VERSION = 4.0;
914928
TARGETED_DEVICE_FAMILY = "1,2";
915929
};
916930
name = Release;

Sources/ParseLiveQuery/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.2.2</string>
18+
<string>2.4.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Sources/ParseLiveQuery/Internal/QueryEncoder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extension Dictionary where Key: ExpressibleByStringLiteral, Value: AnyObject {
3535
} else if let geoPoint = val as? PFGeoPoint {
3636
encodedQueryDictionary[key] = geoPoint.encodedDictionary as? Value
3737
} else if let object = val as? PFObject {
38-
encodedQueryDictionary[key] = PFPointerObjectEncoder.object().encode(object) as? Value
38+
encodedQueryDictionary[key] = (try? PFPointerObjectEncoder.object().encode(object)) as? Value
3939
} else if let date = val as? Date {
4040
encodedQueryDictionary[key] = date.encodedString as? Value
4141
} else {

0 commit comments

Comments
 (0)