fastlane 2.147.0 → 2.148.0

data/sigh/lib/sigh/commands_generator.rb

@@ -26,6 +26,7 @@ module Sigh
       program :help_formatter, :compact
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       command :renew do |c|
         c.syntax = 'fastlane sigh renew'

data/sigh/lib/sigh/options.rb

@@ -153,7 +153,13 @@ module Sigh
                                      env_name: "SIGH_PROVISIONING_PROFILE_TEMPLATE_NAME",
                                      description: "The name of provisioning profile template. If the developer account has provisioning profile templates (aka: custom entitlements), the template name can be found by inspecting the Entitlements drop-down while creating/editing a provisioning profile (e.g. \"Apple Pay Pass Suppression Development\")",
                                      optional: true,
-                                     default_value: nil)
+                                     default_value: nil),
+        FastlaneCore::ConfigItem.new(key: :fail_on_name_taken,
+                                     env_name: "SIGH_FAIL_ON_NAME_TAKEN",
+                                     description: "Should the command fail if it was about to create a duplicate of an existing provisioning profile. It can happen due to issues on Apple Developer Portal, when profile to be recreated was not properly deleted first",
+                                     optional: true,
+                                     is_string: false,
+                                     default_value: false)
       ]
     end
   end

data/sigh/lib/sigh/runner.rb

@@ -125,7 +125,8 @@ module Sigh
       name = Sigh.config[:provisioning_name] || [bundle_id, profile_type.pretty_type].join(' ')
 
       unless Sigh.config[:skip_fetch_profiles]
-        if Spaceship.provisioning_profile.all.find { |p| p.name == name }
+        if Spaceship.provisioning_profile.all(mac: Sigh.config[:platform].to_s == 'macos').find { |p| p.name == name }
+          UI.user_error!("The name '#{name}' is already taken, and fail_on_name_taken is true") if Sigh.config[:fail_on_name_taken]
           UI.error("The name '#{name}' is already taken, using another one.")
           name += " #{Time.now.to_i}"
         end

data/snapshot/lib/assets/SnapshotHelper.swift

