refactor: Remove Carthage dependency (#1763)

parse-community · Oct 18, 2023 · 5f662b1 · 5f662b1
1 parent a87bfb0
commit 5f662b1
Show file tree

Hide file tree

Showing 116 changed files with 532 additions and 2,043 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,18 +61,6 @@ jobs:
       - name: Bundle Install
         if: steps.cache-gems.outputs.cache-hit != 'true'
         run: bundle install
-      - name: Cache Carthage
-        uses: actions/cache@v3
-        id: carthage-cache
-        with:
-          path: Carthage
-          key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-carthage-
-      - name: Carthage
-        if: ${{ steps.carthage-cache.outputs.cache-hit != 'true' }}
-        run: |
-          carthage bootstrap --use-xcframeworks
       - name: Build-Test
         run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script == 'xcode15' && 'build:starters' || matrix.script }}
         env:

diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "Vendor/xctoolchain"]
 	path = Vendor/xctoolchain
 	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-ios-sdk"]
-	path = Carthage/Checkouts/facebook-ios-sdk
-	url = https://github.com/facebook/facebook-ios-sdk.git
diff --git a/Cartfile b/Cartfile
diff --git a/Cartfile.resolved b/Cartfile.resolved
diff --git a/Carthage/Checkouts/Bolts-ObjC b/Carthage/Checkouts/Bolts-ObjC
diff --git a/Carthage/Checkouts/facebook-ios-sdk b/Carthage/Checkouts/facebook-ios-sdk
diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj
diff --git a/Parse/Parse/Source/PFAnalytics.h b/Parse/Parse/Source/PFAnalytics.h
@@ -9,11 +9,7 @@
 
 #import <Foundation/Foundation.h>
 
-#if __has_include(<Bolts/BFTask.h>)
-#import <Bolts/BFTask.h>
-#else
-#import "BFTask.h"
-#endif
+@import Bolts;
 
 #import "PFConstants.h"
 

diff --git a/Parse/Tests/Other/OCMock/OCMock+Parse.m b/Parse/Tests/Other/OCMock/OCMock+Parse.m
@@ -9,7 +9,7 @@
 
 #import "OCMock+Parse.h"
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFCommandRunning.h"

diff --git a/Parse/Tests/Other/Swift/SwiftSubclass.swift b/Parse/Tests/Other/Swift/SwiftSubclass.swift
@@ -9,7 +9,7 @@
 
 import Foundation
 
