fastlane 2.130.0 → 2.135.0

data/match/lib/match/runner.rb

@@ -37,7 +37,9 @@ module Match
         git_full_name: params[:git_full_name],
         git_user_email: params[:git_user_email],
         clone_branch_directly: params[:clone_branch_directly],
+        git_basic_authorization: params[:git_basic_authorization],
         type: params[:type].to_s,
+        generate_apple_certs: params[:generate_apple_certs],
         platform: params[:platform].to_s,
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
         google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
@@ -85,12 +87,14 @@ module Match
       spaceship.certificate_exists(username: params[:username], certificate_id: cert_id) if spaceship
 
       # Provisioning Profiles
-      app_identifiers.each do |app_identifier|
-        loop do
-          break if fetch_provisioning_profile(params: params,
-                                      certificate_id: cert_id,
-                                      app_identifier: app_identifier,
-                                   working_directory: storage.working_directory)
+      unless params[:skip_provisioning_profiles]
+        app_identifiers.each do |app_identifier|
+          loop do
+            break if fetch_provisioning_profile(params: params,
+                                        certificate_id: cert_id,
+                                        app_identifier: app_identifier,
+                                    working_directory: storage.working_directory)
+          end
         end
       end
 

data/match/lib/match/storage/git_storage.rb

@@ -17,6 +17,7 @@ module Match
       attr_accessor :clone_branch_directly
       attr_accessor :type
       attr_accessor :platform
+      attr_accessor :git_basic_authorization
 
       def self.configure(params)
         return self.new(
@@ -28,7 +29,8 @@ module Match
           branch: params[:git_branch],
           git_full_name: params[:git_full_name],
           git_user_email: params[:git_user_email],
-          clone_branch_directly: params[:clone_branch_directly]
+          clone_branch_directly: params[:clone_branch_directly],
+          git_basic_authorization: params[:git_basic_authorization]
         )
       end
 
@@ -40,7 +42,8 @@ module Match
                      branch: "master",
                      git_full_name: nil,
                      git_user_email: nil,
-                     clone_branch_directly: false)
+                     clone_branch_directly: false,
+                     git_basic_authorization: nil)
         self.git_url = git_url
         self.shallow_clone = shallow_clone
         self.skip_docs = skip_docs
@@ -48,6 +51,7 @@ module Match
         self.git_full_name = git_full_name
         self.git_user_email = git_user_email
         self.clone_branch_directly = clone_branch_directly
+        self.git_basic_authorization = git_basic_authorization
 
         self.type = type if type
         self.platform = platform if platform
@@ -65,6 +69,8 @@ module Match
         self.working_directory = Dir.mktmpdir
 
         command = "git clone #{self.git_url.shellescape} #{self.working_directory.shellescape}"
+        command << " -c http.extraheader='AUTHORIZATION: basic #{self.git_basic_authorization}'" unless self.git_basic_authorization.nil?
+
         if self.shallow_clone
           command << " --depth 1 --no-single-branch"
         elsif self.clone_branch_directly

data/match/lib/match/storage/google_cloud_storage.rb

@@ -97,6 +97,7 @@ module Match
         end
 
         ensure_bucket_is_selected
+        check_bucket_permissions
       end
 
       def currently_used_team_id
@@ -234,74 +235,125 @@ module Match
           end
         end
 
-        # User doesn't seem to have provided a keys file.
-        UI.message("Looks like you don't have a Google Cloud #{DEFAULT_KEYS_FILE_NAME.cyan} file")
-        UI.message("If you have one, make sure to put it into the '#{Dir.pwd}' directory and call it '#{DEFAULT_KEYS_FILE_NAME.cyan}'")
+        # User doesn't seem to have provided a keys file
+        UI.message("Looks like you don't have a Google Cloud #{DEFAULT_KEYS_FILE_NAME.cyan} file yet.")
+        UI.message("If you have one, make sure to put it into the '#{Dir.pwd}' directory and call it '#{DEFAULT_KEYS_FILE_NAME.cyan}'.")
         unless UI.confirm("Do you want fastlane to help you to create a #{DEFAULT_KEYS_FILE_NAME} file?")
           UI.user_error!("Process stopped, run fastlane again to start things up again")
         end
 
