Skip to content

Commit 7323371

Browse files
jaclyncjaclync
committed
Merge branch 'feat/15076-ds-page-header-all' into feat/15144-cash-receipt-style-updates
2 parents b7bf39b + 3964af5 commit 7323371

File tree

2 files changed

+11
-45
lines changed

2 files changed

+11
-45
lines changed

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

Lines changed: 2 additions & 11 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: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,8 +1271,6 @@
12711271
3F0CF3122704490A00EF3D71 /* LoginCheckMagicLinkScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997171F23DBCD6100592D8E /* LoginCheckMagicLinkScreen.swift */; };
12721272
3F0CF3132704490A00EF3D71 /* PrologueScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8F3A972258862BE0085859B /* PrologueScreen.swift */; };
12731273
3F0CF3142704494A00EF3D71 /* TabNavComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997172F23DBCEB200592D8E /* TabNavComponent.swift */; };
1274-
3F1CA81D26C3542600228BF2 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F1CA81C26C3542600228BF2 /* XCUITestHelpers */; };
1275-
3F1CA81F26C3543C00228BF2 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */; };
12761274
3F1FA84228B60125009E246C /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3F1FA84128B60125009E246C /* WidgetKit.framework */; };
12771275
3F1FA84328B60125009E246C /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5744BEB0248FE44C000A6FE2 /* SwiftUI.framework */; };
12781276
3F1FA84628B60125009E246C /* StoreWidgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3F1FA84528B60125009E246C /* StoreWidgets.swift */; };
@@ -1289,12 +1287,12 @@
12891287
3F58701F281B947E004F7556 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F58701E281B947E004F7556 /* Main.storyboard */; };
12901288
3F587021281B9494004F7556 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3F587020281B9494004F7556 /* LaunchScreen.storyboard */; };
12911289
3F587026281B9C19004F7556 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3F587028281B9C19004F7556 /* InfoPlist.strings */; };
1290+
3FA323272D63E0570017AE66 /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FA323262D63E0570017AE66 /* XCUITestHelpers */; };
12921291
3FA96DF42C94043200CDA78F /* Yosemite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FA96DF32C94043200CDA78F /* Yosemite.framework */; };
12931292
3FF2247326706AA3008FFA87 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF2247226706AA3008FFA87 /* ScreenObject */; };
12941293
3FF2248A267073AE008FFA87 /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF22489267073AE008FFA87 /* ScreenObject */; };
12951294
3FF314E126FC74450012E68E /* UITestsFoundation.h in Headers */ = {isa = PBXBuildFile; fileRef = 3FF314E026FC74450012E68E /* UITestsFoundation.h */; settings = {ATTRIBUTES = (Public, ); }; };
12961295
3FF314E726FC74560012E68E /* ScreenObject in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF314E626FC74560012E68E /* ScreenObject */; };
1297-
3FF314E926FC74600012E68E /* XCUITestHelpers in Frameworks */ = {isa = PBXBuildFile; productRef = 3FF314E826FC74600012E68E /* XCUITestHelpers */; };
12981296
3FF314EA26FC751B0012E68E /* XCTest+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997173223DBCF2800592D8E /* XCTest+Extensions.swift */; };
12991297
3FF314F126FC785C0012E68E /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FF314EF26FC784A0012E68E /* XCTest.framework */; platformFilter = ios; };
13001298
3FF314F426FD4C4A0012E68E /* BaseScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = F997172B23DBCD8E00592D8E /* BaseScreen.swift */; };
@@ -6394,8 +6392,8 @@
63946392
buildActionMask = 2147483647;
63956393
files = (
63966394
3FF314E726FC74560012E68E /* ScreenObject in Frameworks */,
6395+
3FA323272D63E0570017AE66 /* XCUITestHelpers in Frameworks */,
63976396
3FF314F126FC785C0012E68E /* XCTest.framework in Frameworks */,
6398-
3FF314E926FC74600012E68E /* XCUITestHelpers in Frameworks */,
63996397
);
64006398
runOnlyForDeploymentPostprocessing = 0;
64016399
};
@@ -6446,7 +6444,6 @@
64466444
3FF314F526FD4F430012E68E /* UITestsFoundation.framework in Frameworks */,
64476445
3F2C8A1D285B03A400B1A5BB /* BuildkiteTestCollector in Frameworks */,
64486446
247CE89C2583402A00F9D9D1 /* Embassy in Frameworks */,
6449-
3F1CA81D26C3542600228BF2 /* XCUITestHelpers in Frameworks */,
64506447
3FF2247326706AA3008FFA87 /* ScreenObject in Frameworks */,
64516448
);
64526449
runOnlyForDeploymentPostprocessing = 0;
@@ -6458,7 +6455,6 @@
64586455
3FF314F626FD4F490012E68E /* UITestsFoundation.framework in Frameworks */,
64596456
3F2C8A1B285B039900B1A5BB /* BuildkiteTestCollector in Frameworks */,
64606457
24C5AC7625A53021008FD769 /* Embassy in Frameworks */,
6461-
3F1CA81F26C3543C00228BF2 /* XCUITestHelpers in Frameworks */,
64626458
3FF2248A267073AE008FFA87 /* ScreenObject in Frameworks */,
64636459
);
64646460
runOnlyForDeploymentPostprocessing = 0;
@@ -14342,7 +14338,7 @@
1434214338
name = UITestsFoundation;
1434314339
packageProductDependencies = (
1434414340
3FF314E626FC74560012E68E /* ScreenObject */,
14345-
3FF314E826FC74600012E68E /* XCUITestHelpers */,
14341+
3FA323262D63E0570017AE66 /* XCUITestHelpers */,
1434614342
);
1434714343
productName = UITestsFoundation;
1434814344
productReference = 3FF314DE26FC74450012E68E /* UITestsFoundation.framework */;
@@ -14431,7 +14427,6 @@
1443114427
name = WooCommerceUITests;
1443214428
packageProductDependencies = (
1443314429
3FF2247226706AA3008FFA87 /* ScreenObject */,
14434-
3F1CA81C26C3542600228BF2 /* XCUITestHelpers */,
1443514430
3F2C8A1C285B03A400B1A5BB /* BuildkiteTestCollector */,
1443614431
);
1443714432
productName = WooCommerceUITests;
@@ -14456,7 +14451,6 @@
1445614451
packageProductDependencies = (
1445714452
247CE89B2583402A00F9D9D1 /* Embassy */,
1445814453
3FF22489267073AE008FFA87 /* ScreenObject */,
14459-
3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */,
1446014454
3F2C8A1A285B039900B1A5BB /* BuildkiteTestCollector */,
1446114455
);
1446214456
productName = WooCommerceScreenshots;
@@ -14565,7 +14559,6 @@
1456514559
247CE89A2583402A00F9D9D1 /* XCRemoteSwiftPackageReference "Embassy" */,
1456614560
45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */,
1456714561
3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */,
14568-
3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
1456914562
174CA86827D90A6200126524 /* XCRemoteSwiftPackageReference "AutomatticAbout-swift" */,
1457014563
4598297F28574688003A9AFE /* XCRemoteSwiftPackageReference "Inject" */,
1457114564
3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */,
@@ -19469,14 +19462,6 @@
1946919462
minimumVersion = 7.0.0;
1947019463
};
1947119464
};
19472-
3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */ = {
19473-
isa = XCRemoteSwiftPackageReference;
19474-
repositoryURL = "https://github.com/Automattic/XCUITestHelpers";
19475-
requirement = {
19476-
kind = upToNextMajorVersion;
19477-
minimumVersion = 0.3.0;
19478-
};
19479-
};
1948019465
3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */ = {
1948119466
isa = XCRemoteSwiftPackageReference;
1948219467
repositoryURL = "https://github.com/buildkite/test-collector-swift";
@@ -19490,7 +19475,7 @@
1949019475
repositoryURL = "https://github.com/Automattic/ScreenObject";
1949119476
requirement = {
1949219477
kind = upToNextMajorVersion;
19493-
minimumVersion = 0.2.3;
19478+
minimumVersion = 0.3.0;
1949419479
};
1949519480
};
1949619481
45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */ = {
@@ -19573,16 +19558,6 @@
1957319558
isa = XCSwiftPackageProductDependency;
1957419559
productName = Codegen;
1957519560
};
19576-
3F1CA81C26C3542600228BF2 /* XCUITestHelpers */ = {
19577-
isa = XCSwiftPackageProductDependency;
19578-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19579-
productName = XCUITestHelpers;
19580-
};
19581-
3F1CA81E26C3543C00228BF2 /* XCUITestHelpers */ = {
19582-
isa = XCSwiftPackageProductDependency;
19583-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19584-
productName = XCUITestHelpers;
19585-
};
1958619561
3F2C8A18285B038800B1A5BB /* BuildkiteTestCollector */ = {
1958719562
isa = XCSwiftPackageProductDependency;
1958819563
package = 3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */;
@@ -19598,6 +19573,11 @@
1959819573
package = 3F2C8A17285B038800B1A5BB /* XCRemoteSwiftPackageReference "test-collector-swift" */;
1959919574
productName = BuildkiteTestCollector;
1960019575
};
19576+
3FA323262D63E0570017AE66 /* XCUITestHelpers */ = {
19577+
isa = XCSwiftPackageProductDependency;
19578+
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
19579+
productName = XCUITestHelpers;
19580+
};
1960119581
3FF2247226706AA3008FFA87 /* ScreenObject */ = {
1960219582
isa = XCSwiftPackageProductDependency;
1960319583
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
@@ -19613,11 +19593,6 @@
1961319593
package = 3FF2247126706AA3008FFA87 /* XCRemoteSwiftPackageReference "ScreenObject" */;
1961419594
productName = ScreenObject;
1961519595
};
19616-
3FF314E826FC74600012E68E /* XCUITestHelpers */ = {
19617-
isa = XCSwiftPackageProductDependency;
19618-
package = 3F1CA81B26C3542600228BF2 /* XCRemoteSwiftPackageReference "XCUITestHelpers" */;
19619-
productName = XCUITestHelpers;
19620-
};
1962119596
45455E312657C3F300BBB0C4 /* Shimmer */ = {
1962219597
isa = XCSwiftPackageProductDependency;
1962319598
package = 45455E302657C3F300BBB0C4 /* XCRemoteSwiftPackageReference "SwiftUI-Shimmer" */;

0 commit comments

Comments
 (0)