refactor: Remove OCMock Carthage dependency (#1754)

Author: dplewis

.github/workflows/ci.yml

@@ -30,6 +30,13 @@ jobs:
     runs-on: macos-13
     steps:
       - uses: actions/checkout@v3
+      - name: Cache SPM
+        uses: actions/cache@v3
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData/Parse*/SourcePackages/
+          key: ${{ runner.os }}-spm-${{ hashFiles('Parse.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
+          restore-keys: |
+                  ${{ runner.os }}-spm-
       - name: Setup Ruby
         uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108
       - name: Cache Gems

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "Carthage/Checkouts/Bolts-ObjC"]
 	path = Carthage/Checkouts/Bolts-ObjC
 	url = https://github.com/BoltsFramework/Bolts-ObjC.git
-[submodule "Carthage/Checkouts/OCMock"]
-	path = Carthage/Checkouts/OCMock
-	url = https://github.com/erikdoe/OCMock.git
 [submodule "Carthage/Checkouts/facebook-ios-sdk"]
 	path = Carthage/Checkouts/facebook-ios-sdk
 	url = https://github.com/facebook/facebook-ios-sdk.git

Carthage/Checkouts/OCMock

@@ -5,12 +5,15 @@ import PackageDescription
 let package = Package(
     name: "ParseObjC",
     defaultLocalization: "en",
-    platforms: [.iOS(.v12),
-                .macOS(.v10_15),
-                .tvOS(.v12),
-                .watchOS(.v2)],
+    platforms: [
+        .iOS(.v12),
+        .macOS(.v10_15),
+        .tvOS(.v12),
+        .watchOS(.v2)
+    ],
     products: [
         .library(name: "ParseObjC", targets: ["ParseCore"]),
+        .library(name: "ParseFacebookUtils", targets: ["ParseFacebookUtils"]),
         .library(name: "ParseFacebookUtilsiOS", targets: ["ParseFacebookUtilsiOS"]),
         .library(name: "ParseFacebookUtilsTvOS", targets: ["ParseFacebookUtilsTvOS"]),
         .library(name: "ParseTwitterUtils", targets: ["ParseTwitterUtils"]),
@@ -21,7 +24,8 @@ let package = Package(
         .package(url: "https://github.com/parse-community/Bolts-ObjC.git", from: "1.10.0"),
         .package(url: "https://github.com/BoltsFramework/Bolts-Swift.git", from: "1.5.0"),
         .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.6"),
-        .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0")
+        .package(url: "https://github.com/facebook/facebook-ios-sdk.git", from: "15.1.0"),
+        .package(name: "OCMock", url: "https://github.com/erikdoe/ocmock.git", .revision("67bb9602f0a7541f24dc2d6d0d7389ca3e4c2c89"))
     ],
     targets: [
         .target(
@@ -31,7 +35,8 @@ let package = Package(
             exclude: ["Resources/Parse-tvOS.Info.plist", "Resources/Parse-iOS.Info.plist", "Resources/Parse-OSX.Info.plist", "Resources/Parse-watchOS.Info.plist"],
             resources: [.process("Resources")],
             publicHeadersPath: "Source",
-            cSettings: [.headerSearchPath("Internal/**")]),
+            cSettings: [.headerSearchPath("Internal/**")]
+        ),
         .target(
             name: "ParseFacebookUtils",
             dependencies: [
@@ -42,53 +47,64 @@ let package = Package(
             path: "ParseFacebookUtils/ParseFacebookUtils",
             exclude: ["Resources/Info-tvOS.plist", "Resources/Info-iOS.plist"],
             resources: [.process("Resources")],
-            publicHeadersPath: "Source"),
-        .target(name: "ParseFacebookUtilsiOS",
-               dependencies: [
+            publicHeadersPath: "Source"
+        ),
+        .target(
+            name: "ParseFacebookUtilsiOS",
+            dependencies: [
                 "ParseFacebookUtils"
-               ],
-                path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
-                exclude: ["Resources/Info-iOS.plist"],
-                resources: [.process("Resources")],
-                publicHeadersPath: "Source",
-                cSettings: [.headerSearchPath("Internal/**")]),
-        .target(name: "ParseFacebookUtilsTvOS",
-               dependencies: [
+            ],
+            path: "ParseFacebookUtilsiOS/ParseFacebookUtilsiOS",
+            exclude: ["Resources/Info-iOS.plist"],
+            resources: [.process("Resources")],
+            publicHeadersPath: "Source",
+            cSettings: [.headerSearchPath("Internal/**")]
+        ),
+        .target(
+            name: "ParseFacebookUtilsTvOS",
+            dependencies: [
                 "ParseFacebookUtils",
                 .product(name: "FacebookTV", package: "facebook-ios-sdk", condition: .when(platforms: [.tvOS]))
-               ],
-                path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
-                exclude: ["Resources/Info-tvOS.plist"],
-                resources: [.process("Resources")],
-                publicHeadersPath: "Source",
-                cSettings: [.headerSearchPath("Internal/**")]),
-        .target(name: "ParseTwitterUtils",
-               dependencies: [
+            ],
+            path: "ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS",
+            exclude: ["Resources/Info-tvOS.plist"],
+            resources: [.process("Resources")],
+            publicHeadersPath: "Source",
+            cSettings: [.headerSearchPath("Internal/**")]
+        ),
+        .target(
+            name: "ParseTwitterUtils",
+            dependencies: [
                 "ParseCore"
-               ],
-                path: "ParseTwitterUtils/ParseTwitterUtils",
-                exclude: ["Resources/Info-iOS.plist"],
-                resources: [.process("Resources")],
-                publicHeadersPath: "Source",
-                cSettings: [.headerSearchPath("Internal/**")]),
-        .target(name: "ParseUI",
-               dependencies: [
+            ],
+            path: "ParseTwitterUtils/ParseTwitterUtils",
+            exclude: ["Resources/Info-iOS.plist"],
+            resources: [.process("Resources")],
+            publicHeadersPath: "Source",
+            cSettings: [.headerSearchPath("Internal/**")]
+        ),
+        .target(
+            name: "ParseUI",
+            dependencies: [
                 "ParseFacebookUtilsiOS",
                 "ParseTwitterUtils"
-               ],
-                path: "ParseUI/ParseUI",
-                exclude: ["Resources/Info-iOS.plist"],
-                resources: [.process("Resources")],
-                publicHeadersPath: "Source",
-                cSettings: [.headerSearchPath("Internal/**")]),
-        .target(name: "ParseLiveQuery",
-               dependencies: [
+            ],
+            path: "ParseUI/ParseUI",
+            exclude: ["Resources/Info-iOS.plist"],
+            resources: [.process("Resources")],
+            publicHeadersPath: "Source",
+            cSettings: [.headerSearchPath("Internal/**")]
+        ),
+        .target(
+            name: "ParseLiveQuery",
+            dependencies: [
                 .product(name: "BoltsSwift", package: "Bolts-Swift"),
                 "Starscream",
                 "ParseCore"
-               ],
-                path: "ParseLiveQuery/ParseLiveQuery",
-                exclude: ["Resources/Info.plist"],
-                resources: [.process("Resources")])
+            ],
+            path: "ParseLiveQuery/ParseLiveQuery",
+            exclude: ["Resources/Info.plist"],
+            resources: [.process("Resources")]
+        )
     ]
 )

Package.resolved

@@ -13,7 +13,7 @@
 PRODUCT_NAME = Parse
 PRODUCT_BUNDLE_IDENTIFIER = com.parse.ios
 
-IPHONEOS_DEPLOYMENT_TARGET = 9.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
 
 INFOPLIST_FILE = $(PROJECT_DIR)/Parse/Resources/Parse-iOS.Info.plist
 

Package.swift

@@ -16,7 +16,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.parse.unit.ios
 
 SWIFT_VERSION = 5.0
 
-IPHONEOS_DEPLOYMENT_TARGET = 9.0
+IPHONEOS_DEPLOYMENT_TARGET = 12.0
 
 INFOPLIST_FILE = $(SRCROOT)/Tests/Resources/ParseUnitTests-iOS-Info.plist