From d32a1e63b009233bdf24a761d1ac1aba7f6c7a2b Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 11:33:05 +0200 Subject: [PATCH 1/7] Add initial screen-grid integration --- Dangerfile | 10 +++ Gemfile | 1 + Gemfile.lock | 208 +++++++++++++++++++++++++--------------------- fastlane/Snapfile | 5 +- 4 files changed, 128 insertions(+), 96 deletions(-) diff --git a/Dangerfile b/Dangerfile index fac3909..6476e05 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,3 +1,13 @@ +puts "Running fastlane" + +require 'snapshot' +options = {} +Snapshot.config = FastlaneCore::Configuration.create(Snapshot::Options.available_options, options) +Snapshot::Runner.new.work + +puts 'running screen_grid' +screen_grid.run + puts "Running fastlane to generate and upload an ipa file..." options = { diff --git a/Gemfile b/Gemfile index 61aca38..fbf2f95 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ gem "fastlane" gem "cocoapods" gem "danger", git: "https://github.com/danger/danger" gem "danger-device_grid" +gem "danger-screen_grid", git: "https://github.com/fastlane/fastlane", branch: "screen-grid" gem "bundler" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index adbca05..081d5ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,116 @@ GIT remote: https://github.com/danger/danger - revision: 387a80b37c08e65371fa4d7549f0e0132bc991d0 + revision: aca22f9c8688b0927d357017acd8f8e8faaf4687 specs: - danger (0.8.5) + danger (0.10.0) claide (~> 1.0) claide-plugins (~> 0.9) colored (~> 1.2) cork (~> 0.1) faraday (~> 0) + faraday-http-cache (~> 1.0) git (~> 1) octokit (~> 4.2) redcarpet (~> 3.3) terminal-table (~> 1) +GIT + remote: https://github.com/fastlane/fastlane + revision: 1ad73bf2a06ccb64ad7661bcd9bf2b8feebd30e5 + branch: screen-grid + specs: + cert (1.4.1) + fastlane_core (>= 0.29.1, < 1.0.0) + spaceship (>= 0.22.0, < 1.0.0) + credentials_manager (0.16.0) + colored + commander (>= 4.3.5) + highline (>= 1.7.1) + security + danger-device_grid (0.1.1) + fastlane (>= 1.94.0, < 2.0.0) + danger-screen_grid (0.1.0) + aws-sdk (>= 2.0.0) + fastlane (>= 1.94.0, < 2.0.0) + deliver (1.13.1) + credentials_manager (>= 0.16.0, < 1.0.0) + fastimage (~> 1.6) + fastlane_core (>= 0.46.2, < 1.0.0) + plist (~> 3.1.0) + spaceship (>= 0.26.2, < 1.0.0) + fastlane_core (0.48.1) + babosa + colored + commander (= 4.3.5) + credentials_manager (>= 0.16.0, < 1.0.0) + excon (~> 0.45.0) + gh_inspector (>= 1.0.1, < 2.0.0) + highline (>= 1.7.2) + json + multi_json + plist (~> 3.1) + rubyzip (~> 1.1.6) + terminal-table (~> 1.4.5) + frameit (2.7.0) + deliver (> 0.3) + fastimage (~> 1.6.3) + fastlane_core (>= 0.36.1, < 1.0.0) + mini_magick (~> 4.5.1) + gym (1.7.0) + fastlane_core (>= 0.43.3, < 1.0.0) + plist + rubyzip (>= 1.1.7) + terminal-table + xcpretty (>= 0.2.1) + match (0.6.1) + cert (>= 1.2.8, < 2.0.0) + credentials_manager (>= 0.13.0, < 1.0.0) + fastlane_core (>= 0.39.0, < 1.0.0) + security + sigh (>= 1.2.2, < 2.0.0) + spaceship (>= 0.24.0, < 1.0.0) + pem (1.3.1) + fastlane_core (>= 0.43.1, < 1.0.0) + spaceship (>= 0.26.2, < 1.0.0) + pilot (1.9.2) + credentials_manager (>= 0.3.0) + fastlane_core (>= 0.46.2, < 1.0.0) + spaceship (>= 0.27.0, < 1.0.0) + terminal-table (~> 1.4.5) + produce (1.1.2) + fastlane_core (>= 0.30.0, < 1.0.0) + spaceship (>= 0.16.0, < 1.0.0) + scan (0.8.0) + fastlane_core (>= 0.43.3, < 1.0.0) + slack-notifier (~> 1.3) + terminal-table + xcpretty (>= 0.2.1) + xcpretty-travis-formatter (>= 0.0.3) + screengrab (0.3.2) + fastlane_core (>= 0.38.0, < 1.0.0) + sigh (1.8.0) + fastlane_core (>= 0.36.1, < 1.0.0) + plist (~> 3.1) + spaceship (>= 0.22.0, < 1.0.0) + snapshot (1.12.3) + fastimage (~> 1.6.3) + fastlane_core (>= 0.43.3, < 1.0.0) + plist (~> 3.1.0) + xcpretty (>= 0.2.1) + spaceship (0.28.0) + colored + credentials_manager (>= 0.9.0) + faraday (~> 0.9) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 0.9) + fastimage (~> 1.6) + multi_xml (~> 0.5) + plist (~> 3.1) + supply (0.7.0) + credentials_manager (>= 0.15.0) + fastlane_core (>= 0.43.4) + google-api-client (~> 0.9.1) + PATH remote: ./fastlane-plugin-emoji_fetcher specs: @@ -21,17 +119,20 @@ PATH GEM remote: https://rubygems.org/ specs: - activesupport (4.2.6) + activesupport (4.2.7) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) + aws-sdk (2.4.0) + aws-sdk-resources (= 2.4.0) + aws-sdk-core (2.4.0) + jmespath (~> 1.0) + aws-sdk-resources (2.4.0) + aws-sdk-core (= 2.4.0) babosa (1.0.2) - cert (1.4.1) - fastlane_core (>= 0.29.1, < 1.0.0) - spaceship (>= 0.22.0, < 1.0.0) claide (1.0.0) claide-plugins (0.9.0) cork (~> 0) @@ -73,19 +174,6 @@ GEM highline (~> 1.7.2) cork (0.1.0) colored (~> 1.2) - credentials_manager (0.16.0) - colored - commander (>= 4.3.5) - highline (>= 1.7.1) - security - danger-device_grid (0.1.1) - fastlane (>= 1.94.0, < 2.0.0) - deliver (1.13.1) - credentials_manager (>= 0.16.0, < 1.0.0) - fastimage (~> 1.6) - fastlane_core (>= 0.46.2, < 1.0.0) - plist (~> 3.1.0) - spaceship (>= 0.26.2, < 1.0.0) domain_name (0.5.20160615) unf (>= 0.0.5, < 1.0.0) dotenv (2.1.1) @@ -96,11 +184,13 @@ GEM faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) + faraday-http-cache (1.3.0) + faraday (~> 0.8) faraday_middleware (0.10.0) faraday (>= 0.7.4, < 0.10) fastimage (1.6.8) addressable (~> 2.3, >= 2.3.5) - fastlane (1.97.2) + fastlane (1.98.0) activesupport (< 5) addressable (~> 2.3) bundler (~> 1.12) @@ -109,7 +199,7 @@ GEM deliver (>= 1.13.1, < 2.0.0) fastlane_core (>= 0.48.1, < 1.0.0) frameit (>= 2.7.0, < 3.0.0) - gym (>= 1.6.3, < 2.0.0) + gym (>= 1.7.0, < 2.0.0) krausefx-shenzhen (>= 0.14.7) match (>= 0.6.0, < 1.0.0) multipart-post (~> 2.0.0) @@ -130,25 +220,7 @@ GEM xcode-install (~> 2.0.0) xcodeproj (>= 0.20, < 2.0.0) xcpretty (>= 0.2.1) - fastlane_core (0.48.1) - babosa - colored - commander (= 4.3.5) - credentials_manager (>= 0.16.0, < 1.0.0) - excon (~> 0.45.0) - gh_inspector (>= 1.0.1, < 2.0.0) - highline (>= 1.7.2) - json - multi_json - plist (~> 3.1) - rubyzip (~> 1.1.6) - terminal-table (~> 1.4.5) fourflusher (0.3.2) - frameit (2.7.0) - deliver (> 0.3) - fastimage (~> 1.6.3) - fastlane_core (>= 0.36.1, < 1.0.0) - mini_magick (~> 4.5.1) fuzzy_match (2.0.4) gh_inspector (1.0.2) git (1.3.0) @@ -170,18 +242,13 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - gym (1.6.3) - fastlane_core (>= 0.43.1, < 1.0.0) - plist - rubyzip (>= 1.1.7) - terminal-table - xcpretty (>= 0.2.1) highline (1.7.8) http-cookie (1.0.2) domain_name (~> 0.5) httpclient (2.8.0) hurley (0.2) i18n (0.7.0) + jmespath (1.3.1) json (1.8.3) jwt (1.5.4) krausefx-shenzhen (0.14.9) @@ -200,13 +267,6 @@ GEM logging (2.1.0) little-plugger (~> 1.1) multi_json (~> 1.10) - match (0.6.1) - cert (>= 1.2.8, < 2.0.0) - credentials_manager (>= 0.13.0, < 1.0.0) - fastlane_core (>= 0.39.0, < 1.0.0) - security - sigh (>= 1.2.2, < 2.0.0) - spaceship (>= 0.24.0, < 1.0.0) memoist (0.14.0) mime-types (3.1) mime-types-data (~> 3.2015) @@ -226,18 +286,7 @@ GEM sawyer (~> 0.7.0, >= 0.5.3) open4 (1.3.4) os (0.9.6) - pem (1.3.1) - fastlane_core (>= 0.43.1, < 1.0.0) - spaceship (>= 0.26.2, < 1.0.0) - pilot (1.9.2) - credentials_manager (>= 0.3.0) - fastlane_core (>= 0.46.2, < 1.0.0) - spaceship (>= 0.27.0, < 1.0.0) - terminal-table (~> 1.4.5) plist (3.1.0) - produce (1.1.2) - fastlane_core (>= 0.30.0, < 1.0.0) - spaceship (>= 0.16.0, < 1.0.0) redcarpet (3.3.4) representable (2.3.0) uber (~> 0.0.7) @@ -247,43 +296,13 @@ GEM sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - scan (0.8.0) - fastlane_core (>= 0.36.1, < 1.0.0) - slack-notifier (~> 1.3) - terminal-table - xcpretty (>= 0.2.1) - xcpretty-travis-formatter (>= 0.0.3) - screengrab (0.3.2) - fastlane_core (>= 0.38.0, < 1.0.0) security (0.1.3) - sigh (1.8.0) - fastlane_core (>= 0.36.1, < 1.0.0) - plist (~> 3.1) - spaceship (>= 0.22.0, < 1.0.0) signet (0.7.3) addressable (~> 2.3) faraday (~> 0.9) jwt (~> 1.5) multi_json (~> 1.10) slack-notifier (1.5.1) - snapshot (1.12.3) - fastimage (~> 1.6.3) - fastlane_core (>= 0.36.1, < 1.0.0) - plist (~> 3.1.0) - xcpretty (>= 0.2.1) - spaceship (0.28.0) - colored - credentials_manager (>= 0.9.0) - faraday (~> 0.9) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 0.9) - fastimage (~> 1.6) - multi_xml (~> 0.5) - plist (~> 3.1) - supply (0.7.0) - credentials_manager (>= 0.15.0) - fastlane_core (>= 0.43.4) - google-api-client (~> 0.9.1) terminal-notifier (1.6.3) terminal-table (1.4.5) thor (0.19.1) @@ -295,7 +314,7 @@ GEM unf_ext unf_ext (0.0.7.2) word_wrap (1.0.0) - xcode-install (2.0.1) + xcode-install (2.0.2) claide (>= 0.9.1, < 1.1.0) spaceship (>= 0.25.1, < 1.0.0) xcodeproj (1.2.0) @@ -315,6 +334,7 @@ DEPENDENCIES cocoapods danger! danger-device_grid + danger-screen_grid! fastlane fastlane-plugin-emoji_fetcher! diff --git a/fastlane/Snapfile b/fastlane/Snapfile index d3efe3e..abc14f9 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -1,5 +1,6 @@ languages([ - "en-US" + "en-US", + "de-DE" ]) -clear_previous_screenshots true # remove the '#' to clear all previously generated screenshots before creating new ones +clear_previous_screenshots false # remove the '#' to clear all previously generated screenshots before creating new ones From d7da3996d7a1239f01875bd626866d27a9ac69f6 Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 11:35:38 +0200 Subject: [PATCH 2/7] Be more explicit about fastlane gem source --- Gemfile | 4 ++-- Gemfile.lock | 64 ++++++++++++++++++++++++++-------------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Gemfile b/Gemfile index fbf2f95..551c089 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source "https://rubygems.org" -gem "fastlane" +gem "fastlane", git: "https://github.com/fastlane/fastlane", branch: "screen-grid" gem "cocoapods" gem "danger", git: "https://github.com/danger/danger" -gem "danger-device_grid" +gem "danger-device_grid", git: "https://github.com/fastlane/fastlane", branch: "screen-grid" gem "danger-screen_grid", git: "https://github.com/fastlane/fastlane", branch: "screen-grid" gem "bundler" diff --git a/Gemfile.lock b/Gemfile.lock index 081d5ad..b13eb78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,36 @@ GIT fastlane_core (>= 0.46.2, < 1.0.0) plist (~> 3.1.0) spaceship (>= 0.26.2, < 1.0.0) + fastlane (1.97.2) + activesupport (< 5) + addressable (~> 2.3) + bundler (~> 1.12) + cert (>= 1.4.1, < 2.0.0) + credentials_manager (>= 0.16.0, < 1.0.0) + deliver (>= 1.13.1, < 2.0.0) + fastlane_core (>= 0.48.1, < 1.0.0) + frameit (>= 2.7.0, < 3.0.0) + gym (>= 1.6.3, < 2.0.0) + krausefx-shenzhen (>= 0.14.7) + match (>= 0.6.0, < 1.0.0) + multipart-post (~> 2.0.0) + pem (>= 1.3.1, < 2.0.0) + pilot (>= 1.9.1, < 2.0.0) + plist (~> 3.1.0) + produce (>= 1.1.2, < 2.0.0) + scan (>= 0.8.0, < 1.0.0) + screengrab (>= 0.3.2, < 1.0.0) + sigh (>= 1.8.0, < 2.0.0) + slack-notifier (~> 1.3) + snapshot (>= 1.12.3, < 2.0.0) + spaceship (>= 0.28.0, < 1.0.0) + supply (>= 0.7.0, < 1.0.0) + terminal-notifier (~> 1.6.2) + terminal-table (~> 1.4.5) + word_wrap (~> 1.0.0) + xcode-install (~> 2.0.0) + xcodeproj (>= 0.20, < 2.0.0) + xcpretty (>= 0.2.1) fastlane_core (0.48.1) babosa colored @@ -190,36 +220,6 @@ GEM faraday (>= 0.7.4, < 0.10) fastimage (1.6.8) addressable (~> 2.3, >= 2.3.5) - fastlane (1.98.0) - activesupport (< 5) - addressable (~> 2.3) - bundler (~> 1.12) - cert (>= 1.4.1, < 2.0.0) - credentials_manager (>= 0.16.0, < 1.0.0) - deliver (>= 1.13.1, < 2.0.0) - fastlane_core (>= 0.48.1, < 1.0.0) - frameit (>= 2.7.0, < 3.0.0) - gym (>= 1.7.0, < 2.0.0) - krausefx-shenzhen (>= 0.14.7) - match (>= 0.6.0, < 1.0.0) - multipart-post (~> 2.0.0) - pem (>= 1.3.1, < 2.0.0) - pilot (>= 1.9.1, < 2.0.0) - plist (~> 3.1.0) - produce (>= 1.1.2, < 2.0.0) - scan (>= 0.8.0, < 1.0.0) - screengrab (>= 0.3.2, < 1.0.0) - sigh (>= 1.8.0, < 2.0.0) - slack-notifier (~> 1.3) - snapshot (>= 1.12.3, < 2.0.0) - spaceship (>= 0.28.0, < 1.0.0) - supply (>= 0.7.0, < 1.0.0) - terminal-notifier (~> 1.6.2) - terminal-table (~> 1.4.5) - word_wrap (~> 1.0.0) - xcode-install (~> 2.0.0) - xcodeproj (>= 0.20, < 2.0.0) - xcpretty (>= 0.2.1) fourflusher (0.3.2) fuzzy_match (2.0.4) gh_inspector (1.0.2) @@ -333,9 +333,9 @@ DEPENDENCIES bundler cocoapods danger! - danger-device_grid + danger-device_grid! danger-screen_grid! - fastlane + fastlane! fastlane-plugin-emoji_fetcher! BUNDLED WITH From 4ef802d171612c5c94afe449086b16b48856460e Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 11:38:09 +0200 Subject: [PATCH 3/7] Be more explicit about used devices --- fastlane/Snapfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fastlane/Snapfile b/fastlane/Snapfile index abc14f9..0fb301d 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -3,4 +3,12 @@ languages([ "de-DE" ]) +devices([ + "iPhone 4s", + "iPhone 5", + "iPhone 6", + "iPhone 6 Plus", + "iPad Retina" +]) + clear_previous_screenshots false # remove the '#' to clear all previously generated screenshots before creating new ones From 3c81ef56ce7bb9d2483bb2593b4f10ecb59c8a5a Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 12:10:05 +0200 Subject: [PATCH 4/7] Update fastlane dependency --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b13eb78..06d328a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/fastlane/fastlane - revision: 1ad73bf2a06ccb64ad7661bcd9bf2b8feebd30e5 + revision: a99c99b246910435808a534b449b8a60188cb223 branch: screen-grid specs: cert (1.4.1) From 159484bb645aa96200b842fa5982b07be2588d23 Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 12:15:53 +0200 Subject: [PATCH 5/7] Reduce number of screenshots to speed up testing --- fastlane/Snapfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fastlane/Snapfile b/fastlane/Snapfile index 0fb301d..15eee27 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -1,14 +1,14 @@ languages([ "en-US", - "de-DE" + # "de-DE" ]) devices([ "iPhone 4s", - "iPhone 5", - "iPhone 6", - "iPhone 6 Plus", - "iPad Retina" + # "iPhone 5", + # "iPhone 6", + # "iPhone 6 Plus", + # "iPad Retina" ]) clear_previous_screenshots false # remove the '#' to clear all previously generated screenshots before creating new ones From 3592802ccdec52063ded05a586d581c6466e1f4e Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 12:24:45 +0200 Subject: [PATCH 6/7] Update fastlane dependency --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06d328a..95d0fbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,7 +16,7 @@ GIT GIT remote: https://github.com/fastlane/fastlane - revision: a99c99b246910435808a534b449b8a60188cb223 + revision: 10001d8ad4e492c7bf4d5de95c39d4a100a3e1af branch: screen-grid specs: cert (1.4.1) From f21b28242cfacc1271cde4360afc90aee0685cbe Mon Sep 17 00:00:00 2001 From: KrauseFx Date: Wed, 20 Jul 2016 12:45:59 +0200 Subject: [PATCH 7/7] Add more languages and devices --- fastlane/Snapfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastlane/Snapfile b/fastlane/Snapfile index 15eee27..8039d24 100644 --- a/fastlane/Snapfile +++ b/fastlane/Snapfile @@ -1,11 +1,11 @@ languages([ "en-US", - # "de-DE" + "de-DE" ]) devices([ "iPhone 4s", - # "iPhone 5", + "iPhone 5", # "iPhone 6", # "iPhone 6 Plus", # "iPad Retina"