Skip to content

Commit 5f662b1

Browse files
authored
refactor: Remove Carthage dependency (#1763)
1 parent a87bfb0 commit 5f662b1

File tree

116 files changed

+532
-2043
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+532
-2043
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,6 @@ jobs:
6161
- name: Bundle Install
6262
if: steps.cache-gems.outputs.cache-hit != 'true'
6363
run: bundle install
64-
- name: Cache Carthage
65-
uses: actions/cache@v3
66-
id: carthage-cache
67-
with:
68-
path: Carthage
69-
key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }}
70-
restore-keys: |
71-
${{ runner.os }}-carthage-
72-
- name: Carthage
73-
if: ${{ steps.carthage-cache.outputs.cache-hit != 'true' }}
74-
run: |
75-
carthage bootstrap --use-xcframeworks
7664
- name: Build-Test
7765
run: set -o pipefail && env NSUnbufferedIO=YES bundle exec rake ${{ matrix.script == 'xcode15' && 'build:starters' || matrix.script }}
7866
env:

.gitmodules

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
[submodule "Vendor/xctoolchain"]
22
path = Vendor/xctoolchain
33
url = https://github.com/parse-community/xctoolchain.git
4-
[submodule "Carthage/Checkouts/Bolts-ObjC"]
5-
path = Carthage/Checkouts/Bolts-ObjC
6-
url = https://github.com/BoltsFramework/Bolts-ObjC.git
7-
[submodule "Carthage/Checkouts/facebook-ios-sdk"]
8-
path = Carthage/Checkouts/facebook-ios-sdk
9-
url = https://github.com/facebook/facebook-ios-sdk.git

Cartfile

Lines changed: 0 additions & 2 deletions
This file was deleted.

Cartfile.resolved

Lines changed: 0 additions & 2 deletions
This file was deleted.

Carthage/Checkouts/Bolts-ObjC

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/facebook-ios-sdk

Lines changed: 0 additions & 1 deletion
This file was deleted.

Parse/Parse.xcodeproj/project.pbxproj

Lines changed: 74 additions & 304 deletions
Large diffs are not rendered by default.

Parse/Parse/Source/PFAnalytics.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
#import <Foundation/Foundation.h>
1111

12-
#if __has_include(<Bolts/BFTask.h>)
13-
#import <Bolts/BFTask.h>
14-
#else
15-
#import "BFTask.h"
16-
#endif
12+
@import Bolts;
1713

1814
#import "PFConstants.h"
1915

Parse/Tests/Other/OCMock/OCMock+Parse.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#import "OCMock+Parse.h"
1111

12-
@import Bolts.BFTask;
12+
@import Bolts;
1313

1414
#import "PFCommandResult.h"
1515
#import "PFCommandRunning.h"

Parse/Tests/Other/Swift/SwiftSubclass.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import Foundation
1111

12-
import Parse
12+
import ParseCore
1313

1414
@objc
1515
public class SwiftSubclass: PFObject, PFSubclassing {

0 commit comments

Comments
 (0)