⚡ Release 2.4.0 (#151)

flovilmart · flovilmart · commit 2f483a6ee794 · 2018-03-16T14:12:58.000-04:00
* 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
diff --git a/.gitmodules b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "Carthage/Checkouts/common-crypto-spm"]
 	path = Carthage/Checkouts/common-crypto-spm
 	url = https://github.com/daltoniam/common-crypto-spm.git
+[submodule "Carthage/Checkouts/facebook-ios-sdk"]
+	path = Carthage/Checkouts/facebook-ios-sdk
+	url = https://github.com/facebook/facebook-ios-sdk.git
diff --git a/.swift-version b/.swift-version
diff --git a/Cartfile b/Cartfile
@@ -1,3 +1,3 @@
-github "BoltsFramework/Bolts-Swift" ~> 1.3.0
-github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.16.0
+github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02"
+github "ParsePlatform/Parse-SDK-iOS-OSX" ~> 1.17.0
 github "daltoniam/Starscream" ~> 3.0.4
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,7 @@
 github "BoltsFramework/Bolts-ObjC" "1.9.0"
-github "BoltsFramework/Bolts-Swift" "1.3.0"
-github "ParsePlatform/Parse-SDK-iOS-OSX" "1.16.0"
+github "BoltsFramework/Bolts-Swift" "e9baa72d04521c3b25ef4fa6fef12b340953ee02"
+github "ParsePlatform/Parse-SDK-iOS-OSX" "1.17.0"
 github "daltoniam/Starscream" "3.0.4"
 github "daltoniam/common-crypto-spm" "1.1.0"
 github "daltoniam/zlib-spm" "1.1.0"
+github "facebook/facebook-ios-sdk" "sdk-version-4.31.1"
diff --git a/Carthage/Checkouts/Bolts-Swift b/Carthage/Checkouts/Bolts-Swift
@@ -1 +1 @@
-Subproject commit bbcbab61e3fd11239c6c9a51460db20be26dc9c7
+Subproject commit e9baa72d04521c3b25ef4fa6fef12b340953ee02
diff --git a/Carthage/Checkouts/Parse-SDK-iOS-OSX b/Carthage/Checkouts/Parse-SDK-iOS-OSX
@@ -1 +1 @@
-Subproject commit 854dd75998636ac54edc16f8e4f1f3918788c598
+Subproject commit 7c226704bfd242fc5cec6622c7e78ab79ea8191a
diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk
@@ -0,0 +1 @@
+Subproject commit 2ef44b3b1639adcc163f0477b7529b477ff6dbe6
diff --git a/Examples/LiveQueryDemo-ObjC/ChatRoomManager.m b/Examples/LiveQueryDemo-ObjC/ChatRoomManager.m
@@ -38,6 +38,7 @@ - (void)connect {
   self.query = [self.dataSource queryForChatRoomManager:self];
 
   __weak typeof(self) weakSelf = self;
+
   self.subscription = [[self.client subscribeToQuery:self.query] addCreateHandler:^(PFQuery *query, PFObject *message) {
     [weakSelf.delegate chatRoomManager:weakSelf didReceiveMessage:(Message *)message];
   }];
diff --git a/Gemfile b/Gemfile
@@ -2,5 +2,5 @@ source 'https://rubygems.org'
 
 gem 'xcpretty'
 # xcode8 compat
-gem 'cocoapods', '1.1.1'
+gem 'cocoapods', '1.4.0'
 gem 'jazzy'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,53 +1,56 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.4)
-    activesupport (4.2.7.1)
+    CFPropertyList (2.3.6)
+    activesupport (4.2.10)
       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.1)
-    cocoapods (1.1.1)
+    atomos (0.1.2)
+    claide (1.0.2)
+    cocoapods (1.4.0)
       activesupport (>= 4.0.2, < 5)
-      claide (>= 1.0.1, < 2.0)
-      cocoapods-core (= 1.1.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.2, < 2.0)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.4.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 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.1.1, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
-      colored (~> 1.2)
+      colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.1)
+      molinillo (~> 0.6.4)
       nap (~> 1.0)
