Xcode 12 fixes

.gitmodules

@@ -3,10 +3,7 @@
 	url = https://github.com/parse-community/xctoolchain.git
 [submodule "Carthage/Checkouts/Bolts-ObjC"]
 	path = Carthage/Checkouts/Bolts-ObjC
-	url = https://github.com/BoltsFramework/Bolts-ObjC.git
-[submodule "Carthage/Checkouts/facebook-objc-sdk"]
-	path = Carthage/Checkouts/facebook-objc-sdk
-	url = https://github.com/facebook/facebook-objc-sdk.git
+	url = https://github.com/mman/Bolts-ObjC.git
 [submodule "Carthage/Checkouts/OCMock"]
 	path = Carthage/Checkouts/OCMock
 	url = https://github.com/erikdoe/OCMock.git

Cartfile

@@ -1,2 +1 @@
-github "BoltsFramework/Bolts-ObjC" ~> 1.9.1
-github "facebook/facebook-ios-sdk"
+github "mman/Bolts-ObjC.git" "master"

Cartfile.resolved

@@ -1,2 +1 @@
-github "BoltsFramework/Bolts-ObjC" "1.9.1"
-github "facebook/facebook-ios-sdk" "v9.0.0"
+github "mman/Bolts-ObjC" "f1ef5d3d5f50d7936ff18bd9f39f41eca2448678"

Parse/Parse/Internal/Commands/PFRESTCommand.m

@@ -246,11 +246,13 @@ - (BOOL)forEachLocalId:(BOOL(^)(PFObject *pointer, BOOL *modified, NSError **err
 
 - (BOOL)resolveLocalIds:(NSError * __autoreleasing *)error {
     BOOL paramEncodingSucceeded = [self forEachLocalId:^(PFObject *pointer, BOOL *modified, NSError **blockError) {
-        NSError *localError;
+        NSError *localError = NULL;
         BOOL success = [pointer resolveLocalId:&localError];
         *modified = YES;
         if (!success && localError) {
-            *blockError = localError;
+            if (blockError) {
+                *blockError = localError;
+            }
         }
         return success;
     } error: error];

Parse/Parse/Internal/LocalDataStore/OfflineStore/PFOfflineStore.m

@@ -1044,7 +1044,9 @@ - (void)updateObjectIdForObject:(PFObject *)object
     }
 }
 
-void PFOfflineStoreReplaceExisingObject() {}
+void PFOfflineStoreReplaceExisingObject(void);
+
+void PFOfflineStoreReplaceExisingObject(void) {}
 
 - (NSString *)_generateKeyForClassName:(NSString *)className
                               objectId:(NSString *)objectId {

Parse/Parse/Internal/Object/State/PFObjectState.m

@@ -180,7 +180,9 @@ - (void)applyState:(PFObjectState *)state {
     }
     [_serverData addEntriesFromDictionary:state.serverData];
 
-    self.complete |= state.complete;
+    if (state.complete) {
+        self.complete = YES;
+    }
 }
 
 - (void)applyOperationSet:(PFOperationSet *)operationSet {

Parse/Parse/Internal/PFReachability.m

@@ -48,7 +48,7 @@ + (BOOL)_reachabilityStateForFlags:(SCNetworkConnectionFlags)flags {
 
     if ((flags & kSCNetworkReachabilityFlagsReachable) == 0) {
         // if target host is not reachable
-        return reachabilityState;
+        return NO;
     }
 
     if ((flags & kSCNetworkReachabilityFlagsConnectionRequired) == 0) {
@@ -77,7 +77,7 @@ + (BOOL)_reachabilityStateForFlags:(SCNetworkConnectionFlags)flags {
     }
 #endif
 
-    return reachabilityState;
+    return (reachabilityState != 0);
 }
 
 ///--------------------------------------

Parse/Parse/PFObject.m

@@ -225,7 +225,9 @@ + (BOOL)collectDirtyChildren:(id)node
                                                  error:&localError];
             }
             if (!succeeded) {
-                *error = localError;
+                if (error) {
+                    *error = localError;
+                }
                 return NO;
             }
         }
@@ -259,7 +261,9 @@ + (BOOL)collectDirtyChildren:(id)node
                                     seenNew:seenNew
                                 currentUser:currentUser
                                         error:&localError]) {
-                *error = localError;
+                if (error) {
+                    *error = localError;
+                }
                 return NO;
             }
         }
@@ -296,15 +300,17 @@ + (BOOL)collectDirtyChildren:(id)node
             toSearch = [object._estimatedData.dictionaryRepresentation copy];
         }
 
-        NSError *localError;
+        NSError *localError = NULL;
         if (![self collectDirtyChildren:toSearch
                           children:dirtyChildren
                              files:dirtyFiles
                               seen:seen
                            seenNew:seenNew
                             currentUser:currentUser
                                   error:&localError]) {
-            *error = localError;
+            if (error) {
+                *error = localError;
+            }
             return NO;
         }
 
@@ -1356,7 +1362,9 @@ - (void)_mergeFromServerWithResult:(NSDictionary *)result decoder:(PFDecoder *)d
     @synchronized (lock) {
         self._state = [self._state copyByMutatingWithBlock:^(PFMutableObjectState *state) {
             // If the server's data is complete, consider this object to be fetched.
-            state.complete |= completeData;
+            if (completeData) {
+                state.complete = YES;
+            }
 
             [result enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
                 if ([key isEqualToString:PFObjectObjectIdRESTKey]) {

Parse/Parse/PFPolygon.h

@@ -9,7 +9,7 @@
 
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
-#import "PFGeoPoint.h"
+#import <Parse/PFGeoPoint.h>
 
 NS_ASSUME_NONNULL_BEGIN