Merge remote-tracking branch 'origin/master' into chore/upstream

# Conflicts:
#	match/lib/match/runner.rb
#	match/lib/match/spaceship_ensure.rb
#	match/spec/runner_spec.rb
#	sigh/lib/sigh/runner.rb

Author: nekrich

Diff for: .circleci/config.yml

@@ -2,7 +2,8 @@
 
 version: 2.1
 orbs:
-    shellcheck: circleci/[email protected] # brew install shellcheck stopped working so using this
+  shellcheck: circleci/[email protected] # brew install shellcheck stopped working so using this
+  macos: circleci/macos@2
 
 aliases:
   - &important-branches
@@ -50,14 +51,6 @@ aliases:
       paths:
         - "~/.cache/rubocop_cache"
 
-  - &set_ruby
-    run:
-      name: Set Ruby version
-      command: | # see https://circleci.com/docs/2.0/testing-ios/#using-ruby
-        echo "ruby-${_RUBY_VERSION}" > ~/.ruby-version
-        # https://circleci.com/docs/2.0/env-vars/#setting-an-environment-variable-in-a-shell-command
-        echo 'chruby ruby-${_RUBY_VERSION}' >> $BASH_ENV
-
   - &bundle_install
     run:
       name: bundle install
@@ -83,14 +76,14 @@ jobs:
       CIRCLE_TEST_REPORTS: '~/test-reports'
       LC_ALL: 'en_US.UTF-8'
       LANG: 'en_US.UTF-8'
-      _RUBY_VERSION: << parameters.ruby_version >>
     shell: '/bin/bash --login -eo pipefail'
     steps:
       - *cache_restore_git
       - checkout
       - *cache_save_git
       - *cache_restore_bundler
-      - *set_ruby
+      - macos/switch-ruby:
+          version: << parameters.ruby_version >>
       - run:
           name: debug | ruby version
           command: |
@@ -132,15 +125,17 @@ jobs:
 
   tests_ubuntu:
     parameters:
-      ruby_version:
+      image:
+        type: string
+      ruby_version: # Used when restoring/saving bundler cache
         type: string
     environment:
       CIRCLE_TEST_REPORTS: '~/test-reports'
       LC_ALL: 'C.UTF-8'
       LANG: 'C.UTF-8'
       FASTLANE_ITUNES_TRANSPORTER_PATH: .bundle
     docker:
-      - image: << parameters.ruby_version >>
+      - image: << parameters.image >>
     steps:
       - *cache_restore_git
       - checkout
@@ -178,7 +173,8 @@ jobs:
       - checkout
       - *cache_save_git
       - *cache_restore_bundler
-      - *set_ruby
+      - macos/switch-ruby:
+          version: << parameters.ruby_version >>
       - *bundle_install
       - *cache_save_bundler
       - run:
@@ -198,10 +194,12 @@ jobs:
 
   validate_documentation:
     parameters:
-      ruby_version:
+      image:
+        type: string
+      ruby_version: # Used when restoring/saving bundler cache
         type: string
     docker:
-      - image: << parameters.ruby_version >>
+      - image: << parameters.image >>
     steps:
       - *cache_restore_git
       - checkout
@@ -219,10 +217,12 @@ jobs:
 
   lint_source_code:
     parameters:
-      ruby_version:
+      image:
+        type: string
+      ruby_version: # Used when restoring/saving bundler cache
         type: string
     docker:
-      - image: << parameters.ruby_version >>
+      - image: << parameters.image >>
     steps:
       - *cache_restore_git
       - checkout
@@ -235,13 +235,13 @@ jobs:
 
   modules_load_up_tests:
     parameters:
-      ruby_version:
+      image:
         type: string
     environment:
       LC_ALL: C.UTF-8
       LANG: C.UTF-8
     docker:
-      - image: << parameters.ruby_version >>
+      - image: << parameters.image >>
     shell: /bin/bash --login -eo pipefail
     steps:
       - *cache_restore_git
@@ -258,7 +258,7 @@ jobs:
 
 workflows:
   version: 2