-        UI.message("fastlane will help you create a keys file. First, open the following website")
+        UI.message("fastlane will help you create a keys file. Start by opening the following website:")
         UI.message("")
         UI.message("\t\thttps://console.cloud.google.com".cyan)
         UI.message("")
-        UI.input("Press enter once you're logged in")
+        UI.input("Press [Enter] once you're logged in")
 
-        UI.message("Now it's time to generate a new JSON auth file for fastlane to access Google Cloud")
         UI.message("First, switch to the Google Cloud project you want to use.")
-        UI.message("If you don't have one yet, create a new one and switch to it")
+        UI.message("If you don't have one yet, create a new one and switch to it.")
         UI.message("")
-        UI.message("\t\thttps://console.cloud.google.com/apis/credentials".cyan)
+        UI.message("\t\thttps://console.cloud.google.com/projectcreate".cyan)
         UI.message("")
-        UI.input("Ensure the right project is selected on top of the page and confirm with enter")
+        UI.input("Press [Enter] once you selected the right project")
 
-        UI.message("Now create a new JSON auth file by clicking on")
+        UI.message("Next fastlane will show you the steps to create a keys file.")
+        UI.message("For this it might be useful to switch the Google Cloud interface to English.")
+        UI.message("Append " + "&hl=en".cyan + " to the URL and the interface should be in English.")
+        UI.input("Press [Enter] to continue")
+
+        UI.message("Now it's time to generate a new JSON auth file for fastlane to access Google Cloud Storage:")
         UI.message("")
-        UI.message("\t\t 1. Create credentials".cyan)
-        UI.message("\t\t 2. Service account key".cyan)
-        UI.message("\t\t 3. App Engine default service account".cyan)
-        UI.message("\t\t 4. JSON".cyan)
-        UI.message("\t\t 5. Create".cyan)
+        UI.message("\t\t 1. From the side menu choose 'APIs & Services' and then 'Credentials'".cyan)
+        UI.message("\t\t 2. Click 'Create credentials'".cyan)
+        UI.message("\t\t 3. Choose 'Service account key'".cyan)
+        UI.message("\t\t 4. Select 'New service account'".cyan)
+        UI.message("\t\t 5. Enter a name and ID for the service account".cyan)
+        UI.message("\t\t 6. Don't give the service account a role just yet!".cyan)
+        UI.message("\t\t 7. Make sure the key type is set to 'JSON'".cyan)
+        UI.message("\t\t 8. Click 'Create'".cyan)
         UI.message("")
-        UI.input("Confirm with enter once you created and download the JSON file")
+        UI.input("Confirm with [Enter] once you created and downloaded the JSON file")
 
         UI.message("Copy the file to the current directory (#{Dir.pwd})")
         UI.message("and rename it to `#{DEFAULT_KEYS_FILE_NAME.cyan}`")
         UI.message("")
-        UI.input("Confirm with enter")
+        UI.input("Confirm with [Enter]")
 
         until File.exist?(DEFAULT_KEYS_FILE_NAME)
           UI.message("Make sure to place the file in '#{Dir.pwd.cyan}' and name it '#{DEFAULT_KEYS_FILE_NAME.cyan}'")
-          UI.input("Confirm with enter")
+          UI.message("")
+          UI.input("Confirm with [Enter]")
         end
 
         UI.important("Please never add the #{DEFAULT_KEYS_FILE_NAME.cyan} file in version control.")
-        UI.important("Instead please add the file to your .gitignore")
-        UI.input("Confirm with enter")
+        UI.important("Instead please add the file to your `.gitignore` file")
+        UI.message("")
+        UI.input("Confirm with [Enter]")
 
         return DEFAULT_KEYS_FILE_NAME
       end
 
       def ensure_bucket_is_selected
-        # In case the user didn't provide a bucket name yet, they will
-        # be asked to provide one here
+        # Skip the instructions if the user provided a bucket name
+        return unless self.bucket_name.to_s.length == 0
+
+        created_bucket = UI.confirm("Did you already create a Google Cloud Storage bucket?")
         while self.bucket_name.to_s.length == 0
