fastlane 2.138.0 → 2.143.0

data/scan/lib/scan/slack_poster.rb

@@ -44,7 +44,7 @@ module Scan
       end
 
       Fastlane::Actions::SlackAction.run({
-        message: "#{Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
+        message: "#{Scan.config[:app_name] || Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
         channel: channel,
         slack_url: Scan.config[:slack_url].to_s,
         success: results[:build_errors].to_i == 0 && results[:failures].to_i == 0,

data/scan/lib/scan/test_command_generator.rb

@@ -27,7 +27,7 @@ module Scan
       UI.user_error!("No project/workspace found")
     end
 
-    def options
+    def options # rubocop:disable Metrics/PerceivedComplexity
       config = Scan.config
 
       options = []
@@ -37,8 +37,11 @@ module Scan
       options << "-toolchain '#{config[:toolchain]}'" if config[:toolchain]
       options << "-derivedDataPath '#{config[:derived_data_path]}'" if config[:derived_data_path]
       options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
-      options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
-      options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]
+      options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
+      if FastlaneCore::Helper.xcode_at_least?(10)
+        options << "-maximum-concurrent-test-simulator-destinations #{config[:max_concurrent_simulators]}" if config[:max_concurrent_simulators]
+        options << "-disable-concurrent-testing" if config[:disable_concurrent_testing]
+      end
       options << "-enableCodeCoverage #{config[:code_coverage] ? 'YES' : 'NO'}" unless config[:code_coverage].nil?
       options << "-enableAddressSanitizer #{config[:address_sanitizer] ? 'YES' : 'NO'}" unless config[:address_sanitizer].nil?
       options << "-enableThreadSanitizer #{config[:thread_sanitizer] ? 'YES' : 'NO'}" unless config[:thread_sanitizer].nil?
@@ -120,7 +123,7 @@ module Scan
 
     # Store the raw file
     def xcodebuild_log_path
-      file_name = "#{Scan.project.app_name}-#{Scan.config[:scheme]}.log"
+      file_name = "#{Scan.config[:app_name] || Scan.project.app_name}-#{Scan.config[:scheme]}.log"
       containing = File.expand_path(Scan.config[:buildlog_path])
       FileUtils.mkdir_p(containing)
 
@@ -148,7 +151,8 @@ module Scan
 
     def result_bundle_path
       unless Scan.cache[:result_bundle_path]
-        path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + ".test_result"
+        ext = FastlaneCore::Helper.xcode_version.to_i >= 11 ? '.xcresult' : '.test_result'
+        path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + ext
         if File.directory?(path)
           FileUtils.remove_dir(path)
         end

data/screengrab/lib/screengrab/runner.rb

@@ -73,15 +73,11 @@ module Screengrab
 
       validate_apk(app_apk_path)
 
-      enable_clean_status_bar(device_serial, app_apk_path)
-
-      run_tests(device_serial, app_apk_path, tests_apk_path, test_classes_to_use, test_packages_to_use, @config[:launch_arguments])
-
-      number_of_screenshots = pull_screenshots_from_device(device_serial, device_screenshots_paths, device_type_dir_name)
+      number_of_screenshots = run_tests(device_type_dir_name, device_screenshots_paths, device_serial, app_apk_path, tests_apk_path, test_classes_to_use, test_packages_to_use, @config[:launch_arguments])
 
       ReportsGenerator.new.generate
 
-      UI.success("Captured #{number_of_screenshots} screenshots! 📷✨")
+      UI.success("Captured #{number_of_screenshots} new screenshots! 📷✨")
     end
 
     def select_device
@@ -147,10 +143,17 @@ module Screengrab
 
     def determine_internal_screenshots_paths(app_package_name, locales)
       locale_paths = locales.map do |locale|
-        "/data/user/0/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots"
-      end
+        [
+          "/data/user/0/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots",
+
+          # https://github.com/fastlane/fastlane/issues/15653#issuecomment-578541663
+          "/data/data/#{app_package_name}/files/#{app_package_name}/screengrab/#{locale}/images/screenshots"
+        ]
+      end.flatten
 
-      return ["/data/data/#{app_package_name}/app_screengrab"] + locale_paths
+      return ["/data/data/#{app_package_name}/app_screengrab"] +
+             ["/data/data/#{app_package_name}/screengrab"] +
+             locale_paths
     end
 
     def clear_device_previous_screenshots(device_serial, device_screenshots_paths)
@@ -232,23 +235,29 @@ module Screengrab
       end
     end
 
-    def run_tests(device_serial, app_apk_path, tests_apk_path, test_classes_to_use, test_packages_to_use, launch_arguments)
+    def run_tests(device_type_dir_name, device_screenshots_paths, device_serial, app_apk_path, tests_apk_path, test_classes_to_use, test_packages_to_use, launch_arguments)
       unless @config[:reinstall_app]
         install_apks(device_serial, app_apk_path, tests_apk_path)
         grant_permissions(device_serial)
+        enable_clean_status_bar(device_serial, app_apk_path)
       end
 
+      number_of_screenshots = 0
+
       @config[:locales].each do |locale|
         if @config[:reinstall_app]
           uninstall_apks(device_serial, @config[:app_package_name], @config[:tests_package_name])
           install_apks(device_serial, app_apk_path, tests_apk_path)
           grant_permissions(device_serial)
+          enable_clean_status_bar(device_serial, app_apk_path)
         end
-        run_tests_for_locale(locale, device_serial, test_classes_to_use, test_packages_to_use, launch_arguments)
+        number_of_screenshots += run_tests_for_locale(device_type_dir_name, device_screenshots_paths, locale, device_serial, test_classes_to_use, test_packages_to_use, launch_arguments)
       end
+
+      number_of_screenshots
     end
 
-    def run_tests_for_locale(locale, device_serial, test_classes_to_use, test_packages_to_use, launch_arguments)
+    def run_tests_for_locale(device_type_dir_name, device_screenshots_paths, locale, device_serial, test_classes_to_use, test_packages_to_use, launch_arguments)
       UI.message("Running tests for locale: #{locale}")
 
       instrument_command = ["-s #{device_serial} shell am instrument --no-window-animation -w",
@@ -271,10 +280,12 @@ module Screengrab
           UI.error("Tests failed")
         end
       end
+
+      pull_screenshots_from_device(locale, device_serial, device_screenshots_paths, device_type_dir_name)
     end
 
-    def pull_screenshots_from_device(device_serial, device_screenshots_paths, device_type_dir_name)
-      UI.message("Pulling captured screenshots from the device")
+    def pull_screenshots_from_device(locale, device_serial, device_screenshots_paths, device_type_dir_name)
+      UI.message("Pulling captured screenshots for locale #{locale} from the device")
       starting_screenshot_count = screenshot_file_names_in(@config[:output_directory], device_type_dir_name).length
 
       UI.verbose("Starting screenshot count is: #{starting_screenshot_count}")
@@ -285,6 +296,7 @@ module Screengrab
       Dir.mktmpdir do |tempdir|
         device_screenshots_paths.each do |device_path|
           if_device_path_exists(device_serial, device_path) do |path|
+            next unless path.include?(locale)
             run_adb_command("-s #{device_serial} pull #{path} #{tempdir}",
                             print_all: false,
                             print_command: true)
@@ -296,7 +308,7 @@ module Screengrab
         #
         # Therefore, we'll move the pulled screenshots from their genericly named folder to one named by the
         # user provided device_type option value to match the directory structure that supply expects
-        move_pulled_screenshots(tempdir, device_type_dir_name)
+        move_pulled_screenshots(locale, tempdir, device_type_dir_name)
       end
 
       ending_screenshot_count = screenshot_file_names_in(@config[:output_directory], device_type_dir_name).length
@@ -305,7 +317,8 @@ module Screengrab
 
       # Because we can't guarantee the screenshot output directory will be empty when we pull, we determine
       # success based on whether there are more screenshots there than when we started.
-      if starting_screenshot_count == ending_screenshot_count
+      # This is only applicable though when `clear_previous_screenshots` is set to `true`.
+      if starting_screenshot_count == ending_screenshot_count && @config[:clear_previous_screenshots]
         UI.error("Make sure you've used Screengrab.screenshot() in your tests and that your expected tests are being run.")
         UI.abort_with_message!("No screenshots were detected 📷❌")
       end
@@ -313,7 +326,7 @@ module Screengrab
       ending_screenshot_count - starting_screenshot_count
     end
 
-    def move_pulled_screenshots(pull_dir, device_type_dir_name)
+    def move_pulled_screenshots(locale, pull_dir, device_type_dir_name)
       # Glob pattern that finds the pulled screenshots directory for each locale
       # Possible matches:
       #   [pull_dir]/en-US/images/screenshots
@@ -337,7 +350,7 @@ module Screengrab
         # specific name, as expected by supply
         #
         # (Moved to: fastlane/metadata/android/en-US/images/phoneScreenshots)
-        dest_dir = File.join(File.dirname(dest_dir), device_type_dir_name)
+        dest_dir = File.join(File.dirname(dest_dir), locale, 'images', device_type_dir_name)
 
         FileUtils.mkdir_p(dest_dir)
         FileUtils.cp_r(src_screenshots, dest_dir)

data/snapshot/lib/snapshot/fixes/simulator_shared_pasteboard.rb

@@ -0,0 +1,16 @@
+require_relative '../module'
+
+module Snapshot
+  module Fixes
+    # Becoming first responder can trigger Pasteboard sync, which can stall and crash the simulator
+    # See https://twitter.com/steipete/status/1227551552317140992
+
+    class SharedPasteboardFix
+      def self.patch
+        UI.verbose("Patching simulator to disable Pasteboard automatic sync")
+
+        Helper.backticks("defaults write com.apple.iphonesimulator PasteboardAutomaticSync -bool false", print: FastlaneCore::Globals.verbose?)
+      end
+    end
+  end
+end

data/snapshot/lib/snapshot/options.rb

@@ -221,7 +221,18 @@ module Snapshot
                                      env_name: "SNAPSHOT_EXECUTE_CONCURRENT_SIMULATORS",
                                      description: "Take snapshots on multiple simulators concurrently. Note: This option is only applicable when running against Xcode 9",
                                      default_value: true,
-                                     is_string: false)
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :disable_slide_to_type,
+                                     env_name: "SNAPSHOT_DISABLE_SLIDE_TO_TYPE",
+                                     description: "Disable the simulator from showing the 'Slide to type' prompt",
+                                     default_value: false,
+                                     optional: true,
+                                     is_string: false),
+        FastlaneCore::ConfigItem.new(key: :cloned_source_packages_path,
+                                     env_name: "SNAPSHOT_CLONED_SOURCE_PACKAGES_PATH",
+                                     description: "Sets a custom path for Swift Package Manager dependencies",
+                                     type: String,
+                                     optional: true)
       ]
     end
   end

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

