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

Commit ed31d36

Browse files
flovilmartflovilmart
authored
⚡ 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 ed31d36

File tree

13 files changed

+52
-22
lines changed

13 files changed

+52
-22
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/Bolts-Swift

Submodule Bolts-Swift updated 23 files

‎Carthage/Checkouts/Parse-SDK-iOS-OSX

‎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
}];

‎ParseLiveQuery.podspec

Lines changed: 5 additions & 3 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 = '4.0'
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'
24-
s.dependency 'Bolts-Swift', '~> 1.3.0'
25+
s.dependency 'Parse', '~> 1.17.0'
26+
s.dependency 'Bolts-Swift', :git 'https://github.com/BoltsFramework/Bolts-Swift', :commit 'e9baa72d04521c3b25ef4fa6fef12b340953ee02'
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 {

‎Sources/ParseLiveQuery/ObjCCompat.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public struct ObjCCompat {
131131

132132
- returns: The same subscription, for easy chaining.
133133
*/
134+
@objc(addSubscribeHandler:)
134135
open func addSubscribeHandler(_ handler: @escaping SubscribeHandler) -> Subscription {
135136
subscribeHandlers.append(handler)
136137
return self
@@ -143,6 +144,7 @@ public struct ObjCCompat {
143144

144145
- returns: The same subscription, for easy chaining.
145146
*/
147+
@objc(addUnsubscribeHandler:)
146148
open func addUnsubscribeHandler(_ handler: @escaping SubscribeHandler) -> Subscription {
147149
unsubscribeHandlers.append(handler)
148150
return self
@@ -155,6 +157,7 @@ public struct ObjCCompat {
155157

156158
- returns: The same subscription, for easy chaining.
157159
*/
160+
@objc(addErrorHandler:)
158161
open func addErrorHandler(_ handler: @escaping ErrorHandler) -> Subscription {
159162
errorHandlers.append(handler)
160163
return self
@@ -167,6 +170,7 @@ public struct ObjCCompat {
167170

168171
- returns: The same subscription, for easy chaining.
169172
*/
173+
@objc(addEventHandler:)
170174
open func addEventHandler(_ handler: @escaping EventHandler) -> Subscription {
171175
eventHandlers.append(handler)
172176
return self
@@ -179,6 +183,7 @@ public struct ObjCCompat {
179183

180184
- returns: The same subscription, for easy chaining.
181185
*/
186+
@objc(addEnterHandler:)
182187
open func addEnterHandler(_ handler: @escaping ObjectHandler) -> Subscription {
183188
return addEventHandler { $1.type == .entered ? handler($0, $1.object) : () }
184189
}
@@ -190,6 +195,7 @@ public struct ObjCCompat {
190195

191196
- returns: The same subscription, for easy chaining.
192197
*/
198+
@objc(addLeaveHandler:)
193199
open func addLeaveHandler(_ handler: @escaping ObjectHandler) -> Subscription {
194200
return addEventHandler { $1.type == .left ? handler($0, $1.object) : () }
195201
}
@@ -201,6 +207,7 @@ public struct ObjCCompat {
201207

202208
- returns: The same subscription, for easy chaining.
203209
*/
210+
@objc(addCreateHandler:)
204211
open func addCreateHandler(_ handler: @escaping ObjectHandler) -> Subscription {
205212
return addEventHandler { $1.type == .created ? handler($0, $1.object) : () }
206213
}
@@ -212,6 +219,7 @@ public struct ObjCCompat {
212219

213220
- returns: The same subscription, for easy chaining.
214221
*/
222+
@objc(addUpdateHandler:)
215223
open func addUpdateHandler(_ handler: @escaping ObjectHandler) -> Subscription {
216224
return addEventHandler { $1.type == .updated ? handler($0, $1.object) : () }
217225
}
@@ -223,6 +231,7 @@ public struct ObjCCompat {
223231

224232
- returns: The same subscription, for easy chaining.
225233
*/
234+
@objc(addDeleteHandler:)
226235
open func addDeleteHandler(_ handler: @escaping ObjectHandler) -> Subscription {
227236
return addEventHandler { $1.type == .deleted ? handler($0, $1.object) : () }
228237
}

0 commit comments

Comments
 (0)