-          # Have a nice selection of the available buckets here
-          # This can only happen after we went through auth of Google Cloud
-          available_bucket_identifiers = self.gc_storage.buckets.collect(&:id)
-          if available_bucket_identifiers.count > 0
-            @bucket_name = UI.select("What Google Cloud Storage bucket do you want to use? (you can define it using the `google_cloud_bucket_name` key)", available_bucket_identifiers)
-          else
-            UI.error("Looks like your Google Cloud account for the project ID '#{self.google_cloud_project_id}' doesn't")
-            UI.error("have any available storage buckets yet. Please visit the following URL")
+          unless created_bucket
+            UI.message("Create a bucket at the following URL:")
             UI.message("")
             UI.message("\t\thttps://console.cloud.google.com/storage/browser".cyan)
             UI.message("")
-            UI.message("and make sure to have the right project selected on top of the page")
-            UI.message("click on " + "Create Bucket".cyan + ", choose a name and confirm")
+            UI.message("Make sure to select the right project at the top of the page!")
             UI.message("")
-            UI.input("Once you're finished, please confirm with enter")
+            UI.message("\t\t 1. Click 'Create bucket'".cyan)
+            UI.message("\t\t 2. Enter a unique name".cyan)
+            UI.message("\t\t 3. Select a geographic location for your bucket".cyan)
+            UI.message("\t\t 4. Make sure the storage class is set to 'Standard'".cyan)
+            UI.message("\t\t 5. Click 'Create' to create the bucket".cyan)
+            UI.message("")
+            UI.input("Press [Enter] once you created a bucket")
+          end
+          bucket_name = UI.input("Enter the name of your bucket: ")
+
+          # Verify if the bucket exists
+          begin
+            bucket_exists = !self.gc_storage.bucket(bucket_name).nil?
+          rescue Google::Cloud::PermissionDeniedError
+            bucket_exists = true
+          end
+          created_bucket = bucket_exists
+          if bucket_exists
+            @bucket_name = bucket_name
+          else
+            UI.error("It looks like the bucket '#{bucket_name}' doesn't exist. Make sure to create it first.")
+          end
+        end
+      end
+
+      def check_bucket_permissions
+        bucket = nil
+        while bucket.nil?
+          begin
+            bucket = self.gc_storage.bucket(self.bucket_name)
+          rescue Google::Cloud::PermissionDeniedError
+            bucket = nil
           end
+          return if bucket.nil? == false
+          UI.error("Looks like your Google Cloud account for the project ID '#{self.google_cloud_project_id}' doesn't")
+          UI.error("have access to the storage bucket '#{self.bucket_name}'. Please visit the following URL:")
+          UI.message("")
+          UI.message("\t\thttps://console.cloud.google.com/storage/browser".cyan)
+          UI.message("")
+          UI.message("You need to give your account the correct permissions:")
+          UI.message("")
+          UI.message("\t\t 1. Click on your bucket to open it".cyan)
+          UI.message("\t\t 2. Click 'Permissions'".cyan)
+          UI.message("\t\t 3. Click 'Add members'".cyan)
+          UI.message("\t\t 4. Enter the email of your service account".cyan)
+          UI.message("\t\t 5. Set the role to 'Storage Admin'".cyan)
+          UI.message("\t\t 6. Click 'Save'".cyan)
+          UI.message("")
+          UI.input("Confirm with [Enter] once you're finished")
         end
       end
     end

data/produce/lib/produce/service.rb

@@ -229,7 +229,13 @@ module Produce
         UI.message("\tPush Notifications")
 
         if on
-          app.update_service(Spaceship.app_service.push_notification.on)
+          # Don't enable push notifications if already enabled
+          # Enabling push notifications when already on revokes certs
+          # https://github.com/fastlane/fastlane/issues/15315
+          # https://github.com/fastlane/fastlane/issues/8883
+          unless app.details.enable_services.include?("push")
+            app.update_service(Spaceship.app_service.push_notification.on)
+          end
         else
           app.update_service(Spaceship.app_service.push_notification.off)
         end

data/scan/lib/scan/error_handler.rb

@@ -6,8 +6,13 @@ module Scan
     class << self
       # @param [String] The output of the errored build
       # This method should raise an exception in any case, as the return code indicated a failed build