-      xcodeproj (>= 1.3.3, < 2.0)
-    cocoapods-core (1.1.1)
-      activesupport (>= 4.0.2, < 5)
+      ruby-macho (~> 1.1)
+      xcodeproj (>= 1.5.4, < 2.0)
+    cocoapods-core (1.4.0)
+      activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
+    cocoapods-deintegrate (1.0.2)
     cocoapods-downloader (1.1.3)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.1.2)
+    cocoapods-trunk (1.3.0)
       nap (>= 0.8, < 2.0)
-      netrc (= 0.7.8)
+      netrc (~> 0.11)
     cocoapods-try (1.1.0)
-    colored (1.2)
+    colored2 (3.1.2)
+    concurrent-ruby (1.0.5)
     escape (0.0.4)
     ffi (1.9.18)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.2)
-    i18n (0.7.0)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     jazzy (0.9.0)
       cocoapods (~> 1.0)
       mustache (~> 0.99)
@@ -57,36 +60,36 @@ GEM
       sass (~> 3.4)
       sqlite3 (~> 1.3)
       xcinvoke (~> 0.3.0)
-    json (1.8.3)
     liferaft (0.0.6)
-    minitest (5.9.0)
-    molinillo (0.5.5)
+    minitest (5.11.3)
+    molinillo (0.6.4)
     mustache (0.99.8)
     nanaimo (0.2.3)
     nap (1.1.0)
-    netrc (0.7.8)
+    netrc (0.11.0)
     open4 (1.3.4)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     rouge (1.11.1)
+    ruby-macho (1.1.0)
     sass (3.5.3)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     sqlite3 (1.3.13)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     xcinvoke (0.3.0)
       liferaft (~> 0.0.6)
-    xcodeproj (1.4.2)
+    xcodeproj (1.5.6)
       CFPropertyList (~> 2.3.3)
-      activesupport (>= 3)
-      claide (>= 1.0.1, < 2.0)
-      colored (~> 1.2)
+      atomos (~> 0.1.2)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
     xcpretty (0.2.2)
       rouge (~> 1.8)
@@ -95,9 +98,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.1.1)
+  cocoapods (= 1.4.0)
   jazzy
   xcpretty
 
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/ParseLiveQuery.podspec b/ParseLiveQuery.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ParseLiveQuery'
-  s.version          = '2.3.0'
+  s.version          = '2.4.0'
   s.license          =  { :type => 'BSD' }
   s.summary          = 'Allows for subscriptions to queries in conjunction with parse-server.'
   s.homepage         = 'http://parseplatform.org'
@@ -12,6 +12,8 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.platform = :ios, :osx, :tvos
+  s.swift_version = '3.2'
+  s.cocoapods_version = '>= 1.4'
 
   s.ios.deployment_target = '8.0'
   s.tvos.deployment_target = '9.0'
@@ -20,7 +22,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Sources/ParseLiveQuery/**/*.{swift,h}'
   s.module_name = 'ParseLiveQuery'
   
-  s.dependency 'Parse', '~> 1.16.0'
+  s.dependency 'Parse', '~> 1.17.0'
   s.dependency 'Bolts-Swift', '~> 1.3.0'
   s.dependency 'Starscream', '~> 3.0.4'
 end
diff --git a/Sources/ParseLiveQuery.xcodeproj/project.pbxproj b/Sources/ParseLiveQuery.xcodeproj/project.pbxproj
@@ -18,7 +18,6 @@
 		094AE9041E25AF4300F408BC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9031E25AF4300F408BC /* Security.framework */; };
 		094AE9061E25AF5A00F408BC /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 094AE9051E25AF5A00F408BC /* CFNetwork.framework */; };
 		09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C841E25C5100037C3BC /* Parse.framework */; };
-		09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C9FCE11E25C9BA00369AA6 /* Bolts.framework */; };
 		09C9FCE41E25D08400369AA6 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09A31C7E1E25C2000037C3BC /* BoltsSwift.framework */; };
 		09D80FD81E26BF0500AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD71E26BF0500AC7A2D /* libsqlite3.tbd */; };
 		09D80FDA1E26BFAA00AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FD91E26BFAA00AC7A2D /* AudioToolbox.framework */; };
