parse-community · drdaz · May 26, 2021 · May 26, 2021 · May 26, 2021 · Jun 3, 2021
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,5 @@ docs/
 .idea/
 ParseFacebookUtils/Vendor
 ParseUI/Vendor
+.swiftpm
+.build
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,38 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "Parse",
+    defaultLocalization: "en",
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "Parse",
+            targets: ["Parse"]),
+        // .library(
+        //     name: "ParseFacebookUtils",
+        //     targets: ["ParseFacebookUtils"]),
+        // .library(
+        //     name: "ParseTwitterUtils",
+        //     targets: ["ParseTwitterUtils"]),
+
+    ],
+    dependencies: [
+        .package(name: "Bolts", url: "https://github.com/drdaz/Bolts-ObjC", .branch("master"))
+//        .package(name: "Bolts",
+//                 url: "https://github.com/drdaz/Bolts-ObjC",
+//                 .revision("df0c47add16f6cb7e81fd28aa59518c607a9dd4e"))
+//            .package(name: "Bolts", path: "/Users/drdaz/Documents/Development/Others/Bolts-ObjC")
+    ],
+    targets: [
+        .target(
+            name: "Parse",
+            dependencies: [.product(name: "Bolts", package: "Bolts")],
+            path: "Parse/Source",
+            exclude: ["Info.plist"],
+            publicHeadersPath: "Public"
+        )
+    ]
+)
diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Parse/Resources/Parse-OSX.Info.plist → Parse/Resources/Parse-OSX.Info.plist b/Parse/Parse/Resources/Parse-OSX.Info.plist → Parse/Resources/Parse-OSX.Info.plist
diff --git a/Parse/Parse/Resources/Parse-iOS.Info.plist → Parse/Resources/Parse-iOS.Info.plist b/Parse/Parse/Resources/Parse-iOS.Info.plist → Parse/Resources/Parse-iOS.Info.plist
diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist → Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist → Parse/Resources/Parse-tvOS.Info.plist
diff --git a/.../Parse/Resources/Parse-watchOS.Info.plist → Parse/Resources/Parse-watchOS.Info.plist b/.../Parse/Resources/Parse-watchOS.Info.plist → Parse/Resources/Parse-watchOS.Info.plist
diff --git a/Parse/Parse/Resources/en.lproj/Parse.strings → Parse/Resources/en.lproj/Parse.strings b/Parse/Parse/Resources/en.lproj/Parse.strings → Parse/Resources/en.lproj/Parse.strings
diff --git a/...ultACLController/PFDefaultACLController.h → ...ultACLController/PFDefaultACLController.h b/...ultACLController/PFDefaultACLController.h → ...ultACLController/PFDefaultACLController.h
@@ -9,9 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
-#import "PFCoreDataProvider.h"
+#import "../../PFCoreDataProvider.h"
 
 @class BFTask<__covariant BFGenericType>;
 @class PFACL;

diff --git a/...ultACLController/PFDefaultACLController.m → ...ultACLController/PFDefaultACLController.m b/...ultACLController/PFDefaultACLController.m → ...ultACLController/PFDefaultACLController.m
@@ -9,11 +9,15 @@
 
 #import "PFDefaultACLController.h"
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFTask.h>
+#endif
 