@@ -11,6 +11,7 @@ module Snapshot
     attr_accessor :dark_mode
     attr_accessor :reinstall_app
     attr_accessor :app_identifier
+    attr_accessor :disable_slide_to_type
 
     # xcode 8
     attr_accessor :number_of_retries
@@ -41,6 +42,7 @@ module Snapshot
       @output_simulator_logs = snapshot_config[:output_simulator_logs]
       @output_directory = snapshot_config[:output_directory]
       @concurrent_simulators = snapshot_config[:concurrent_simulators]
+      @disable_slide_to_type = snapshot_config[:disable_slide_to_type]
 
       launch_arguments = Array(snapshot_config[:launch_arguments])
       # if more than 1 set of arguments, use a tuple with an index

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

@@ -5,6 +5,7 @@ require_relative '../test_command_generator'
 require_relative '../collector'
 require_relative '../fixes/hardware_keyboard_fix'
 require_relative '../fixes/simulator_zoom_fix'
+require_relative '../fixes/simulator_shared_pasteboard'
 
 module Snapshot
   class SimulatorLauncherBase
@@ -53,6 +54,7 @@ module Snapshot
 
       Fixes::SimulatorZoomFix.patch
       Fixes::HardwareKeyboardFix.patch
+      Fixes::SharedPasteboardFix.patch
 
       device_types.each do |type|
         if launcher_config.erase_simulator || launcher_config.localize_simulator || !launcher_config.dark_mode.nil?