-  build:
+  "Run Tests & Checks": # Name of the workflow, which ends up displayed on GitHub's PR Check
     jobs:
       - tests_macos:
           name: 'Execute tests on macOS (Xcode 12.5.1, Ruby 2.6)'
@@ -285,26 +285,44 @@ workflows:
       - tests_macos:
           name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.1)'
           xcode_version: '14.3.1'
-          ruby_version: '3.1.4'
+          ruby_version: '3.1'
+          ruby_opt: -W:deprecated
+      - tests_macos:
+          name: 'Execute tests on macOS (Xcode 15.0.1, Ruby 3.1)'
+          xcode_version: '15.0.1'
+          ruby_version: '3.1'
+          ruby_opt: -W:deprecated
+      - tests_macos:
+          name: 'Execute tests on macOS (Xcode 13.4.1, Ruby 3.1)'
+          xcode_version: '13.4.1'
+          ruby_version: '3.1'
+          ruby_opt: -W:deprecated
+      - tests_macos:
+          name: 'Execute tests on macOS (Xcode 14.3.1, Ruby 3.2)'
+          xcode_version: '14.3.1'
+          ruby_version: '3.2'
           ruby_opt: -W:deprecated
       - tests_macos:
-          name: 'Execute tests on macOS (Xcode 15.0.0, Ruby 3.1)'
-          xcode_version: '15.0.0'
-          ruby_version: '3.1.4'
+          name: 'Execute tests on macOS (Xcode 15.0.1, Ruby 3.2)'
+          xcode_version: '15.0.1'
+          ruby_version: '3.2'
           ruby_opt: -W:deprecated
       - tests_ubuntu:
           name: 'Execute tests on Ubuntu'
-          ruby_version: 'fastlanetools/ci:0.3.0'
+          image: 'fastlanetools/ci:0.3.0'
+          ruby_version: '2.6'
       - validate_fastlane_swift_generation:
           name: 'Validate Fastlane.swift generation'
           xcode_version: '12.5.1'
           ruby_version: '2.7'
       - validate_documentation:
           name: 'Validate Documentation'
-          ruby_version: 'fastlanetools/ci:0.3.0'
+          image: 'cimg/ruby:3.2.2'
+          ruby_version: '3.2'
       - lint_source_code:
           name: 'Lint source code'
-          ruby_version: 'cimg/ruby:2.6'
+          image: 'cimg/ruby:2.6'
+          ruby_version: '2.6'
       - modules_load_up_tests:
           name: 'Modules load up tests'
-          ruby_version: 'cimg/ruby:2.6'
+          image: 'cimg/ruby:2.6'

Diff for: .github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

Diff for: .github/workflows/issues.yml

@@ -1,14 +1,16 @@
-name: Processing issues
-on: 
+---
+name: Process issues
+on:
   issues:
-    types: [opened]
+    types:
+      - opened
 
-jobs:   
+jobs:
   fastlane-env:
-    name: fastlane env reminder
-    runs-on: ubuntu-latest    
+    name: Remind user about posting their fastlane env
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - uses: fastlane/github-actions/fastlane-env-reminder@latest
-      with:
-        repo-token: "${{ secrets.BOT_GITHUB_TOKEN }}"
+      - uses: actions/checkout@master
+      - uses: fastlane/github-actions/fastlane-env-reminder@latest
+        with:
+          repo-token: '${{ secrets.BOT_GITHUB_TOKEN }}'

Diff for: .github/workflows/lock.yml

@@ -1,14 +1,15 @@
-# Locking closed, inactive issues and pull requests
-name: Locking issues and pull requests
+---
+name: Lock issues and pull requests
 on:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *" # Every day at midnight
 
 jobs:
   lock:
+    name: Lock closed and inactive issues and pull requests
     runs-on: ubuntu-latest
     steps:
-    - uses: fastlane/github-actions/lock@latest
-      with:
-        repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}
-        days-before-lock: 60
+      - uses: fastlane/github-actions/lock@latest
+        with:
+          repo-token: '${{ secrets.BOT_GITHUB_TOKEN }}'
+          days-before-lock: 60