@@ -38,22 +38,13 @@ func snapshot(_ name: String, timeWaitingForIdle timeout: TimeInterval = 20) {
 }
 
 enum SnapshotError: Error, CustomDebugStringConvertible {
-    case cannotDetectUser
-    case cannotFindHomeDirectory
     case cannotFindSimulatorHomeDirectory
-    case cannotAccessSimulatorHomeDirectory(String)
     case cannotRunOnPhysicalDevice
 
     var debugDescription: String {
         switch self {
-        case .cannotDetectUser:
-            return "Couldn't find Snapshot configuration files - can't detect current user "
-        case .cannotFindHomeDirectory:
-            return "Couldn't find Snapshot configuration files - can't detect `Users` dir"
         case .cannotFindSimulatorHomeDirectory:
             return "Couldn't find simulator home location. Please, check SIMULATOR_HOST_HOME env variable."
-        case .cannotAccessSimulatorHomeDirectory(let simulatorHostHome):
-            return "Can't prepare environment. Simulator home location is inaccessible. Does \(simulatorHostHome) exist?"
         case .cannotRunOnPhysicalDevice:
             return "Can't use Snapshot on a physical device."
         }
@@ -75,7 +66,7 @@ open class Snapshot: NSObject {
         Snapshot.waitForAnimations = waitForAnimations
 
         do {
-            let cacheDir = try pathPrefix()
+            let cacheDir = try getCacheDirectory()
             Snapshot.cacheDirectory = cacheDir
             setLanguage(app)
             setLocale(app)
@@ -206,34 +197,22 @@ open class Snapshot: NSObject {
         _ = XCTWaiter.wait(for: [networkLoadingIndicatorDisappeared], timeout: timeout)
     }
 
-    class func pathPrefix() throws -> URL? {
-        let homeDir: URL
+    class func getCacheDirectory() throws -> URL {
+        let cachePath = "Library/Caches/tools.fastlane"
         // on OSX config is stored in /Users/<username>/Library
         // and on iOS/tvOS/WatchOS it's in simulator's home dir
         #if os(OSX)
-            guard let user = ProcessInfo().environment["USER"] else {
-                throw SnapshotError.cannotDetectUser
+            let homeDir = URL(fileURLWithPath: NSHomeDirectory())
+            return homeDir.appendingPathComponent(cachePath)
+        #elseif arch(i386) || arch(x86_64)
+            guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else {
+                throw SnapshotError.cannotFindSimulatorHomeDirectory
             }
-
-            guard let usersDir = FileManager.default.urls(for: .userDirectory, in: .localDomainMask).first else {
-                throw SnapshotError.cannotFindHomeDirectory
-            }
-
-            homeDir = usersDir.appendingPathComponent(user)
+            let homeDir = URL(fileURLWithPath: simulatorHostHome)
+            return homeDir.appendingPathComponent(cachePath)
         #else
-            #if arch(i386) || arch(x86_64)
-                guard let simulatorHostHome = ProcessInfo().environment["SIMULATOR_HOST_HOME"] else {
-                    throw SnapshotError.cannotFindSimulatorHomeDirectory
-                }
-                guard let homeDirUrl = URL(string: simulatorHostHome) else {
-                    throw SnapshotError.cannotAccessSimulatorHomeDirectory(simulatorHostHome)
-                }
-                homeDir = URL(fileURLWithPath: homeDirUrl.path)
-            #else
-                throw SnapshotError.cannotRunOnPhysicalDevice
-            #endif
+            throw SnapshotError.cannotRunOnPhysicalDevice
         #endif
-        return homeDir.appendingPathComponent("Library/Caches/tools.fastlane")
     }
 }
 
@@ -300,4 +279,4 @@ private extension CGFloat {
 
 // Please don't remove the lines below
 // They are used to detect outdated configuration files
-// SnapshotHelperVersion [1.21]
+// SnapshotHelperVersion [1.22]

data/snapshot/lib/snapshot/detect_values.rb

@@ -30,6 +30,9 @@ module Snapshot
 
       Snapshot.project.select_scheme(preferred_to_include: "UITests")
 
+      coerce_to_array_of_strings(:only_testing)
+      coerce_to_array_of_strings(:skip_testing)
+
       # Devices
       if config[:devices].nil? && !Snapshot.project.mac?
         config[:devices] = []
@@ -67,5 +70,17 @@ module Snapshot
         config[:devices] = ["Mac"]
       end
     end
+
+    def self.coerce_to_array_of_strings(config_key)
+      config_value = Snapshot.config[config_key]
+
+      return if config_value.nil?
+
+      # splitting on comma allows us to support comma-separated lists of values
+      # from the command line, even though the ConfigItem is not defined as an
+      # Array type
+      config_value = config_value.split(',') unless config_value.kind_of?(Array)
+      Snapshot.config[config_key] = config_value.map(&:to_s)
+    end
   end
 end

data/snapshot/lib/snapshot/options.rb

@@ -5,6 +5,11 @@ require_relative 'module'
 
 module Snapshot
   class Options
+    def self.verify_type(item_name, acceptable_types, value)
+      type_ok = [Array, String].any? { |type| value.kind_of?(type) }
+      UI.user_error!("'#{item_name}' should be of type #{acceptable_types.join(' or ')} but found: #{value.class.name}") unless type_ok
+    end
+
     def self.available_options
       output_directory = (File.directory?("fastlane") ? "fastlane/screenshots" : "screenshots")
 
@@ -242,7 +247,23 @@ module Snapshot
                                      env_name: "SNAPSHOT_TESTPLAN",
                                      description: "The testplan associated with the scheme that should be used for testing",
                                      is_string: true,
-                                     optional: true)
+                                     optional: true),
+        FastlaneCore::ConfigItem.new(key: :only_testing,
+                                     env_name: "SNAPSHOT_ONLY_TESTING",
+                                     description: "Array of strings matching Test Bundle/Test Suite/Test Cases to run",
+                                     optional: true,
+                                     is_string: false,
+                                     verify_block: proc do |value|
+                                       verify_type('only_testing', [Array, String], value)
+                                     end),
+        FastlaneCore::ConfigItem.new(key: :skip_testing,
+                                     env_name: "SNAPSHOT_SKIP_TESTING",
+                                     description: "Array of strings matching Test Bundle/Test Suite/Test Cases to skip",
+                                     optional: true,
+                                     is_string: false,
+                                     verify_block: proc do |value|
+                                       verify_type('skip_testing', [Array, String], value)
+                                     end)
       ]
     end
   end

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

@@ -59,7 +59,9 @@ module Snapshot
 
       device_types.each do |type|
         if launcher_config.erase_simulator || launcher_config.localize_simulator || !launcher_config.dark_mode.nil?
-          erase_simulator(type)
+          if launcher_config.erase_simulator
+            erase_simulator(type)
+          end
           if launcher_config.localize_simulator
             localize_simulator(type, language, locale)
           end

data/snapshot/lib/snapshot/test_command_generator_base.rb

@@ -30,6 +30,11 @@ module Snapshot
           options << "-testPlan '#{config[:testplan]}'" if config[:testplan]
         end
         options << config[:xcargs] if config[:xcargs]
+
+        # detect_values will ensure that these values are present as Arrays if
+        # they are present at all
+        options += config[:only_testing].map { |test_id| "-only-testing:#{test_id.shellescape}" } if config[:only_testing]
+        options += config[:skip_testing].map { |test_id| "-skip-testing:#{test_id.shellescape}" } if config[:skip_testing]
         return options
       end
 
@@ -91,7 +96,8 @@ module Snapshot
         language_key = locale || language
 
         unless Snapshot.cache[:result_bundle_path][language_key]
-          path = File.join(Snapshot.config[:output_directory], "test_output", language_key, Snapshot.config[:scheme]) + ".test_result"
+          ext = FastlaneCore::Helper.xcode_at_least?(11) ? '.xcresult' : '.test_result'
+          path = File.join(Snapshot.config[:output_directory], "test_output", language_key, Snapshot.config[:scheme]) + ext
           if File.directory?(path)
             FileUtils.remove_dir(path)
           end

data/spaceship/lib/spaceship/commands_generator.rb

@@ -25,6 +25,7 @@ module Spaceship
 
       global_option('-u', '--user USERNAME', 'Specify the Apple ID you want to log in with')
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       command :playground do |c|
         c.syntax = 'fastlane spaceship playground'

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

@@ -158,6 +158,10 @@ module Spaceship
       def post_beta_app_review_submission
         return Spaceship::ConnectAPI.post_beta_app_review_submissions(build_id: id)
       end
+
+      def expire!
+        return Spaceship::ConnectAPI.patch_builds(build_id: id, attributes: { expired: true })
+      end
     end
   end
 end

data/supply/lib/supply/commands_generator.rb

@@ -24,6 +24,7 @@ module Supply
       always_trace!
 
       global_option('--verbose') { FastlaneCore::Globals.verbose = true }
+      global_option('--env STRING[,STRING2]', String, 'Add environment(s) to use with `dotenv`')
 
       command :run do |c|
         c.syntax = 'fastlane supply'

data/supply/lib/supply/options.rb

@@ -281,6 +281,15 @@ module Supply
                                          UI.user_error!("Version code '#{version_code}' is not an integer") if version_code == 0
                                        end
                                      end),
+        FastlaneCore::ConfigItem.new(key: :in_app_update_priority,
+                                     env_name: "SUPPLY_IN_APP_UPDATE_PRIORITY",
+                                     optional: true,
+                                     type: Integer,
+                                     description: "In-app update priority for all the newly added apks in the release. Can take values between [0,5]",
+                                     verify_block: proc do |in_app_update_priority|
+                                       in_app_update_priority = in_app_update_priority.to_i
+                                       UI.user_error!("Invalid in_app_update_priority value '#{in_app_update_priority}'. Values must be between [0,5]") unless (0..5).member?(in_app_update_priority)
+                                     end),
         FastlaneCore::ConfigItem.new(key: :obb_main_references_version,
                                      env_name: "SUPPLY_OBB_MAIN_REFERENCES_VERSION",
                                      description: "References version of 'main' expansion file",

data/supply/lib/supply/uploader.rb

@@ -391,6 +391,10 @@ module Supply
         end
       end
 
+      if Supply.config[:in_app_update_priority]
+        track_release.in_app_update_priority = Supply.config[:in_app_update_priority].to_i
+      end
+
       tracks = client.tracks(Supply.config[:track])
       track = tracks.first
       if track

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.147.0
+  version: 2.148.0
 platform: ruby
 authors:
-- Josh Holtz
-- Joshua Liebowitz
-- Felix Krause
-- Iulian Onofrei
-- Stefan Natchev
-- Fumiya Nakamura
-- Jorge Revuelta H
-- Helmut Januschka
-- Manu Wallner
+- Matthew Ellis
 - Olivier Halligon
+- Kohki Miki
 - Danielle Tomlinson
-- Jérôme Lacoste
-- Matthew Ellis
-- Max Ott
-- Aaron Brager
-- Luka Mirosevic
-- Andrew McBurney
 - Maksym Grebenets
+- Helmut Januschka
 - Daniel Jankowski
-- Jan Piotrowski
-- Kohki Miki
+- Max Ott
+- Stefan Natchev
 - Jimmy Dee
+- Luka Mirosevic
+- Jan Piotrowski
+- Andrew McBurney
+- Aaron Brager
+- Josh Holtz
+- Jérôme Lacoste
+- Fumiya Nakamura
+- Manu Wallner
+- Joshua Liebowitz
+- Iulian Onofrei
+- Jorge Revuelta H
+- Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -625,20 +625,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.37.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -1613,6 +1613,8 @@ files:
 - snapshot/lib/assets/SnapshotHelper.swift
 - snapshot/lib/assets/SnapshotHelperXcode8.swift
 - snapshot/lib/snapshot.rb
+- snapshot/lib/snapshot/.options.rb.swp
+- snapshot/lib/snapshot/.test_command_generator_base.rb.swp
 - snapshot/lib/snapshot/collector.rb
 - snapshot/lib/snapshot/commands_generator.rb
 - snapshot/lib/snapshot/dependency_checker.rb
@@ -1784,7 +1786,6 @@ files:
 - spaceship/lib/spaceship/ui.rb
 - supply/README.md
 - supply/lib/supply.rb
-- supply/lib/supply/.client.rb.swp
 - supply/lib/supply/apk_listing.rb
 - supply/lib/supply/client.rb
 - supply/lib/supply/commands_generator.rb