@@ -27,7 +26,6 @@
 		09D80FE01E26C04800AC7A2D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FDF1E26C04800AC7A2D /* AudioToolbox.framework */; };
 		09D80FE21E26C05200AC7A2D /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 09D80FE11E26C05200AC7A2D /* libsqlite3.tbd */; };
 		4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE319200FB23E007CA404 /* Parse.framework */; };
-		4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE348200FB569007CA404 /* Bolts.framework */; };
 		4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE362200FC9C5007CA404 /* BoltsSwift.framework */; };
 		4A6AE37E200FC9DF007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; };
 		4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A6AE37B200FC9C5007CA404 /* Starscream.framework */; };
@@ -213,6 +211,13 @@
 			remoteGlobalIDString = 335FA2021F5DF71D00F6D2EC;
 			remoteInfo = "Starscream Tests";
 		};
+		4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 4A6AE30B200FB23E007CA404 /* Parse.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 81C582E11C3B0A98000063C6;
+			remoteInfo = "Parse-iOS-Dynamic";
+		};
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
@@ -267,7 +272,6 @@
 				094AE9041E25AF4300F408BC /* Security.framework in Frameworks */,
 				094AE9001E25AF3100F408BC /* libicucore.tbd in Frameworks */,
 				09A31C851E25C5100037C3BC /* Parse.framework in Frameworks */,
-				09C9FCE31E25D07B00369AA6 /* Bolts.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -277,7 +281,6 @@
 			files = (
 				4A6AE37F200FD00E007CA404 /* Starscream.framework in Frameworks */,
 				4A6AE361200FC9C5007CA404 /* BoltsSwift.framework in Frameworks */,
-				4A6AE35B200FB570007CA404 /* Bolts.framework in Frameworks */,
 				4A6AE335200FB54C007CA404 /* Parse.framework in Frameworks */,
 				09D80FDC1E26C02600AC7A2D /* SystemConfiguration.framework in Frameworks */,
 				094AE8F61E25AE1C00F408BC /* Foundation.framework in Frameworks */,
@@ -468,6 +471,7 @@
 			buildRules = (
 			);
 			dependencies = (
+				4ABA29FA205C346700ABF9CB /* PBXTargetDependency */,
 			);
 			name = "ParseLiveQuery-iOS";
 			productName = ParseLiveQuery;
@@ -485,10 +489,10 @@
 				TargetAttributes = {
 					F5903CE91BD999C500C3EFFE = {
 						CreatedOnToolsVersion = 7.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0920;
 					};
 					F5A9BFB61BE0248D00E78326 = {
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0920;
 					};
 				};
 			};
@@ -743,6 +747,14 @@
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		4ABA29FA205C346700ABF9CB /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = "Parse-iOS-Dynamic";
+			targetProxy = 4ABA29F9205C346700ABF9CB /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		F5256FE01BD71F9A0052FB8A /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -776,6 +788,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -810,6 +823,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				SWIFT_OBJC_BRIDGING_HEADER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -834,7 +848,7 @@
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -858,7 +872,7 @@
 				PRODUCT_NAME = ParseLiveQuery;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -884,7 +898,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_INSTALL_OBJC_HEADER = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -910,7 +924,7 @@
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 				SWIFT_INSTALL_OBJC_HEADER = YES;
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/Sources/ParseLiveQuery/Info.plist b/Sources/ParseLiveQuery/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.2</string>
+	<string>2.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Sources/ParseLiveQuery/Internal/QueryEncoder.swift b/Sources/ParseLiveQuery/Internal/QueryEncoder.swift
@@ -35,7 +35,7 @@ extension Dictionary where Key: ExpressibleByStringLiteral, Value: AnyObject {
             } else if let geoPoint = val as? PFGeoPoint {
                 encodedQueryDictionary[key] = geoPoint.encodedDictionary as? Value
             } else if let object = val as? PFObject {
-                encodedQueryDictionary[key] = PFPointerObjectEncoder.object().encode(object) as? Value
+                encodedQueryDictionary[key] = (try? PFPointerObjectEncoder.object().encode(object)) as? Value
             } else if let date = val as? Date {
                 encodedQueryDictionary[key] = date.encodedString as? Value
             } else {
diff --git a/Sources/ParseLiveQuery/ObjCCompat.swift b/Sources/ParseLiveQuery/ObjCCompat.swift