@@ -67,6 +69,9 @@ module Snapshot
           # no need to reinstall if device has been erased
           uninstall_app(type)
         end
+        if launcher_config.disable_slide_to_type
+          disable_slide_to_type(type)
+        end
       end
     end
 
@@ -139,6 +144,14 @@ module Snapshot
       end
     end
 
+    def disable_slide_to_type(device_type)
+      device_udid = TestCommandGenerator.device_udid(device_type)
+      if device_udid
+        UI.message("Disabling slide to type on #{device_type}")
+        FastlaneCore::Simulator.disable_slide_to_type(udid: device_udid)
+      end
+    end
+
     def copy_simulator_logs(device_names, language, locale, launch_arguments)
       return unless launcher_config.output_simulator_logs
 

data/spaceship/lib/spaceship/connect_api/models/beta_feedback.rb

@@ -66,6 +66,10 @@ module Spaceship
       def self.all(filter: {}, includes: "tester,build,screenshots", limit: nil, sort: nil)
         return Spaceship::ConnectAPI.get_beta_feedback(filter: filter, includes: includes, limit: limit, sort: sort)
       end
+
+      def delete!
+        return Spaceship::ConnectAPI.delete_beta_feedback(feedback_id: self.id)
+      end
     end
   end
 end

data/spaceship/lib/spaceship/connect_api/models/build.rb

