From 3c1ffd3d95f587d0f0ea489aaea617b93522d6d3 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 26 Jun 2024 16:40:54 -0400 Subject: [PATCH 1/2] Remove Quick and OCMock dependencies --- Package.resolved | 223 ++++++++++++++++++---------------------- Package.swift | 6 -- WordPressShared.podspec | 2 - 3 files changed, 102 insertions(+), 129 deletions(-) diff --git a/Package.resolved b/Package.resolved index c2a2cec..f1a340e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,124 +1,105 @@ { - "object": { - "pins": [ - { - "package": "CollectionConcurrencyKit", - "repositoryURL": "https://github.com/JohnSundell/CollectionConcurrencyKit.git", - "state": { - "branch": null, - "revision": "b4f23e24b5a1bff301efc5e70871083ca029ff95", - "version": "0.2.0" - } - }, - { - "package": "CryptoSwift", - "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git", - "state": { - "branch": null, - "revision": "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c", - "version": "1.8.1" - } - }, - { - "package": "OCMock", - "repositoryURL": "https://github.com/erikdoe/ocmock", - "state": { - "branch": null, - "revision": "afd2c6924e8a36cb872bc475248b978f743c6050", - "version": null - } - }, - { - "package": "OHHTTPStubs", - "repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs", - "state": { - "branch": null, - "revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9", - "version": "9.1.0" - } - }, - { - "package": "Quick", - "repositoryURL": "https://github.com/Quick/Quick", - "state": { - "branch": null, - "revision": "863d53a2cae240accf016bdc45739d1108e13ea1", - "version": "6.0.0" - } - }, - { - "package": "SourceKitten", - "repositoryURL": "https://github.com/jpsim/SourceKitten.git", - "state": { - "branch": null, - "revision": "b6dc09ee51dfb0c66e042d2328c017483a1a5d56", - "version": "0.34.1" - } - }, - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser.git", - "state": { - "branch": null, - "revision": "8f4d2753f0e4778c76d5f05ad16c74f707390531", - "version": "1.2.3" - } - }, - { - "package": "swift-syntax", - "repositoryURL": "https://github.com/apple/swift-syntax.git", - "state": { - "branch": null, - "revision": "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version": "509.0.2" - } - }, - { - "package": "SwiftLint", - "repositoryURL": "https://github.com/realm/SwiftLint", - "state": { - "branch": null, - "revision": "f17a4f9dfb6a6afb0408426354e4180daaf49cee", - "version": "0.54.0" - } - }, - { - "package": "SwiftyTextTable", - "repositoryURL": "https://github.com/scottrhoyt/SwiftyTextTable.git", - "state": { - "branch": null, - "revision": "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3", - "version": "0.9.0" - } - }, - { - "package": "SWXMLHash", - "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git", - "state": { - "branch": null, - "revision": "a853604c9e9a83ad9954c7e3d2a565273982471f", - "version": "7.0.2" - } - }, - { - "package": "BuildkiteTestCollector", - "repositoryURL": "https://github.com/buildkite/test-collector-swift", - "state": { - "branch": null, - "revision": "77c7f492f5c1c9ca159f73d18f56bbd1186390b0", - "version": "0.3.0" - } - }, - { - "package": "Yams", - "repositoryURL": "https://github.com/jpsim/Yams.git", - "state": { - "branch": null, - "revision": "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3", - "version": "5.0.6" - } + "originHash" : "1fb94a628bae24b086e603675b30f843abd900d8930755ee0dd72a4ade351ba5", + "pins" : [ + { + "identity" : "collectionconcurrencykit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/JohnSundell/CollectionConcurrencyKit.git", + "state" : { + "revision" : "b4f23e24b5a1bff301efc5e70871083ca029ff95", + "version" : "0.2.0" } - ] - }, - "version": 1 + }, + { + "identity" : "cryptoswift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/krzyzanowskim/CryptoSwift.git", + "state" : { + "revision" : "7892a123f7e8d0fe62f9f03728b17bbd4f94df5c", + "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", + "location" : "https://github.com/jpsim/SourceKitten.git", + "state" : { + "revision" : "b6dc09ee51dfb0c66e042d2328c017483a1a5d56", + "version" : "0.34.1" + } + }, + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser.git", + "state" : { + "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531", + "version" : "1.2.3" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-syntax.git", + "state" : { + "revision" : "6ad4ea24b01559dde0773e3d091f1b9e36175036", + "version" : "509.0.2" + } + }, + { + "identity" : "swiftlint", + "kind" : "remoteSourceControl", + "location" : "https://github.com/realm/SwiftLint", + "state" : { + "revision" : "f17a4f9dfb6a6afb0408426354e4180daaf49cee", + "version" : "0.54.0" + } + }, + { + "identity" : "swiftytexttable", + "kind" : "remoteSourceControl", + "location" : "https://github.com/scottrhoyt/SwiftyTextTable.git", + "state" : { + "revision" : "c6df6cf533d120716bff38f8ff9885e1ce2a4ac3", + "version" : "0.9.0" + } + }, + { + "identity" : "swxmlhash", + "kind" : "remoteSourceControl", + "location" : "https://github.com/drmohundro/SWXMLHash.git", + "state" : { + "revision" : "a853604c9e9a83ad9954c7e3d2a565273982471f", + "version" : "7.0.2" + } + }, + { + "identity" : "test-collector-swift", + "kind" : "remoteSourceControl", + "location" : "https://github.com/buildkite/test-collector-swift", + "state" : { + "revision" : "77c7f492f5c1c9ca159f73d18f56bbd1186390b0", + "version" : "0.3.0" + } + }, + { + "identity" : "yams", + "kind" : "remoteSourceControl", + "location" : "https://github.com/jpsim/Yams.git", + "state" : { + "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3", + "version" : "5.0.6" + } + } + ], + "version" : 3 } diff --git a/Package.swift b/Package.swift index 10231c9..de67fef 100644 --- a/Package.swift +++ b/Package.swift @@ -13,8 +13,6 @@ let package = Package( .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/erikdoe/ocmock", revision: "afd2c6924e8a36cb872bc475248b978f743c6050"), - .package(url: "https://github.com/Quick/Quick", from: "6.0.0"), .package(url: "https://github.com/realm/SwiftLint", exact: loadSwiftLintVersion()) ], targets: [ @@ -36,9 +34,7 @@ let package = Package( name: "WordPressSharedTests", dependencies: [ .target(name: "WordPressShared"), - .product(name: "OCMock", package: "ocmock"), .product(name: "BuildkiteTestCollector", package: "test-collector-swift"), - "Quick", "OHHTTPStubs", ], plugins: [ @@ -49,9 +45,7 @@ let package = Package( name: "WordPressSharedObjCTests", dependencies: [ .target(name: "WordPressShared"), - .product(name: "OCMock", package: "ocmock"), .product(name: "BuildkiteTestCollector", package: "test-collector-swift"), - "Quick", "OHHTTPStubs", ], resources: [.process("Resources")], diff --git a/WordPressShared.podspec b/WordPressShared.podspec index e299d38..dd1fdf0 100644 --- a/WordPressShared.podspec +++ b/WordPressShared.podspec @@ -40,8 +40,6 @@ Pod::Spec.new do |s| test.dependency 'OHHTTPStubs', '~> 9.0' test.dependency 'OHHTTPStubs/Swift', '~> 9.0' - test.dependency 'OCMock', '~> 3.4' - test.dependency 'Quick', '~> 6.0' end end From ff208c9ac59bff51df832e9751885287d3bf8a35 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 26 Jun 2024 16:52:27 -0400 Subject: [PATCH 2/2] Remove comment --- Package.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Package.swift b/Package.swift index de67fef..7c605fe 100644 --- a/Package.swift +++ b/Package.swift @@ -12,7 +12,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()) ], targets: [