-import Parse
+import ParseCore
 
 @objc
 public class SwiftSubclass: PFObject, PFSubclassing {

diff --git a/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m b/Parse/Tests/Other/TestCases/TestCase/PFTestCase.m
@@ -9,7 +9,7 @@
 
 #import "PFTestCase.h"
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFTestSwizzlingUtilities.h"
 

diff --git a/Parse/Tests/Unit/AnalyticsUnitTests.m b/Parse/Tests/Unit/AnalyticsUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFAnalyticsController.h"
 #import "PFUnitTestCase.h"

diff --git a/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m b/Parse/Tests/Unit/AnonymousAuthenticationProviderTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFAnonymousAuthenticationProvider.h"
 #import "PFTestCase.h"

diff --git a/Parse/Tests/Unit/CloudCodeControllerTests.m b/Parse/Tests/Unit/CloudCodeControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "OCMock+Parse.h"
 #import "PFCloudCodeController.h"

diff --git a/Parse/Tests/Unit/ConfigControllerTests.m b/Parse/Tests/Unit/ConfigControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "OCMock+Parse.h"
 #import "PFCommandResult.h"

diff --git a/Parse/Tests/Unit/ConfigUnitTests.m b/Parse/Tests/Unit/ConfigUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFConfigController.h"
 #import "PFConfig_Private.h"

diff --git a/Parse/Tests/Unit/CurrentConfigControllerTests.m b/Parse/Tests/Unit/CurrentConfigControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "BFTask+Private.h"
 #import "PFCommandResult.h"

diff --git a/Parse/Tests/Unit/DefaultACLControllerTests.m b/Parse/Tests/Unit/DefaultACLControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFACLPrivate.h"
 #import "PFCoreManager.h"

diff --git a/Parse/Tests/Unit/ExtensionDataSharingTests.m b/Parse/Tests/Unit/ExtensionDataSharingTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFExtensionDataSharingTestHelper.h"
 #import "PFFileManager.h"

diff --git a/Parse/Tests/Unit/FileControllerTests.m b/Parse/Tests/Unit/FileControllerTests.m
@@ -9,9 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
-@import Bolts.BFTaskCompletionSource;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFCommandRunning.h"

diff --git a/Parse/Tests/Unit/FileUnitTests.m b/Parse/Tests/Unit/FileUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCoreManager.h"
 #import "PFFileController.h"

diff --git a/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m b/Parse/Tests/Unit/ObjectFilePersistenceControllerTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "BFTask+Private.h"
 #import "PFObject.h"

diff --git a/Parse/Tests/Unit/ObjectOfflineTests.m b/Parse/Tests/Unit/ObjectOfflineTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFObject.h"
 #import "PFOfflineStore.h"

diff --git a/Parse/Tests/Unit/OfflineQueryControllerTests.m b/Parse/Tests/Unit/OfflineQueryControllerTests.m
@@ -9,8 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "OCMock+Parse.h"
 #import "PFCommandResult.h"

diff --git a/Parse/Tests/Unit/PurchaseControllerTests.m b/Parse/Tests/Unit/PurchaseControllerTests.m
@@ -11,8 +11,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFExecutor;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFCommandRunning.h"

diff --git a/Parse/Tests/Unit/PurchaseUnitTests.m b/Parse/Tests/Unit/PurchaseUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandRunning.h"
 #import "PFFileManager.h"

diff --git a/Parse/Tests/Unit/PushChannelsControllerTests.m b/Parse/Tests/Unit/PushChannelsControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCurrentInstallationController.h"
 #import "PFInstallation.h"

diff --git a/Parse/Tests/Unit/PushControllerTests.m b/Parse/Tests/Unit/PushControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFCommandRunning.h"

diff --git a/Parse/Tests/Unit/PushUnitTests.m b/Parse/Tests/Unit/PushUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.H>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCoreManager.h"
 #import "PFCurrentInstallationController.h"

diff --git a/Parse/Tests/Unit/QueryCachedControllerTests.m b/Parse/Tests/Unit/QueryCachedControllerTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCachedQueryController.h"
 #import "PFCommandResult.h"

diff --git a/Parse/Tests/Unit/QueryControllerUnitTests.m b/Parse/Tests/Unit/QueryControllerUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
+@import Bolts;
 
 #import "BFTask+Private.h"
 #import "PFCommandResult.h"

diff --git a/Parse/Tests/Unit/QueryUnitTests.m b/Parse/Tests/Unit/QueryUnitTests.m
@@ -9,7 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCoreManager.h"
 #import "PFMacros.h"

diff --git a/Parse/Tests/Unit/RoleUnitTests.m b/Parse/Tests/Unit/RoleUnitTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFMockURLProtocol.h"
 #import "PFRelation.h"

diff --git a/Parse/Tests/Unit/SQLiteDatabaseTest.m b/Parse/Tests/Unit/SQLiteDatabaseTest.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "BFTask+Private.h"
 #import "PFFileManager.h"

diff --git a/Parse/Tests/Unit/URLSessionCommandRunnerTests.m b/Parse/Tests/Unit/URLSessionCommandRunnerTests.m
@@ -9,8 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFCommandRunningConstants.h"

diff --git a/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m b/Parse/Tests/Unit/URLSessionDataTaskDelegateTests.m
@@ -9,8 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFConstants.h"

diff --git a/Parse/Tests/Unit/URLSessionTests.m b/Parse/Tests/Unit/URLSessionTests.m
@@ -9,8 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFMacros.h"

diff --git a/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m b/Parse/Tests/Unit/URLSessionUploadTaskDelegateTests.m
@@ -9,8 +9,7 @@
 
 #import <OCMock/OCMock.h>
 
-@import Bolts.BFCancellationTokenSource;
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "PFCommandResult.h"
 #import "PFTestCase.h"

diff --git a/Parse/Tests/Unit/UserControllerTests.m b/Parse/Tests/Unit/UserControllerTests.m
@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-@import Bolts.BFTask;
+@import Bolts;
 
 #import "OCMock+Parse.h"
 #import "PFCommandResult.h"