From 2ff0fee18d9840bf54d2fd47de1956ab7c7272ed Mon Sep 17 00:00:00 2001 From: Sandeep Date: Thu, 5 Oct 2023 18:24:04 +0530 Subject: [PATCH 1/3] feat(snapshot): Add support for new Apple devices - Introduce iPhone 14 & 15 series - Add Apple Watch Series 5, 6, 7, 9, and Ultra 2 - Incorporate iPad Pro 4th & 6th gen - Include Apple TV 4K 3rd gen --- snapshot/lib/snapshot/reports_generator.rb | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/snapshot/lib/snapshot/reports_generator.rb b/snapshot/lib/snapshot/reports_generator.rb index d65acad9ba3..e9e6f199543 100644 --- a/snapshot/lib/snapshot/reports_generator.rb +++ b/snapshot/lib/snapshot/reports_generator.rb @@ -84,6 +84,15 @@ def xcode_9_and_above_device_name_mappings { # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME # which includes spaces + 'iPhone 15 Pro Max' => "iPhone 15 Pro Max", + 'iPhone 15 Pro' => "iPhone 15 Pro", + 'iPhone 15 Plus' => "iPhone 15 Plus", + 'iPhone 15' => "iPhone 15", + 'iPhone 14 Pro Max' => "iPhone 14 Pro Max", + 'iPhone 14 Pro' => "iPhone 14 Pro", + 'iPhone 14 Plus' => "iPhone 14 Plus", + 'iPhone 14' => "iPhone 14", + 'iPhone SE (3rd generation)' => "iPhone SE (3rd generation)", 'iPhone 13 Pro Max' => "iPhone 13 Pro Max", 'iPhone 13 Pro' => "iPhone 13 Pro", 'iPhone 13 mini' => "iPhone 13 mini", @@ -112,9 +121,11 @@ def xcode_9_and_above_device_name_mappings 'iPhone SE' => "iPhone SE", 'iPhone 4s' => "iPhone 4s (3.5-Inch)", 'iPad 2' => 'iPad 2', + 'iPad Air (5th generation)' => 'iPad Air (5th generation)', 'iPad Air (3rd generation)' => 'iPad Air (3rd generation)', 'iPad Air 2' => 'iPad Air 2', 'iPad Air' => 'iPad Air', + 'iPad (10th generation)' => 'iPad (10th generation)', 'iPad (5th generation)' => 'iPad (5th generation)', 'iPad (7th generation)' => 'iPad (7th generation)', 'iPad mini 2' => 'iPad mini 2', @@ -124,8 +135,10 @@ def xcode_9_and_above_device_name_mappings 'iPad Pro (9.7-inch)' => 'iPad Pro (9.7-inch)', 'iPad Pro (9.7 inch)' => 'iPad Pro (9.7-inch)', # iOS 10.3.1 simulator 'iPad Pro (10.5-inch)' => 'iPad Pro (10.5-inch)', + 'iPad Pro (11-inch) (4th generation)' => 'iPad Pro (11-inch) (4th generation)', 'iPad Pro (11-inch) (2nd generation)' => 'iPad Pro (11-inch) (2nd generation)', 'iPad Pro (11-inch)' => 'iPad Pro (11-inch)', + 'iPad Pro (12.9-inch) (6th generation)' => 'iPad Pro (12.9-inch) (6th generation)', 'iPad Pro (12.9-inch) (4th generation)' => 'iPad Pro (12.9-inch) (4th generation)', 'iPad Pro (12.9-inch) (3rd generation)' => 'iPad Pro (12.9-inch) (3rd generation)', 'iPad Pro (12.9-inch) (2nd generation)' => 'iPad Pro (12.9-inch) (2nd generation)', @@ -134,12 +147,27 @@ def xcode_9_and_above_device_name_mappings 'iPad Pro' => 'iPad Pro (12.9-inch)', # iOS 9.3 simulator 'iPod touch (7th generation)' => 'iPod touch (7th generation)', 'Apple TV 1080p' => 'Apple TV', + 'Apple TV 4K (3rd generation)' => 'Apple TV 4K (3rd generation)', + 'Apple TV 4K (3rd generation) (at 1080p)' => 'Apple TV 4K (3rd generation) (at 1080p)', 'Apple TV 4K (at 1080p)' => 'Apple TV 4K (at 1080p)', 'Apple TV 4K' => 'Apple TV 4K', 'Apple TV' => 'Apple TV', 'Mac' => 'Mac', 'Apple Watch Series 5 - 44mm' => 'Apple Watch Series 5 - 44mm', - 'Apple Watch Series 6 - 44mm' => 'Apple Watch Series 6 - 44mm' + 'Apple Watch Series 6 - 44mm' => 'Apple Watch Series 6 - 44mm', + 'Apple Watch Series 5 (40mm)' => 'Apple Watch Series 5 (40mm)', + 'Apple Watch Series 5 (44mm)' => 'Apple Watch Series 5 (44mm)', + 'Apple Watch Series 6 (40mm)' => 'Apple Watch Series 6 (40mm)', + 'Apple Watch Series 6 (44mm)' => 'Apple Watch Series 6 (44mm)', + 'Apple Watch Series 7 (41mm)' => 'Apple Watch Series 7 (41mm)', + 'Apple Watch Series 7 (45mm)' => 'Apple Watch Series 7 (45mm)', + 'Apple Watch Series 8 (41mm)' => 'Apple Watch Series 8 (41mm)', + 'Apple Watch Series 8 (45mm)' => 'Apple Watch Series 8 (45mm)', + 'Apple Watch Series 9 (41mm)' => 'Apple Watch Series 9 (41mm)', + 'Apple Watch Series 9 (45mm)' => 'Apple Watch Series 9 (45mm)', + 'Apple Watch SE (40mm)' => 'Apple Watch SE (40mm)', + 'Apple Watch SE (44mm)' => 'Apple Watch SE (44mm)', + 'Apple Watch Ultra 2 (49mm)' => 'Apple Watch Ultra 2 (49mm)' } end From e11dd08b8919a4881b51a33e8cc7f1730086ff61 Mon Sep 17 00:00:00 2001 From: Sandeep <24805252+isandeepj@users.noreply.github.com> Date: Thu, 5 Oct 2023 19:25:20 +0530 Subject: [PATCH 2/3] feat(snapshot): Add iPhone 14 Pro support and update tests --- snapshot/example/fastlane/Snapfile | 1 + 1 file changed, 1 insertion(+) diff --git a/snapshot/example/fastlane/Snapfile b/snapshot/example/fastlane/Snapfile index 67b5bcdec43..8f8fbd532bc 100644 --- a/snapshot/example/fastlane/Snapfile +++ b/snapshot/example/fastlane/Snapfile @@ -3,6 +3,7 @@ # A list of devices you want to take the screenshots from devices( [ + "iPhone 14 Pro", "iPhone 8", "iPad Air (4th generation)" ] From cf26b78cd12792ea2f463fd47407c90f22f2d72c Mon Sep 17 00:00:00 2001 From: Sandeep <24805252+isandeepj@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:14:17 +0530 Subject: [PATCH 3/3] Revert "feat(snapshot): Add iPhone 14 Pro support and update tests" This reverts commit e11dd08b8919a4881b51a33e8cc7f1730086ff61. --- snapshot/example/fastlane/Snapfile | 1 - 1 file changed, 1 deletion(-) diff --git a/snapshot/example/fastlane/Snapfile b/snapshot/example/fastlane/Snapfile index 8f8fbd532bc..67b5bcdec43 100644 --- a/snapshot/example/fastlane/Snapfile +++ b/snapshot/example/fastlane/Snapfile @@ -3,7 +3,6 @@ # A list of devices you want to take the screenshots from devices( [ - "iPhone 14 Pro", "iPhone 8", "iPad Air (4th generation)" ]