Skip to content

Commit a87bfb0

Browse files
dplewisdplewis
authored
refactor: Remove OCMock Carthage dependency (#1754)
1 parent c4998e6 commit a87bfb0

File tree

38 files changed

+335
-902
lines changed

38 files changed

+335
-902
lines changed

‎.github/workflows/ci.yml

+7
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ jobs:
3030
runs-on: macos-13
3131
steps:
3232
- uses: actions/checkout@v3
33+
- name: Cache SPM
34+
uses: actions/cache@v3
35+
with:
36+
path: ~/Library/Developer/Xcode/DerivedData/Parse*/SourcePackages/
37+
key: ${{ runner.os }}-spm-${{ hashFiles('Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
38+
restore-keys: |
39+
${{ runner.os }}-spm-
3340
- name: Setup Ruby
3441
uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
3542
- name: Cache Gems

‎.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
[submodule "Carthage/Checkouts/Bolts-ObjC"]
55
path = Carthage/Checkouts/Bolts-ObjC
66
url = https://github.com/BoltsFramework/Bolts-ObjC.git
7-
[submodule "Carthage/Checkouts/OCMock"]
8-
path = Carthage/Checkouts/OCMock
9-
url = https://github.com/erikdoe/OCMock.git
107
[submodule "Carthage/Checkouts/facebook-ios-sdk"]
118
path = Carthage/Checkouts/facebook-ios-sdk
129
url = https://github.com/facebook/facebook-ios-sdk.git

‎Carthage/Checkouts/OCMock

-1
This file was deleted.

‎Package.resolved

+9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
"version": "15.1.0"
2929
}
3030
},
31+
{
32+
"package": "OCMock",
33+
"repositoryURL": "https://github.com/erikdoe/ocmock.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89",
37+
"version": null
38+
}
39+
},
3140
{
3241
"package": "Starscream",
3342
"repositoryURL": "https://github.com/daltoniam/Starscream.git",

‎Package.swift

+61-45
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@ import PackageDescription
55
let package = Package(
66
name: "ParseObjC",
77
defaultLocalization: "en",
8-
platforms: [.iOS(.v12),
9-
.macOS(.v10_15),
10-
.tvOS(.v12),
11-
.watchOS(.v2)],
8+
platforms: [
9+
.iOS(.v12),
10+
.macOS(.v10_15),
11+
.tvOS(.v12),
12+
.watchOS(.v2)
13+
],
1214
products: [
1315
.library(name: "ParseObjC", targets: ["ParseCore"]),
16+
.library(name: "ParseFacebookUtils", targets: ["ParseFacebookUtils"]),
1417
.library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
1518
.library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
1619
.library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
@@ -21,7 +24,8 @@ let package = Package(
2124
.package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
2225
.package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
2326
.package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
24-
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0")
27+
.package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0"),
28+
.package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89"))
2529
],
2630
targets: [
2731
.target(
@@ -31,7 +35,8 @@ let package = Package(
3135
exclude: ["Resources/Parse-tvOS.Info.plist", "Resources/Parse-iOS.Info.plist", "Resources/Parse-OSX.Info.plist", "Resources/Parse-watchOS.Info.plist"],
3236
resources: [.process("Resources")],
3337
publicHeadersPath: "Source",
34-
cSettings: [.headerSearchPath("Internal/**")]),
38+
cSettings: [.headerSearchPath("Internal/**")]
39+
),
3540
.target(
3641
name: "ParseFacebookUtils",
3742
dependencies: [
@@ -42,53 +47,64 @@ let package = Package(
4247
path: "ParseFacebookUtils/ParseFacebookUtils",
4348
exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
4449
resources: [.process("Resources")],
45-
publicHeadersPath: "Source"),
46-
.target(name: "ParseFacebookUtilsiOS",
47-
dependencies: [
50+
publicHeadersPath: "Source"
51+
),
52+
.target(
53+
name: "ParseFacebookUtilsiOS",
54+
dependencies: [
4855
"ParseFacebookUtils"
49-
],
50-
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
51-
exclude: ["Resources/Info-iOS.plist"],
52-
resources: [.process("Resources")],
53-
publicHeadersPath: "Source",
54-
cSettings: [.headerSearchPath("Internal/**")]),
55-
.target(name: "ParseFacebookUtilsTvOS",
56-
dependencies: [
56+
],
57+
path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
58+
exclude: ["Resources/Info-iOS.plist"],
59+
resources: [.process("Resources")],
60+
publicHeadersPath: "Source",
61+
cSettings: [.headerSearchPath("Internal/**")]
62+
),
63+
.target(
64+
name: "ParseFacebookUtilsTvOS",
65+
dependencies: [
5766
"ParseFacebookUtils",
5867
.product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
59-
],
60-
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
61-
exclude: ["Resources/Info-tvOS.plist"],
62-
resources: [.process("Resources")],
63-
publicHeadersPath: "Source",
64-
cSettings: [.headerSearchPath("Internal/**")]),
65-
.target(name: "ParseTwitterUtils",
66-
dependencies: [
68+
],
69+
path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
70+
exclude: ["Resources/Info-tvOS.plist"],
71+
resources: [.process("Resources")],
72+
publicHeadersPath: "Source",
73+
cSettings: [.headerSearchPath("Internal/**")]
74+
),
75+
.target(
76+
name: "ParseTwitterUtils",
77+
dependencies: [
6778
"ParseCore"
68-
],
69-
path: "ParseTwitterUtils/ParseTwitterUtils",
70-
exclude: ["Resources/Info-iOS.plist"],
71-
resources: [.process("Resources")],
72-
publicHeadersPath: "Source",
73-
cSettings: [.headerSearchPath("Internal/**")]),
74-
.target(name: "ParseUI",
75-
dependencies: [
79+
],
80+
path: "ParseTwitterUtils/ParseTwitterUtils",
81+
exclude: ["Resources/Info-iOS.plist"],
82+
resources: [.process("Resources")],
83+
publicHeadersPath: "Source",
84+
cSettings: [.headerSearchPath("Internal/**")]
85+
),
86+
.target(
87+
name: "ParseUI",
88+
dependencies: [
7689
"ParseFacebookUtilsiOS",
7790
"ParseTwitterUtils"
78-
],
79-
path: "ParseUI/ParseUI",
80-
exclude: ["Resources/Info-iOS.plist"],
81-
resources: [.process("Resources")],
82-
publicHeadersPath: "Source",
83-
cSettings: [.headerSearchPath("Internal/**")]),
84-
.target(name: "ParseLiveQuery",
85-
dependencies: [
91+
],
92+
path: "ParseUI/ParseUI",
93+
exclude: ["Resources/Info-iOS.plist"],
94+
resources: [.process("Resources")],
95+
publicHeadersPath: "Source",
96+
cSettings: [.headerSearchPath("Internal/**")]
97+
),
98+
.target(
99+
name: "ParseLiveQuery",
100+
dependencies: [
86101
.product(name: "BoltsSwift", package: "Bolts-Swift"),
87102
"Starscream",
88103
"ParseCore"
89-
],
90-
path: "ParseLiveQuery/ParseLiveQuery",
91-
exclude: ["Resources/Info.plist"],
92-
resources: [.process("Resources")])
104+
],
105+
path: "ParseLiveQuery/ParseLiveQuery",
106+
exclude: ["Resources/Info.plist"],
107+
resources: [.process("Resources")]
108+
)
93109
]
94110
)

‎Parse.xcworkspace/contents.xcworkspacedata

-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved

+9
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
"version": "15.1.0"
2929
}
3030
},
31+
{
32+
"package": "OCMock",
33+
"repositoryURL": "https://github.com/erikdoe/ocmock.git",
34+
"state": {
35+
"branch": null,
36+
"revision": "67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89",
37+
"version": null
38+
}
39+
},
3140
{
3241
"package": "Starscream",
3342
"repositoryURL": "https://github.com/daltoniam/Starscream.git",

‎Parse/Configurations/Parse-iOS-Dynamic.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
PRODUCT_NAME = Parse
1414
PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
1515

16-
IPHONEOS_DEPLOYMENT_TARGET = 9.0
16+
IPHONEOS_DEPLOYMENT_TARGET = 12.0
1717

1818
INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
1919

‎Parse/Configurations/ParseUnitTests-iOS.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
1616

1717
SWIFT_VERSION = 5.0
1818

19-
IPHONEOS_DEPLOYMENT_TARGET = 9.0
19+
IPHONEOS_DEPLOYMENT_TARGET = 12.0
2020

2121
INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist
2222

0 commit comments

Comments
 (0)