-      def handle_build_error(output)
-        # The order of the handling below is import
+      def handle_build_error(output, log_path)
+        # The order of the handling below is important
+
+        instruction = 'See the log'
+        location = Scan.config[:suppress_xcode_output] ? "here: '#{log_path}'" : "above"
+        details = "#{instruction} #{location}."
+
         case output
         when /US\-ASCII/
           print("Your shell environment is not correctly configured")
@@ -23,7 +28,7 @@ module Scan
           print("For more information visit this stackoverflow answer:")
           print("https://stackoverflow.com/a/17031697/445598")
         when /Testing failed/
-          UI.build_failure!("Error building the application - see the log above")
+          UI.build_failure!("Error building the application. #{details}")
         when /Executed/, /Failing tests:/
           # this is *really* important:
           # we don't want to raise an exception here
@@ -38,7 +43,7 @@ module Scan
           # followed by a list of tests that failed.
           return
         end
-        UI.build_failure!("Error building/testing the application - see the log above")
+        UI.build_failure!("Error building/testing the application. #{details}")
       end
 
       private

data/scan/lib/scan/runner.rb

@@ -67,7 +67,7 @@ module Scan
                                               error: proc do |error_output|
                                                 begin
                                                   exit_status = $?.exitstatus
-                                                  ErrorHandler.handle_build_error(error_output)
+                                                  ErrorHandler.handle_build_error(error_output, @test_command_generator.xcodebuild_log_path)
                                                 rescue => ex
                                                   SlackPoster.new.run({
                                                     build_errors: 1

data/sigh/lib/assets/resign.sh

@@ -474,7 +474,7 @@ function resign {
         log "Profile app identifier prefix is '$APP_IDENTIFIER_PREFIX'"
     fi
 
-    # Set new app identifer prefix if such entry exists in plist file
+    # Set new app identifier prefix if such entry exists in plist file
     PlistBuddy -c "Set :AppIdentifierPrefix $APP_IDENTIFIER_PREFIX." "$APP_PATH/Info.plist" 2>/dev/null
 
     TEAM_IDENTIFIER=$(PlistBuddy -c "Print :Entitlements:com.apple.developer.team-identifier" "$TEMP_DIR/profile.plist" | tr -d '\n')
@@ -690,7 +690,7 @@ function resign {
         # Get the old and new app identifier (prefix)
         APP_ID_KEY="application-identifier"
         # Extract just the identifier from the value
-        # Use the fact that we are after some identifer, which is always at the start of the string
+        # Use the fact that we are after some identifier, which is always at the start of the string
         OLD_APP_ID=$(PlistBuddy -c "Print $APP_ID_KEY" "$APP_ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n')
         NEW_APP_ID=$(PlistBuddy -c "Print $APP_ID_KEY" "$PROFILE_ENTITLEMENTS" | grep -E '^[A-Z0-9]*' -o | tr -d '\n')
 

data/sigh/lib/sigh/runner.rb

@@ -155,27 +155,35 @@ module Sigh
       case Sigh.config[:platform].to_s
       when 'ios', 'tvos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.development.all
+          certificates = Spaceship.certificate.development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.InHouse
+          # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         # handles case where the desired certificate type is adhoc but the account is an enterprise account
         # the apple dev portal api has a weird quirk in it where if you query for distribution certificates
         # for enterprise accounts, you get nothing back even if they exist.
         elsif profile_type == Spaceship.provisioning_profile.AdHoc && Spaceship.client && Spaceship.client.in_house?
+          # Enterprise accounts don't have access to Apple Distribution certificates
           certificates = Spaceship.certificate.in_house.all
         else
-          certificates = Spaceship.certificate.production.all # Ad hoc or App Store
+          # Ad hoc or App Store
+          certificates = Spaceship.certificate.production.all +
+                         Spaceship.certificate.apple_distribution.all
         end
 
       when 'macos'
         if profile_type == Spaceship.provisioning_profile.Development
-          certificates = Spaceship.certificate.mac_development.all
+          certificates = Spaceship.certificate.mac_development.all +
+                         Spaceship.certificate.apple_development.all
         elsif profile_type == Spaceship.provisioning_profile.AppStore
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         elsif profile_type == Spaceship.provisioning_profile.Direct
           certificates = Spaceship.certificate.developer_id_application.all
         else
-          certificates = Spaceship.certificate.mac_app_distribution.all
+          certificates = Spaceship.certificate.mac_app_distribution.all +
+                         Spaceship.certificate.apple_distribution.all
         end
       end
 

data/snapshot/lib/snapshot/options.rb

@@ -116,6 +116,11 @@ module Snapshot
                                      description: "Enabling this option will configure the Simulator's system language",
                                      default_value: false,
                                      is_string: false),
+        FastlaneCore::ConfigItem.new(key: :dark_mode,
+                                    env_name: 'SNAPSHOT_DARK_MODE',
+                                    description: "Enabling this option will configure the Simulator to be in dark mode (false for light, true for dark)",
+                                    optional: true,
+                                    type: Boolean),
         FastlaneCore::ConfigItem.new(key: :app_identifier,
                                      env_name: 'SNAPSHOT_APP_IDENTIFIER',
                                      short_option: "-a",

data/snapshot/lib/snapshot/reports_generator.rb

@@ -77,6 +77,9 @@ module Snapshot
       {
         # snapshot in Xcode 9 saves screenshots with the SIMULATOR_DEVICE_NAME
         # which includes spaces
+        'iPhone 11 Pro Max' => "iPhone 11 Pro Max",
+        'iPhone 11 Pro' => "iPhone 11 Pro",
+        'iPhone 11' => "iPhone 11",
         'iPhone XS Max' => "iPhone XS Max",
         'iPhone XS' => "iPhone XS",
         'iPhone XR' => "iPhone XR",

data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb

@@ -8,6 +8,7 @@ module Snapshot
     attr_accessor :clean
     attr_accessor :erase_simulator
     attr_accessor :localize_simulator
+    attr_accessor :dark_mode
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
 
@@ -32,6 +33,7 @@ module Snapshot
       @clean = snapshot_config[:clean]
       @erase_simulator = snapshot_config[:erase_simulator]
       @localize_simulator = snapshot_config[:localize_simulator]
+      @dark_mode = snapshot_config[:dark_mode]
       @reinstall_app = snapshot_config[:reinstall_app]
       @app_identifier = snapshot_config[:app_identifier]
       @number_of_retries = snapshot_config[:number_of_retries]

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb

@@ -50,7 +50,7 @@ module Snapshot
             language = language[0]
           end
 
-          # Clear logs so subsequent xcodebuild executions dont append to old ones
+          # Clear logs so subsequent xcodebuild executions don't append to old ones
           log_path = xcodebuild_log_path(language: language, locale: locale)
           File.delete(log_path) if File.exist?(log_path)
 
@@ -190,7 +190,7 @@ module Snapshot
           hash[name] = ["No tests were executed"]
         else
           tests = Array(summary.data.first[:tests])
-          hash[name] = tests.map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }.flatten
+          hash[name] = tests.flat_map { |test| Array(test[:failures]).map { |failure| failure[:failure_message] } }
         end
       end
     end

data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb

@@ -55,11 +55,14 @@ module Snapshot
       Fixes::HardwareKeyboardFix.patch
 
       device_types.each do |type|
-        if launcher_config.erase_simulator || launcher_config.localize_simulator
+        if launcher_config.erase_simulator || launcher_config.localize_simulator || !launcher_config.dark_mode.nil?
           erase_simulator(type)
           if launcher_config.localize_simulator
             localize_simulator(type, language, locale)
           end
+          unless launcher_config.dark_mode.nil?
+            interface_style(type, launcher_config.dark_mode)
+          end
         elsif launcher_config.reinstall_app
           # no need to reinstall if device has been erased
           uninstall_app(type)
@@ -124,6 +127,18 @@ module Snapshot
       end
     end
 
+    def interface_style(device_type, dark_mode)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        plist = {
+          UserInterfaceStyleMode: (dark_mode ? 2 : 1)
+        }
+        UI.message("Setting interface style #{device_type} (UserInterfaceStyleMode=#{dark_mode})")
+        plist_path = "#{ENV['HOME']}/Library/Developer/CoreSimulator/Devices/#{device_udid}/data/Library/Preferences/com.apple.uikitservices.userInterfaceStyleMode.plist"
+        File.write(plist_path, Plist::Emit.dump(plist))
+      end
+    end
+
     def copy_simulator_logs(device_names, language, locale, launch_arguments)
       return unless launcher_config.output_simulator_logs