@@ -78,6 +78,10 @@ module Spaceship
         return processing_state != ProcessingState::PROCESSING
       end
 
+      def ready_for_internal_testing?
+        return build_beta_detail.nil? == false && build_beta_detail.ready_for_internal_testing?
+      end
+
       def ready_for_beta_submission?
         raise "No build_beta_detail included" unless build_beta_detail
         return build_beta_detail.ready_for_beta_submission?

data/spaceship/lib/spaceship/connect_api/models/build_beta_detail.rb

@@ -10,6 +10,7 @@ module Spaceship
       attr_accessor :external_build_state
 
       module InternalState
+        PROCESSING = "PROCESSING"
         PROCESSING_EXCEPTION = "PROCESSING_EXCEPTION"
         MISSING_EXPORT_COMPLIANCE = "MISSING_EXPORT_COMPLIANCE"
         READY_FOR_BETA_TESTING = "READY_FOR_BETA_TESTING"
@@ -47,6 +48,10 @@ module Spaceship
       #
       # Helpers
       #
+      #
+      def ready_for_internal_testing?
+        return internal_build_state == InternalState::READY_FOR_BETA_TESTING
+      end
 
       def ready_for_beta_submission?
         return external_build_state == ExternalState::READY_FOR_BETA_SUBMISSION

data/spaceship/lib/spaceship/connect_api/models/certificate.rb

@@ -22,6 +22,8 @@ module Spaceship
       })
 
       module CertificateType
+        DEVELOPMENT = "DEVELOPMENT"
+        DISTRIBUTION = "DISTRIBUTION"
         IOS_DEVELOPMENT = "IOS_DEVELOPMENT"
         IOS_DISTRIBUTION = "IOS_DISTRIBUTION"
         MAC_APP_DISTRIBUTION = "MAC_APP_DISTRIBUTION"

data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb

@@ -326,6 +326,12 @@ module Spaceship
         params = Client.instance.build_params(filter: filter, includes: includes, limit: limit, sort: sort)
         Client.instance.get("betaFeedbacks", params)
       end