Diff for: .github/workflows/release.yml

@@ -1,18 +1,20 @@
-name: Processing release
-on: 
+---
+name: Process release
+on:
   release:
-    types: [published]
+    types:
+      - published
 
-jobs:   
-  communicate-on-pull-request-released:
-    name: communicate on pull request released
+jobs:
+  announce-release-on-released-pull-requests:
+    name: Announce release on released pull requests
     runs-on: ubuntu-latest
     steps:
-    - name: Git checkout
-      uses: actions/checkout@master
-      with:
-        ref: refs/heads/master
-    - name: Communicate on PR released
-      uses: fastlane/github-actions/communicate-on-pull-request-released@latest
-      with:
-        repo-token: ${{ secrets.BOT_GITHUB_TOKEN }}
+      - name: Git checkout
+        uses: actions/checkout@master
+        with:
+          ref: refs/heads/master
+      - name: Announce release on released pull requests
+        uses: fastlane/github-actions/communicate-on-pull-request-released@latest
+        with:
+          repo-token: '${{ secrets.BOT_GITHUB_TOKEN }}'

Diff for: .github/workflows/tags.yml

@@ -1,15 +1,17 @@
+---
+name: Deploy to Homebrew
 on:
   push:
-    tags: 'v*'
+    tags: 'v*' # Push events to tags matching v*
 
 jobs:
   homebrew:
     name: Bump Homebrew formula
     runs-on: ubuntu-latest
     steps:
-      - uses: mislav/bump-homebrew-formula-action@v1.4
-        if: "!contains(github.ref, '-')" # skip prereleases
+      - uses: mislav/bump-homebrew-formula-action@v3.1
+        if: "!contains(github.ref, '-')" # Skip prereleases
         with:
           formula-name: fastlane
         env:
-          COMMITTER_TOKEN: ${{ secrets.HOMEBREW_COMMITTER_TOKEN }}
+          COMMITTER_TOKEN: '${{ secrets.HOMEBREW_COMMITTER_TOKEN }}'

Diff for: .rubocop.yml

@@ -202,7 +202,7 @@ Style/RedundantReturn:
 Style/IfUnlessModifier:
   Enabled: false
 
-# and and or is okay
+# "and" and "or" are okay
 Style/AndOr:
   Enabled: true
   EnforcedStyle: conditionals
@@ -341,3 +341,12 @@ Style/MethodCallWithArgsParentheses:
     - 'context'
     - 'before'
     - 'after'
+
+# Sorts the gems in the Gemfile alphabetically.
+Bundler/OrderedGems:
+  Enabled: true
+  TreatCommentsAsGroupSeparators: false
+
+Gemspec/DevelopmentDependencies:
+   Enabled: true
+   EnforcedStyle: Gemfile

Diff for: .rubocop_todo.yml

@@ -6,13 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
-# Configuration parameters: EnforcedStyle, AllowedGems, Include.
-# SupportedStyles: Gemfile, gems.rb, gemspec
-# Include: **/*.gemspec, **/Gemfile, **/gems.rb
-Gemspec/DevelopmentDependencies:
-  Enabled: false
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.

Diff for: CONTRIBUTING.md

@@ -20,19 +20,6 @@ Some people might also use the [_fastlane_ tag on StackOverflow](https://stackov
 - You will need a Google account to sign the CLA when you make your first PR
 - For some more advanced tooling and debugging tips, check out [ToolsAndDebugging.md](ToolsAndDebugging.md)
 
-### Google Contributor License Agreement (CLA)
-Upon your first pull request to _fastlane_, the [googlebot](https://github.com/googlebot) will ask you to sign the Google Contributor License Agreement. Once the CLA has been accepted, the PR will be available to merge and you will not be asked to sign it again unless your GitHub username or email address changes.
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution;
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to <https://cla.developers.google.com/> to see
-your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
-
 ### New Actions
 
 Please be aware that we don’t accept submissions for new actions at the moment. You can find more information about that [here][submit action].