-#import "PFACLPrivate.h"
-#import "PFAsyncTaskQueue.h"
-#import "PFCurrentUserController.h"
+#import "../PFACLPrivate.h"
+#import "../../PFAsyncTaskQueue.h"
+#import "../../User/CurrentUserController/PFCurrentUserController.h"
 
 @implementation PFDefaultACLController {
     PFAsyncTaskQueue *_taskQueue;

diff --git a/Parse/Parse/Internal/ACL/PFACLPrivate.h → Parse/Source/Internal/ACL/PFACLPrivate.h b/Parse/Parse/Internal/ACL/PFACLPrivate.h → Parse/Source/Internal/ACL/PFACLPrivate.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFACL.h>
+#import "PFACL.h"
 
 @class PFUser;
 

diff --git a/Parse/Parse/Internal/ACL/State/PFACLState.h → Parse/Source/Internal/ACL/State/PFACLState.h b/Parse/Parse/Internal/ACL/State/PFACLState.h → Parse/Source/Internal/ACL/State/PFACLState.h
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "PFBaseState.h"
+#import "../../PFBaseState.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Parse/Parse/Internal/ACL/State/PFACLState.m → Parse/Source/Internal/ACL/State/PFACLState.m b/Parse/Parse/Internal/ACL/State/PFACLState.m → Parse/Source/Internal/ACL/State/PFACLState.m
diff --git a/...e/Internal/ACL/State/PFACLState_Private.h → ...e/Internal/ACL/State/PFACLState_Private.h b/...e/Internal/ACL/State/PFACLState_Private.h → ...e/Internal/ACL/State/PFACLState_Private.h
@@ -9,7 +9,7 @@
 
 #import "PFACLState.h"
 
-#import "PFMacros.h"
+#import "../../PFMacros.h"
 
 /**
  Returns NSString representation of a property on PFACLState

diff --git a/...se/Internal/ACL/State/PFMutableACLState.h → ...ce/Internal/ACL/State/PFMutableACLState.h b/...se/Internal/ACL/State/PFMutableACLState.h → ...ce/Internal/ACL/State/PFMutableACLState.h
diff --git a/...se/Internal/ACL/State/PFMutableACLState.m → ...ce/Internal/ACL/State/PFMutableACLState.m b/...se/Internal/ACL/State/PFMutableACLState.m → ...ce/Internal/ACL/State/PFMutableACLState.m
diff --git a/...lytics/Controller/PFAnalyticsController.h → ...lytics/Controller/PFAnalyticsController.h b/...lytics/Controller/PFAnalyticsController.h → ...lytics/Controller/PFAnalyticsController.h
@@ -9,10 +9,10 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
-#import "PFDataProvider.h"
-#import "PFMacros.h"
+#import "../../PFDataProvider.h"
+#import "../../PFMacros.h"
 
 @class BFTask<__covariant BFGenericType>;
 

diff --git a/...lytics/Controller/PFAnalyticsController.m → ...lytics/Controller/PFAnalyticsController.m b/...lytics/Controller/PFAnalyticsController.m → ...lytics/Controller/PFAnalyticsController.m
@@ -9,11 +9,11 @@
 
 #import "PFAnalyticsController.h"
 
-#import "BFTask+Private.h"
-#import "PFAnalyticsUtilities.h"
-#import "PFAssert.h"
-#import "PFEventuallyQueue.h"
-#import "PFRESTAnalyticsCommand.h"
+#import "../../BFTask+Private.h"
+#import "../Utilities/PFAnalyticsUtilities.h"
+#import "../../PFAssert.h"
+#import "../../PFEventuallyQueue.h"
+#import "../../Commands/PFRESTAnalyticsCommand.h"
 
 @interface PFAnalyticsController ()
 

diff --git a/.../Internal/Analytics/PFAnalytics_Private.h → .../Internal/Analytics/PFAnalytics_Private.h b/.../Internal/Analytics/PFAnalytics_Private.h → .../Internal/Analytics/PFAnalytics_Private.h
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <Parse/PFAnalytics.h>
+#import "PFAnalytics.h"
 
 /**
  Predefined events - AppOpened, CrashReport

diff --git a/...nalytics/Utilities/PFAnalyticsUtilities.h → ...nalytics/Utilities/PFAnalyticsUtilities.h b/...nalytics/Utilities/PFAnalyticsUtilities.h → ...nalytics/Utilities/PFAnalyticsUtilities.h
diff --git a/...nalytics/Utilities/PFAnalyticsUtilities.m → ...nalytics/Utilities/PFAnalyticsUtilities.m b/...nalytics/Utilities/PFAnalyticsUtilities.m → ...nalytics/Utilities/PFAnalyticsUtilities.m
@@ -9,7 +9,7 @@
 
 #import "PFAnalyticsUtilities.h"
 
-#import "PFHash.h"
+#import "../../PFHash.h"
 
 @implementation PFAnalyticsUtilities
 

diff --git a/Parse/Parse/Internal/BFTask+Private.h → Parse/Source/Internal/BFTask+Private.h b/Parse/Parse/Internal/BFTask+Private.h → Parse/Source/Internal/BFTask+Private.h
@@ -9,8 +9,12 @@
 
 #import <Foundation/Foundation.h>
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFExecutor.h>
 #import <Bolts/BFTask.h>
+#endif
 
 #import "PFInternalUtils.h"
 

diff --git a/Parse/Parse/Internal/BFTask+Private.m → Parse/Source/Internal/BFTask+Private.m b/Parse/Parse/Internal/BFTask+Private.m → Parse/Source/Internal/BFTask+Private.m
@@ -9,8 +9,12 @@
 
 #import "BFTask+Private.h"
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFExecutor.h>
 #import <Bolts/BFTaskCompletionSource.h>
+#endif
 
 #import "PFLogging.h"
 

diff --git a/...nternal/CloudCode/PFCloudCodeController.h → ...nternal/CloudCode/PFCloudCodeController.h b/...nternal/CloudCode/PFCloudCodeController.h → ...nternal/CloudCode/PFCloudCodeController.h
@@ -9,8 +9,8 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
-#import "PFDataProvider.h"
+#import "PFConstants.h"
+#import "../PFDataProvider.h"
 
 @class BFTask<__covariant BFGenericType>;
 

diff --git a/...nternal/CloudCode/PFCloudCodeController.m → ...nternal/CloudCode/PFCloudCodeController.m b/...nternal/CloudCode/PFCloudCodeController.m → ...nternal/CloudCode/PFCloudCodeController.m
@@ -9,14 +9,14 @@
 
 #import "PFCloudCodeController.h"
 
-#import "BFTask+Private.h"
-#import "PFAssert.h"
-#import "PFCommandResult.h"
-#import "PFCommandRunning.h"
+#import "../BFTask+Private.h"
+#import "../PFAssert.h"
+#import "../PFCommandResult.h"
+#import "../Commands/CommandRunner/PFCommandRunning.h"
 #import "PFDecoder.h"
 #import "PFEncoder.h"
-#import "PFInternalUtils.h"
-#import "PFRESTCloudCommand.h"
+#import "../PFInternalUtils.h"
+#import "../Commands/PFRESTCloudCommand.h"
 
 @implementation PFCloudCodeController
 

diff --git a/...Commands/CommandRunner/PFCommandRunning.h → ...Commands/CommandRunner/PFCommandRunning.h b/...Commands/CommandRunner/PFCommandRunning.h → ...Commands/CommandRunner/PFCommandRunning.h
@@ -9,9 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
-#import "PFDataProvider.h"
+#import "../../PFDataProvider.h"
 
 @class BFCancellationToken;
 @class BFTask<__covariant BFGenericType>;

diff --git a/...Commands/CommandRunner/PFCommandRunning.m → ...Commands/CommandRunner/PFCommandRunning.m b/...Commands/CommandRunner/PFCommandRunning.m → ...Commands/CommandRunner/PFCommandRunning.m
diff --git a/...CommandRunner/PFCommandRunningConstants.h → ...CommandRunner/PFCommandRunningConstants.h b/...CommandRunner/PFCommandRunningConstants.h → ...CommandRunner/PFCommandRunningConstants.h
diff --git a/...CommandRunner/PFCommandRunningConstants.m → ...CommandRunner/PFCommandRunningConstants.m b/...CommandRunner/PFCommandRunningConstants.m → ...CommandRunner/PFCommandRunningConstants.m
diff --git a/...structor/PFCommandURLRequestConstructor.h → ...structor/PFCommandURLRequestConstructor.h b/...structor/PFCommandURLRequestConstructor.h → ...structor/PFCommandURLRequestConstructor.h
@@ -9,9 +9,9 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
-#import "PFDataProvider.h"
+#import "../../../PFDataProvider.h"
 
 @class BFTask<__covariant BFGenericType>;
 @class PFRESTCommand;

diff --git a/...structor/PFCommandURLRequestConstructor.m → ...structor/PFCommandURLRequestConstructor.m b/...structor/PFCommandURLRequestConstructor.m → ...structor/PFCommandURLRequestConstructor.m
@@ -9,17 +9,17 @@
 
 #import "PFCommandURLRequestConstructor.h"
 
-#import "BFTask+Private.h"
-#import "PFAssert.h"
-#import "PFCommandRunningConstants.h"
-#import "PFDevice.h"
-#import "PFHTTPRequest.h"
-#import "PFHTTPURLRequestConstructor.h"
-#import "PFInstallationIdentifierStore.h"
-#import "PFInternalUtils.h"
-#import "PFRESTCommand.h"
-#import "PFURLConstructor.h"
-#import "Parse_Private.h"
+#import "../../../BFTask+Private.h"
+#import "../../../PFAssert.h"
+#import "../PFCommandRunningConstants.h"
+#import "../../../PFDevice.h"
+#import "../../../HTTPRequest/PFHTTPRequest.h"
+#import "../../../HTTPRequest/PFHTTPURLRequestConstructor.h"
+#import "../../../Installation/InstallationIdentifierStore/PFInstallationIdentifierStore.h"
+#import "../../../PFInternalUtils.h"
+#import "../../PFRESTCommand.h"
+#import "../../../HTTPRequest/PFURLConstructor.h"
+#import "../../../Parse_Private.h"
 
 @implementation PFCommandURLRequestConstructor
 

diff --git a/...er/URLSession/PFURLSessionCommandRunner.h → ...er/URLSession/PFURLSessionCommandRunner.h b/...er/URLSession/PFURLSessionCommandRunner.h → ...er/URLSession/PFURLSessionCommandRunner.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "PFCommandRunning.h"
+#import "../PFCommandRunning.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/...er/URLSession/PFURLSessionCommandRunner.m → ...er/URLSession/PFURLSessionCommandRunner.m b/...er/URLSession/PFURLSessionCommandRunner.m → ...er/URLSession/PFURLSessionCommandRunner.m
@@ -10,26 +10,30 @@
 #import "PFURLSessionCommandRunner.h"
 #import "PFURLSessionCommandRunner_Private.h"
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFTaskCompletionSource.h>
+#endif
 
-#import "BFTask+Private.h"
-#import "PFAssert.h"
-#import "PFCommandResult.h"
-#import "PFCommandRunningConstants.h"
-#import "PFCommandURLRequestConstructor.h"
+#import "../../../BFTask+Private.h"
+#import "../../../PFAssert.h"
+#import "../../../PFCommandResult.h"
+#import "../PFCommandRunningConstants.h"
+#import "../URLRequestConstructor/PFCommandURLRequestConstructor.h"
 #import "PFConstants.h"
-#import "PFDevice.h"
+#import "../../../PFDevice.h"
 #import "PFEncoder.h"
-#import "PFHTTPRequest.h"
-#import "PFHTTPURLRequestConstructor.h"
-#import "PFInstallationIdentifierStore.h"
-#import "PFInternalUtils.h"
-#import "PFLogging.h"
-#import "PFMacros.h"
-#import "PFRESTCommand.h"
-#import "PFURLConstructor.h"
-#import "PFURLSession.h"
-#import "Parse_Private.h"
+#import "../../../HTTPRequest/PFHTTPRequest.h"
+#import "../../../HTTPRequest/PFHTTPURLRequestConstructor.h"
+#import "../../../Installation/InstallationIdentifierStore/PFInstallationIdentifierStore.h"
+#import "../../../PFInternalUtils.h"
+#import "../../../PFLogging.h"
+#import "../../../PFMacros.h"
+#import "../../PFRESTCommand.h"
+#import "../../../HTTPRequest/PFURLConstructor.h"
+#import "Session/PFURLSession.h"
+#import "../../../Parse_Private.h"
 
 @interface PFURLSessionCommandRunner () <PFURLSessionDelegate>
 

diff --git a/...ssion/PFURLSessionCommandRunner_Private.h → ...ssion/PFURLSessionCommandRunner_Private.h b/...ssion/PFURLSessionCommandRunner_Private.h → ...ssion/PFURLSessionCommandRunner_Private.h
diff --git a/...dRunner/URLSession/Session/PFURLSession.h → ...dRunner/URLSession/Session/PFURLSession.h b/...dRunner/URLSession/Session/PFURLSession.h → ...dRunner/URLSession/Session/PFURLSession.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
 @class BFCancellationToken;
 

diff --git a/...dRunner/URLSession/Session/PFURLSession.m → ...dRunner/URLSession/Session/PFURLSession.m b/...dRunner/URLSession/Session/PFURLSession.m → ...dRunner/URLSession/Session/PFURLSession.m
@@ -10,15 +10,19 @@
 #import "PFURLSession.h"
 #import "PFURLSession_Private.h"
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFTaskCompletionSource.h>
-
-#import "BFTask+Private.h"
-#import "PFCommandResult.h"
-#import "PFMacros.h"
-#import "PFAssert.h"
-#import "PFURLSessionJSONDataTaskDelegate.h"
-#import "PFURLSessionUploadTaskDelegate.h"
-#import "PFURLSessionFileDownloadTaskDelegate.h"
+#endif
+
+#import "../../../../BFTask+Private.h"
+#import "../../../../PFCommandResult.h"
+#import "../../../../PFMacros.h"
+#import "../../../../PFAssert.h"
+#import "TaskDelegate/PFURLSessionJSONDataTaskDelegate.h"
+#import "TaskDelegate/PFURLSessionUploadTaskDelegate.h"
+#import "TaskDelegate/PFURLSessionFileDownloadTaskDelegate.h"
 
 typedef void (^PFURLSessionTaskCompletionHandler)(NSData *data, NSURLResponse *response, NSError *error);
 

diff --git a/...URLSession/Session/PFURLSession_Private.h → ...URLSession/Session/PFURLSession_Private.h b/...URLSession/Session/PFURLSession_Private.h → ...URLSession/Session/PFURLSession_Private.h
diff --git a/...skDelegate/PFURLSessionDataTaskDelegate.h → ...skDelegate/PFURLSessionDataTaskDelegate.h b/...skDelegate/PFURLSessionDataTaskDelegate.h → ...skDelegate/PFURLSessionDataTaskDelegate.h
@@ -9,7 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
 @class BFCancellationToken;
 

diff --git a/...skDelegate/PFURLSessionDataTaskDelegate.m → ...skDelegate/PFURLSessionDataTaskDelegate.m b/...skDelegate/PFURLSessionDataTaskDelegate.m → ...skDelegate/PFURLSessionDataTaskDelegate.m
@@ -10,11 +10,15 @@
 #import "PFURLSessionDataTaskDelegate.h"
 #import "PFURLSessionDataTaskDelegate_Private.h"
 
+#if SWIFT_PACKAGE
+@import Bolts;
+#else
 #import <Bolts/BFTaskCompletionSource.h>
 #import <Bolts/BFCancellationToken.h>
+#endif
 
-#import "PFAssert.h"
-#import "PFMacros.h"
+#import "../../../../../PFAssert.h"
+#import "../../../../../PFMacros.h"
 
 @interface PFURLSessionDataTaskDelegate () {
     BFTaskCompletionSource *_taskCompletionSource;

diff --git a/...te/PFURLSessionDataTaskDelegate_Private.h → ...te/PFURLSessionDataTaskDelegate_Private.h b/...te/PFURLSessionDataTaskDelegate_Private.h → ...te/PFURLSessionDataTaskDelegate_Private.h
diff --git a/...te/PFURLSessionFileDownloadTaskDelegate.h → ...te/PFURLSessionFileDownloadTaskDelegate.h b/...te/PFURLSessionFileDownloadTaskDelegate.h → ...te/PFURLSessionFileDownloadTaskDelegate.h
@@ -9,7 +9,7 @@
 
 #import "PFURLSessionDataTaskDelegate.h"
 
-#import <Parse/PFConstants.h>
+#import "PFConstants.h"
 
 NS_ASSUME_NONNULL_BEGIN