diff --git a/.buildkite/commands/build-and-test.sh b/.buildkite/commands/build-and-test.sh index dfcc3d7e7..665a72594 100755 --- a/.buildkite/commands/build-and-test.sh +++ b/.buildkite/commands/build-and-test.sh @@ -2,10 +2,6 @@ set -eu -# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM -echo "--- :rubygems: Fixing Ruby Setup" -gem install bundler - echo "--- :rubygems: Setting up Gems" install_gems diff --git a/.buildkite/commands/build-and-ui-test.sh b/.buildkite/commands/build-and-ui-test.sh index c589aefe2..cabb9b235 100755 --- a/.buildkite/commands/build-and-ui-test.sh +++ b/.buildkite/commands/build-and-ui-test.sh @@ -2,10 +2,6 @@ set -eu -# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM -echo "--- :rubygems: Fixing Ruby Setup" -gem install bundler - echo "--- :rubygems: Setting up Gems" install_gems diff --git a/.buildkite/commands/build-prototype.sh b/.buildkite/commands/build-prototype.sh index 49c794cd3..4a740a79e 100755 --- a/.buildkite/commands/build-prototype.sh +++ b/.buildkite/commands/build-prototype.sh @@ -2,10 +2,6 @@ set -eu -# FIXIT-13.1: Temporary fix until we're on the Xcode 13.1 VM -echo "--- :rubygems: Fixing Ruby Setup" -gem install bundler - echo "--- :rubygems: Setting up Gems" install_gems diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 25bcd70aa..0d3a7bbf0 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ common_params: # Common plugin settings to use with the `plugins` key. - &common_plugins - - automattic/bash-cache#2.6.0 + - automattic/bash-cache#2.9.0 # Common environment values to use with the `env` key. - &common_env # Remember to address all "FIXIT-13.1" comments when we'll update to new image. diff --git a/Gemfile b/Gemfile index 19b272490..1e7c63c1a 100644 --- a/Gemfile +++ b/Gemfile @@ -8,3 +8,6 @@ gem 'fastlane-plugin-appcenter', '~> 1.11' group :screenshots, optional: true do gem 'rmagick', '~> 3.2.0' end + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/Gemfile.lock b/Gemfile.lock index e2d788c97..584c0372c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,41 +1,42 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - activesupport (5.2.6) + CFPropertyList (3.0.5) + rexml + activesupport (5.2.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.1.1) - aws-partitions (1.465.0) - aws-sdk-core (3.114.1) + aws-eventstream (1.2.0) + aws-partitions (1.648.0) + aws-sdk-core (3.162.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.58.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.115.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) bigdecimal (1.4.4) buildkit (1.5.0) sawyer (>= 0.6) chroma (0.2.0) - claide (1.0.3) + claide (1.1.0) cocoapods (1.10.0) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) @@ -77,28 +78,30 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) declarative (0.0.20) diffy (3.4.2) - digest-crc (0.6.3) + digest-crc (0.6.4) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.2) + dotenv (2.8.1) + emoji_regex (3.2.3) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - excon (0.82.0) - faraday (1.5.1) + excon (0.93.1) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-cookie_jar (0.0.7) faraday (>= 0.8.0) @@ -107,15 +110,19 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) - faraday_middleware (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.4) - fastlane (2.185.0) + fastimage (2.2.6) + fastlane (2.210.1) CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) + addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) aws-sdk-s3 (~> 1.0) babosa (>= 1.0.3, < 2.0.0) @@ -130,7 +137,7 @@ GEM faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.1) + google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) google-cloud-storage (~> 1.31) highline (~> 2.0) @@ -139,6 +146,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (~> 2.0.0) naturally (~> 2.2) + optparse (~> 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -152,8 +160,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) fastlane-plugin-appcenter (1.11.1) - fastlane-plugin-sentry (1.6.0) - fastlane-plugin-wpmreleasetoolkit (5.0.0) + fastlane-plugin-sentry (1.14.0) + os (~> 1.1, >= 1.1.4) + fastlane-plugin-wpmreleasetoolkit (5.6.0) activesupport (~> 5) bigdecimal (~> 1.4) buildkit (~> 1.5) @@ -173,64 +182,64 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.11.0) + git (1.12.0) + addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.5.0) - google-apis-core (~> 0.1) - google-apis-core (0.3.0) + google-apis-androidpublisher_v3 (0.29.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-core (0.9.1) addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) mini_mime (~> 1.0) representable (~> 3.0) - retriable (>= 2.0, < 4.0) + retriable (>= 2.0, < 4.a) rexml - signet (~> 0.14) webrick - google-apis-iamcredentials_v1 (0.4.0) - google-apis-core (~> 0.1) - google-apis-playcustomapp_v1 (0.3.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.4.0) - google-apis-core (~> 0.1) + google-apis-iamcredentials_v1 (0.15.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-playcustomapp_v1 (0.11.0) + google-apis-core (>= 0.9.0, < 2.a) + google-apis-storage_v1 (0.19.0) + google-apis-core (>= 0.9.0, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) - google-cloud-storage (1.31.1) - addressable (~> 2.5) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.3.0) + google-cloud-storage (1.43.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) + google-apis-storage_v1 (~> 0.19.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (0.16.2) - faraday (>= 0.17.3, < 2.0) + googleauth (1.3.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.14) + signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jmespath (1.4.0) - json (2.5.1) + jmespath (1.6.1) + json (2.6.2) jsonlint (0.3.0) oj (~> 3) optimist (~> 3) - jwt (2.2.3) + jwt (2.5.0) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.1.0) + mini_mime (1.1.2) mini_portile2 (2.8.0) - minitest (5.14.4) + minitest (5.16.3) molinillo (0.6.6) multi_json (1.15.0) multipart-post (2.0.0) @@ -238,30 +247,31 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) - nokogiri (1.13.7) + nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.7-x86_64-darwin) + nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) - oj (3.13.17) + oj (3.13.21) optimist (3.0.1) options (2.3.2) - os (1.1.1) + optparse (0.1.1) + os (1.1.4) parallel (1.22.1) plist (3.6.0) progress_bar (1.3.3) highline (>= 1.6, < 3) options (~> 2.3.0) - public_suffix (4.0.6) + public_suffix (5.0.0) racc (1.6.0) - rake (12.3.3) + rake (13.0.6) rake-compiler (1.2.0) rake rchardet (1.8.0) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) @@ -270,15 +280,15 @@ GEM rmagick (3.2.0) rouge (2.0.7) ruby-macho (1.4.0) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) security (0.1.3) - signet (0.15.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -288,28 +298,29 @@ GEM terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) tty-cursor (~> 0.7) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) uber (0.1.0) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) - xcodeproj (1.19.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) nanaimo (~> 0.3.0) + rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) xcpretty-travis-formatter (1.0.1)