Remove WPImageSource and OHHTTPStubs dependency

wordpress-mobile · Jun 26, 2024 · 617b7a0 · 617b7a0
1 parent 3c1ffd3
commit 617b7a0
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 421 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,5 @@
 {
-  "originHash" : "1fb94a628bae24b086e603675b30f843abd900d8930755ee0dd72a4ade351ba5",
+  "originHash" : "1f7986484b7e8b057dd70f8be4c133ec09b8168d92949426b9d7e9ffb9521815",
   "pins" : [
     {
       "identity" : "collectionconcurrencykit",
@@ -19,15 +19,6 @@
         "version" : "1.8.1"
       }
     },
-    {
-      "identity" : "ohhttpstubs",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/AliSoftware/OHHTTPStubs",
-      "state" : {
-        "revision" : "12f19662426d0434d6c330c6974d53e2eb10ecd9",
-        "version" : "9.1.0"
-      }
-    },
     {
       "identity" : "sourcekitten",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -11,7 +11,6 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/buildkite/test-collector-swift", from: "0.3.0"),
-        .package(url: "https://github.com/AliSoftware/OHHTTPStubs", from: "9.1.0"),
         // See https://github.com/erikdoe/ocmock/issues/500#issuecomment-1002700625
         .package(url: "https://github.com/realm/SwiftLint", exact: loadSwiftLintVersion())
     ],
@@ -34,8 +33,7 @@ let package = Package(
             name: "WordPressSharedTests",
             dependencies: [
                 .target(name: "WordPressShared"),
-                .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
-                "OHHTTPStubs",
+                .product(name: "BuildkiteTestCollector", package: "test-collector-swift")
             ],
             plugins: [
                 .plugin(name: "SwiftLintPlugin", package: "SwiftLint")
@@ -45,8 +43,7 @@ let package = Package(
             name: "WordPressSharedObjCTests",
             dependencies: [
                 .target(name: "WordPressShared"),
-                .product(name: "BuildkiteTestCollector", package: "test-collector-swift"),
-                "OHHTTPStubs",
+                .product(name: "BuildkiteTestCollector", package: "test-collector-swift")
             ],
             resources: [.process("Resources")],
             plugins: [

diff --git a/Sources/WordPressSharedObjC/Utility/WPImageSource.m b/Sources/WordPressSharedObjC/Utility/WPImageSource.m
diff --git a/Sources/WordPressSharedObjC/WordPressShared.h b/Sources/WordPressSharedObjC/WordPressShared.h
@@ -12,7 +12,6 @@ FOUNDATION_EXPORT const unsigned char WordPressSharedVersionString[];
 #import <WordPressShared/NSString+Helpers.h>
 #import <WordPressShared/NSString+XMLExtensions.h>
 #import <WordPressShared/WPAnalytics.h>
-#import <WordPressShared/WPImageSource.h>
 #import <WordPressShared/WPDeviceIdentification.h>
 #import <WordPressShared/WPFontManager.h>
 #import <WordPressShared/WPSharedLogging.h>

diff --git a/Sources/WordPressSharedObjC/include/WPImageSource.h b/Sources/WordPressSharedObjC/include/WPImageSource.h