Skip to content

Commit fca2df4

Browse files
authored
Move testing libs from Cocoapods To SPM (#13792)
2 parents e3950f9 + 358bd1d commit fca2df4

File tree

4 files changed

+53
-29
lines changed

4 files changed

+53
-29
lines changed

Podfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,6 @@ target 'WooCommerce' do
123123
#
124124
target 'WooCommerceTests' do
125125
inherit! :search_paths
126-
pod 'ViewControllerPresentationSpy', '~> 7.0'
127-
pod 'ViewInspector'
128126
end
129127
end
130128

Podfile.lock

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ PODS:
2121
- SVProgressHUD (2.2.5)
2222
- SwiftLint (0.54.0)
2323
- UIDeviceIdentifier (2.3.0)
24-
- ViewControllerPresentationSpy (7.0.0)
25-
- ViewInspector (0.9.11)
2624
- WordPress-Aztec-iOS (1.19.10)
2725
- WordPress-Editor-iOS (1.19.10):
2826
- WordPress-Aztec-iOS (= 1.19.10)
@@ -68,8 +66,6 @@ DEPENDENCIES:
6866
- Sourcery (~> 1.0.3)
6967
- StripeTerminal (~> 3.3.1)
7068
- SwiftLint (= 0.54.0)
71-
- ViewControllerPresentationSpy (~> 7.0)
72-
- ViewInspector
7369
- WordPress-Editor-iOS (~> 1.19)
7470
- WordPressAuthenticator (~> 9.0.9)
7571
- WordPressShared (~> 2.1)
@@ -98,8 +94,6 @@ SPEC REPOS:
9894
- SVProgressHUD
9995
- SwiftLint
10096
- UIDeviceIdentifier
101-
- ViewControllerPresentationSpy
102-
- ViewInspector
10397
- WordPress-Aztec-iOS
10498
- WordPress-Editor-iOS
10599
- WordPressShared
@@ -131,8 +125,6 @@ SPEC CHECKSUMS:
131125
SVProgressHUD: 1428aafac632c1f86f62aa4243ec12008d7a51d6
132126
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
133127
UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
134-
ViewControllerPresentationSpy: 05d5cd89a485a2be13008fb56d3de8c8aa821d31
135-
ViewInspector: f251d90316dce2b58ebe5d7d88bc07643c055c78
136128
WordPress-Aztec-iOS: 8eaa928fb3a5694924ed3befac64beaae5656e12
137129
WordPress-Editor-iOS: 98ce1fc542c3a09e48ddc9423405b1d1e48240f1
138130
WordPressAuthenticator: e0c88dd994799595a4a4fafb801589f650af822c
@@ -150,6 +142,6 @@ SPEC CHECKSUMS:
150142
ZendeskSupportProvidersSDK: 2fbd2a9597af5d69760088bfb5e0e595e942f218
151143
ZendeskSupportSDK: 22156384d20d30b0aeb263c03f49bef44e1364b2
152144

153-
PODFILE CHECKSUM: 98a22140d1c85a7f58c5287d4d1502f362674eab
145+
PODFILE CHECKSUM: 60414588e43bf7bc146dc0c04130e78fdb3f2ece
154146

155147
COCOAPODS: 1.15.2

WooCommerce.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -898,6 +898,8 @@
898898
261E91A329C9882600A5C118 /* SubscriptionsViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 261E91A229C9882600A5C118 /* SubscriptionsViewModelTests.swift */; };
899899
261F1A7929C2AB2E001D9861 /* FreeTrialBannerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 261F1A7829C2AB2E001D9861 /* FreeTrialBannerViewModel.swift */; };
900900
261F1A7C29C2B09D001D9861 /* FreeTrialBannerViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 261F1A7B29C2B09D001D9861 /* FreeTrialBannerViewModelTests.swift */; };
901+
2621D1F42C81085D00654C4C /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = 2621D1F32C81085D00654C4C /* ViewInspector */; };
902+
2621D1F72C810DB800654C4C /* ViewControllerPresentationSpy in Frameworks */ = {isa = PBXBuildFile; productRef = 2621D1F62C810DB800654C4C /* ViewControllerPresentationSpy */; };
901903
262418332B8D3630009A3834 /* ApplicationPasswordTutorial.swift in Sources */ = {isa = PBXBuildFile; fileRef = 262418322B8D3630009A3834 /* ApplicationPasswordTutorial.swift */; };
902904
262418372B9044FF009A3834 /* ApplicationPasswordTutorialViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 262418362B9044FF009A3834 /* ApplicationPasswordTutorialViewModel.swift */; };
903905
262562352C52A6410075A8CC /* WooAnalyticsEvent+BackgroudUpdates.swift in Sources */ = {isa = PBXBuildFile; fileRef = 262562342C52A6410075A8CC /* WooAnalyticsEvent+BackgroudUpdates.swift */; };
@@ -6030,9 +6032,11 @@
60306032
files = (
60316033
263E38462641FF3400260D3B /* Codegen in Frameworks */,
60326034
3F2C8A19285B038800B1A5BB /* BuildkiteTestCollector in Frameworks */,
6035+
2621D1F72C810DB800654C4C /* ViewControllerPresentationSpy in Frameworks */,
60336036
26FB056825F6CB6000A40B26 /* Fakes.framework in Frameworks */,
60346037
B873E8F8E103966D2182EE67 /* Pods_WooCommerceTests.framework in Frameworks */,
60356038
57150E0F24F462C200E81611 /* TestKit in Frameworks */,
6039+
2621D1F42C81085D00654C4C /* ViewInspector in Frameworks */,
60366040
);
60376041
runOnlyForDeploymentPostprocessing = 0;
60386042
};
@@ -13599,7 +13603,6 @@
1359913603
buildConfigurationList = B56DB3E92049BFAA00D4AA8E /* Build configuration list for PBXNativeTarget "WooCommerceTests" */;
1360013604
buildPhases = (
1360113605
E8FC62641D61F33F705BC760 /* [CP] Check Pods Manifest.lock */,
13602-
4B108CBFE1E4CAAD77FEFC46 /* [CP] Embed Pods Frameworks */,
1360313606
B56DB3D92049BFAA00D4AA8E /* Sources */,
1360413607
B56DB3DA2049BFAA00D4AA8E /* Frameworks */,
1360513608
B56DB3DB2049BFAA00D4AA8E /* Resources */,
@@ -13615,6 +13618,8 @@
1361513618
57150E0E24F462C200E81611 /* TestKit */,
1361613619
263E38452641FF3400260D3B /* Codegen */,
1361713620
3F2C8A18285B038800B1A5BB /* BuildkiteTestCollector */,
13621+
2621D1F32C81085D00654C4C /* ViewInspector */,
13622+
2621D1F62C810DB800654C4C /* ViewControllerPresentationSpy */,
1361813623
);
1361913624
productName = WooCommerceTests;
1362013625
productReference = B56DB3DD2049BFAA00D4AA8E /* WooCommerceTests.xctest */;
@@ -13773,6 +13778,8 @@
1377313778
202496622B0B9E0D00EE527D /* XCRemoteSwiftPackageReference "ScrollViewSectionKit" */,
1377413779
DEA6BCA72BC6A7050017D671 /* XCRemoteSwiftPackageReference "Charts" */,
1377513780
DEA6BCAA2BC6A7C30017D671 /* XCRemoteSwiftPackageReference "swift-algorithms" */,
13781+
2621D1F22C81085D00654C4C /* XCRemoteSwiftPackageReference "ViewInspector" */,
13782+
2621D1F52C810DB800654C4C /* XCRemoteSwiftPackageReference "ViewControllerPresentationSpy" */,
1377613783
);
1377713784
productRefGroup = B56DB3C72049BFAA00D4AA8E /* Products */;
1377813785
projectDirPath = "";
@@ -14177,23 +14184,6 @@
1417714184
shellScript = "\"$SRCROOT/../Scripts/build-phases/LintAppLocalizedStringsUsage.sh\"\n";
1417814185
showEnvVarsInLog = 0;
1417914186
};
14180-
4B108CBFE1E4CAAD77FEFC46 /* [CP] Embed Pods Frameworks */ = {
14181-
isa = PBXShellScriptBuildPhase;
14182-
buildActionMask = 2147483647;
14183-
files = (
14184-
);
14185-
inputFileListPaths = (
14186-
"${PODS_ROOT}/Target Support Files/Pods-WooCommerceTests/Pods-WooCommerceTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
14187-
);
14188-
name = "[CP] Embed Pods Frameworks";
14189-
outputFileListPaths = (
14190-
"${PODS_ROOT}/Target Support Files/Pods-WooCommerceTests/Pods-WooCommerceTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
14191-
);
14192-
runOnlyForDeploymentPostprocessing = 0;
14193-
shellPath = /bin/sh;
14194-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WooCommerceTests/Pods-WooCommerceTests-frameworks.sh\"\n";
14195-
showEnvVarsInLog = 0;
14196-
};
1419714187
57CCFFD4249D2A5700825FCF /* SwiftLint */ = {
1419814188
isa = PBXShellScriptBuildPhase;
1419914189
buildActionMask = 2147483647;
@@ -18225,6 +18215,22 @@
1822518215
minimumVersion = 4.1.2;
1822618216
};
1822718217
};
18218+
2621D1F22C81085D00654C4C /* XCRemoteSwiftPackageReference "ViewInspector" */ = {
18219+
isa = XCRemoteSwiftPackageReference;
18220+
repositoryURL = "https://github.com/nalexn/ViewInspector";
18221+
requirement = {
18222+
kind = upToNextMajorVersion;
18223+
minimumVersion = 0.9.11;
18224+
};
18225+
};
18226+
2621D1F52C810DB800654C4C /* XCRemoteSwiftPackageReference "ViewControllerPresentationSpy" */ = {
18227+
isa = XCRemoteSwiftPackageReference;
18228+
repositoryURL = "https://github.com/jonreid/ViewControllerPresentationSpy";
18229+
requirement = {
18230+
kind = upToNextMajorVersion;
18231+
minimumVersion = 7.0.0;
18232+
};
18233+
};
1822818234
3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */ = {
1822918235
isa = XCRemoteSwiftPackageReference;
1823018236
repositoryURL = "https://github.com/Automattic/XCUITestHelpers";
@@ -18307,6 +18313,16 @@
1830718313
package = 247CE89A2583402A00F9D9D1 /* XCRemoteSwiftPackageReference "Embassy" */;
1830818314
productName = Embassy;
1830918315
};
18316+
2621D1F32C81085D00654C4C /* ViewInspector */ = {
18317+
isa = XCSwiftPackageProductDependency;
18318+
package = 2621D1F22C81085D00654C4C /* XCRemoteSwiftPackageReference "ViewInspector" */;
18319+
productName = ViewInspector;
18320+
};
18321+
2621D1F62C810DB800654C4C /* ViewControllerPresentationSpy */ = {
18322+
isa = XCSwiftPackageProductDependency;
18323+
package = 2621D1F52C810DB800654C4C /* XCRemoteSwiftPackageReference "ViewControllerPresentationSpy" */;
18324+
productName = ViewControllerPresentationSpy;
18325+
};
1831018326
263E37E02641AD8300260D3B /* Codegen */ = {
1831118327
isa = XCSwiftPackageProductDependency;
1831218328
productName = Codegen;

0 commit comments

Comments
 (0)