Merge pull request #6933 from woocommerce/fix/screenshot-generation

Screenshots: Fix errors generating promo screenshots with Fastlane

Author: rachelmcr

Gemfile.lock

@@ -1,3 +1,23 @@
+GIT
+  remote: [email protected]:wordpress-mobile/release-toolkit
+  revision: 48bf4f8ee18079154b2054b3014bed9f114416d6
+  branch: trunk
+  specs:
+    fastlane-plugin-wpmreleasetoolkit (4.1.0)
+      activesupport (~> 5)
+      bigdecimal (~> 1.4)
+      buildkit (~> 1.5)
+      chroma (= 0.2.0)
+      diffy (~> 3.3)
+      git (~> 1.3)
+      jsonlint (~> 0.3)
+      nokogiri (~> 1.11)
+      octokit (~> 4.18)
+      parallel (~> 1.14)
+      progress_bar (~> 1.3)
+      rake (>= 12.3, < 14.0)
+      rake-compiler (~> 1.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -165,20 +185,6 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.11.1)
-    fastlane-plugin-wpmreleasetoolkit (4.1.0)
-      activesupport (~> 5)
-      bigdecimal (~> 1.4)
-      buildkit (~> 1.5)
-      chroma (= 0.2.0)
-      diffy (~> 3.3)
-      git (~> 1.3)
-      jsonlint (~> 0.3)
-      nokogiri (~> 1.11)
-      octokit (~> 4.18)
-      parallel (~> 1.14)
-      progress_bar (~> 1.3)
-      rake (>= 12.3, < 14.0)
-      rake-compiler (~> 1.0)
     ffi (1.15.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
@@ -247,15 +253,15 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.13.4)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.22.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.11)
+    oj (3.13.13)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -281,7 +287,7 @@ GEM
       uber (< 0.2.0)
     retriable (3.1.2)
     rexml (3.2.5)
-    rmagick (3.2.0)
+    rmagick (4.2.5)
     rouge (2.0.7)
     rubocop (1.25.1)
       parallel (~> 1.10)
@@ -359,9 +365,9 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 1.6)
   fastlane-plugin-sentry (~> 1.0)
-  fastlane-plugin-wpmreleasetoolkit (~> 4.1)
+  fastlane-plugin-wpmreleasetoolkit!
   rake (~> 12.3)
-  rmagick (~> 3.2.0)
+  rmagick (~> 4.1)
   rubocop (~> 1.25)
   rubocop-rake (~> 0.6)
   xcode-install

fastlane/Fastfile

@@ -841,7 +841,7 @@ platform :ios do
 
   desc 'Create Promo Screenshots'
   lane :create_promo_screenshots do |options|
-    unless Fastlane::Helper::GitHelper.has_git_lfs
+    unless Fastlane::Helper::GitHelper.has_git_lfs?
       UI.user_error!('LFS not enabled – unable to generate promo screenshots. Run `git lfs install && git lfs fetch && git lfs pull` to fix this.')
     end
 

fastlane/Pluginfile

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-# Autogenerated by fastlane
-#
 # Ensure this file is checked in to source control!
 
 group :screenshots, optional: true do
-  gem 'rmagick', '~> 3.2.0'
+  gem 'rmagick', '~> 4.1'
 end
 
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 4.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', git: '[email protected]:wordpress-mobile/release-toolkit', branch: 'trunk' # Version 4.1 + fixes for promo screenshots helper (pending the next toolkit release)
 gem 'fastlane-plugin-sentry', '~> 1.0'
 gem 'fastlane-plugin-appcenter', '~> 1.6'

fastlane/metadata/it/app_store_screenshot_1.txt

@@ -1,2 +1,2 @@
 Tieni traccia delle vendite e dei
-prodotti ad alte prestazioni
+prodotti che performano meglio

fastlane/metadata/it/app_store_screenshot_3.txt

@@ -1,2 +1,2 @@
-Rivedi i dettaglio dell'ordine
+Rivedi i dettagli dell'ordine
 e i pagamenti

fastlane/metadata/it/app_store_screenshot_4.txt

@@ -1,2 +1,2 @@
-Visualizza prodotti e
+Visualizza i prodotti e
 controlla l'inventario

fastlane/screenshots.json

@@ -86,15 +86,15 @@
 			"device": "iPhone 11 Pro Max",
 			"filename": "iPhone 11 Pro Max-04.png",
 			"background": "#C9356E",
-			"screenshot": "iPhone 11 Pro Max-7-light-product-list.png",
+			"screenshot": "iPhone 11 Pro Max-5-light-product-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_4.txt"
 		},
 		// Get notified about new reviews
 		{
 			"device": "iPhone 11 Pro Max",
 			"filename": "iPhone 11 Pro Max-05.png",
 			"background": "#674399",
-			"screenshot": "iPhone 11 Pro Max-5-dark-review-list.png",
+			"screenshot": "iPhone 11 Pro Max-7-dark-review-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_5.txt"
 		},
 
@@ -128,15 +128,15 @@
 			"device": "iPhone 8 Plus",
 			"filename": "iPhone 8 Plus-04.png",
 			"background": "#C9356E",
-			"screenshot": "iPhone 8 Plus-7-light-product-list.png",
+			"screenshot": "iPhone 8 Plus-5-light-product-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_4.txt"
 		},
 		// Get notified about new reviews
 		{
 			"device": "iPhone 8 Plus",
 			"filename": "iPhone 8 Plus-05.png",
 			"background": "#674399",
-			"screenshot": "iPhone 8 Plus-5-dark-review-list.png",
+			"screenshot": "iPhone 8 Plus-7-dark-review-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_5.txt"
 		},
 
@@ -171,15 +171,15 @@
 			"device": "iPad Pro 12.9 (2nd Generation)",
 			"filename": "iPad Pro (12.9-inch) (2nd generation)-04.png",
 			"background": "#C9356E",
-			"screenshot": "iPad Pro (12.9-inch) (2nd generation)-7-light-product-list.png",
+			"screenshot": "iPad Pro (12.9-inch) (2nd generation)-5-light-product-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_4.txt"
 		},
 		// Get notified about new reviews
 		{
 			"device": "iPad Pro 12.9 (2nd Generation)",
 			"filename": "iPad Pro (12.9-inch) (2nd generation)-05.png",
 			"background": "#674399",
-			"screenshot": "iPad Pro (12.9-inch) (2nd generation)-5-dark-review-list.png",
+			"screenshot": "iPad Pro (12.9-inch) (2nd generation)-7-dark-review-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_5.txt"
 		},
 
@@ -213,15 +213,15 @@
 			"device": "iPad Pro 12.9 (3rd Generation)",
 			"filename": "iPad Pro (12.9-inch) (3rd generation)-04.png",
 			"background": "#C9356E",
-			"screenshot": "iPad Pro (12.9-inch) (3rd generation)-7-light-product-list.png",
+			"screenshot": "iPad Pro (12.9-inch) (3rd generation)-5-light-product-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_4.txt"
 		},
 		// Get notified about new reviews
 		{
 			"device": "iPad Pro 12.9 (3rd Generation)",
 			"filename": "iPad Pro (12.9-inch) (3rd generation)-05.png",
 			"background": "#674399",
-			"screenshot": "iPad Pro (12.9-inch) (3rd generation)-5-dark-review-list.png",
+			"screenshot": "iPad Pro (12.9-inch) (3rd generation)-7-dark-review-list.png",
 			"text": "metadata/{locale}/app_store_screenshot_5.txt"
 		}
 	]