+
+      def delete_beta_feedback(feedback_id: nil)
+        raise "Feedback id is nil" if feedback_id.nil?
+
+        Client.instance.delete("betaFeedbacks/#{feedback_id}")
+      end
     end
   end
 end

data/spaceship/lib/spaceship/portal/app.rb

@@ -108,9 +108,18 @@ module Spaceship
         # @return (App) The app you're looking for. This is nil if the app can't be found.
         def find(bundle_id, mac: false)
           raise "`bundle_id` parameter must not be nil" if bundle_id.nil?
-          all(mac: mac).find do |app|
-            return app if app.bundle_id.casecmp(bundle_id) == 0
+          found_app = all(mac: mac).find do |app|
+            app if app.bundle_id.casecmp(bundle_id) == 0
           end
+
+          # Find catalyst enabled mac apps (look for mac first and then iOS)
+          if !found_app && mac
+            found_app = all(mac: false).find do |app|
+              app if app.bundle_id.casecmp(bundle_id) == 0
+            end
+          end
+
+          found_app
         end
       end
 

data/spaceship/lib/spaceship/tunes/iap.rb

@@ -105,17 +105,6 @@ module Spaceship
         end
       end
 
-      # find a specific product
-      # @param product_id (String) Product Id
-      def find(product_id)
-        all.each do |product|
-          if product.product_id == product_id
-            return product
-          end
-        end
-        return nil
-      end
-
       # return all available In-App-Purchase's of current app
       # this is not paged inside iTC-API so if you have a lot if IAP's (2k+)
       # it might take some time to load, same as it takes when you load the list via App Store Connect
@@ -132,6 +121,17 @@ module Spaceship
         return_iaps
       end
 
+      # find a specific product
+      # @param product_id (String) Product Id
+      def find(product_id)
+        all.each do |product|
+          if product.product_id == product_id
+            return product
+          end
+        end
+        return nil
+      end
+
       private
 
       def find_product_with_retries(product_id, max_tries)

data/spaceship/lib/spaceship/tunes/iap_detail.rb

@@ -80,7 +80,9 @@ module Spaceship
           language = localized_version["value"]["localeCode"]
           parsed_versions[language.to_sym] = {
             name: localized_version["value"]["name"]["value"],
-            description: localized_version["value"]["description"]["value"]
+            description: localized_version["value"]["description"]["value"],
+            id: localized_version["value"]["id"],
+            status: localized_version["value"]["status"]
           }
         end
         return parsed_versions
@@ -98,7 +100,8 @@ module Spaceship
             "value" =>   {
               "name" =>  { "value" => current_version[:name] },
               "description" =>  { "value" => current_version[:description] },
-              "localeCode" =>  language.to_s
+              "localeCode" => language.to_s,
+              "id" => current_version[:id]
             }
           }
         end
@@ -167,7 +170,8 @@ module Spaceship
                     "value" =>  {
                       "description" => { "value" => value[:description] },
                       "name" => { "value" => value[:name] },
-                      "localeCode" => language.to_s
+                      "localeCode" => language.to_s,
+                      "id" => value[:id]
                     }
           }
         end

data/spaceship/lib/spaceship/tunes/iap_families.rb

@@ -40,7 +40,7 @@ module Spaceship
         client.create_iap_family(app_id: self.application.apple_id, name: name, product_id: product_id, reference_name: reference_name, versions: versions_array)
       end
 
-      # returns a list of all families
+      # returns a list of all available subscription groups/families of the current In-App-Purchase
       def all
         r = client.iap_families(app_id: self.application.apple_id)
         return_families = []
@@ -52,6 +52,17 @@ module Spaceship
         end
         return_families
       end
+
+      # find a specific family
+      # @param family_id (String) Family Id
+      def find(family_id)
+        all.each do |family|
+          if family.family_id == family_id
+            return family
+          end
+        end
+        return nil
+      end
     end
   end
 end