fastlane 2.105.2 → 2.106.0

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -3,9 +3,6 @@ require 'credentials_manager'
 module Fastlane
   module Actions
     class RegisterDevicesAction < Action
-      UDID_REGEXP_IOS = /^(\h{40}|\h{8}-\h{16})$/
-      UDID_REGEXP_MAC = /^[\h\-]{36}$/
-
       def self.is_supported?(platform)
         [:ios, :mac].include?(platform)
       end
@@ -17,7 +14,6 @@ module Fastlane
         devices_file = params[:devices_file]
 
         mac = params[:platform] == "mac"
-        udid_regexp = mac ? UDID_REGEXP_MAC : UDID_REGEXP_IOS
 
         credentials = CredentialsManager::AccountManager.new(user: params[:username])
         Spaceship.login(credentials.user, credentials.password)
@@ -28,9 +24,8 @@ module Fastlane
 
         if devices
           device_objs = devices.map do |k, v|
-            UI.user_error!("Passed invalid UDID: #{v} for device: #{k}") unless udid_regexp =~ v
             next if existing_devices.map(&:udid).include?(v)
-            Spaceship::Device.create!(name: k, udid: v, mac: mac)
+            try_create_device(name: k, udid: v, mac: mac)
           end
         elsif devices_file
           require 'csv'
@@ -42,9 +37,8 @@ module Fastlane
             next if existing_devices.map(&:udid).include?(device[0])
 
             UI.user_error!("Invalid device line, please provide a file according to the Apple Sample UDID file (http://devimages.apple.com/downloads/devices/Multiple-Upload-Samples.zip)") unless device.count == 2
-            UI.user_error!("Passed invalid UDID: #{device[0]} for device: #{device[1]}") unless udid_regexp =~ device[0]
 
-            Spaceship::Device.create!(name: device[1], udid: device[0], mac: mac)
+            try_create_device(name: device[1], udid: device[0], mac: mac)
           end
         else
           UI.user_error!("You must pass either a valid `devices` or `devices_file`. Please check the readme.")
@@ -54,6 +48,13 @@ module Fastlane
         return device_objs
       end
 
+      def self.try_create_device(name: nil, udid: nil, mac: false)
+        Spaceship::Device.create!(name: name, udid: udid, mac: mac)
+      rescue => ex
+        UI.error(ex.to_s)
+        UI.crash!("Failed to register new device (name: #{name}, UDID: #{udid})")
+      end
+
       def self.description
         "Registers new devices to the Apple Dev Portal"
       end

data/fastlane/lib/fastlane/actions/upload_to_play_store.rb

@@ -16,6 +16,18 @@ module Fastlane
           end
         end
 
+        # If no AAB param was provided, try to fill in the value from lane context.
+        # First GRADLE_ALL_AAB_OUTPUT_PATHS if only one
+        # Else from GRADLE_AAB_OUTPUT_PATH
+        if params[:aab].nil?
+          all_aab_paths = Actions.lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] || []
+          if all_aab_paths.count == 1
+            params[:aab] = all_aab_paths.first
+          else
+            params[:aab] = Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH]
+          end
+        end
+
         Supply.config = params # we already have the finished config
 
         Supply::Uploader.new.perform_upload

data/fastlane/lib/fastlane/helper/crashlytics_helper.rb

@@ -69,7 +69,7 @@ module Fastlane
           if ENV['JAVA_HOME'].nil?
             command = ["java"]
           else
-            command = [Shellwords.escape(File.join(ENV['JAVA_HOME'], "/bin/java"))]
+            command = [File.join(ENV['JAVA_HOME'], "/bin/java").shellescape]
           end
           command << "-jar #{File.expand_path(params[:crashlytics_path])}"
           command << "-androidRes ."

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.105.2'.freeze
+  VERSION = '2.106.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Deliverfile.swift

@@ -18,4 +18,4 @@ class Deliverfile: DeliverfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/Fastlane.swift

@@ -1349,6 +1349,24 @@ func downloadDsyms(username: String,
                                                                                                 RubyCommand.Argument(name: "output_directory", value: outputDirectory)])
   _ = runner.executeCommand(command)
 }
+func downloadFromPlayStore(packageName: String,
+                           metadataPath: String? = nil,
+                           key: String? = nil,
+                           issuer: String? = nil,
+                           jsonKey: String? = nil,
+                           jsonKeyData: String? = nil,
+                           rootUrl: String? = nil,
+                           timeout: Int = 300) {
+  let command = RubyCommand(commandID: "", methodName: "download_from_play_store", className: nil, args: [RubyCommand.Argument(name: "package_name", value: packageName),
+                                                                                                          RubyCommand.Argument(name: "metadata_path", value: metadataPath),
+                                                                                                          RubyCommand.Argument(name: "key", value: key),
+                                                                                                          RubyCommand.Argument(name: "issuer", value: issuer),
+                                                                                                          RubyCommand.Argument(name: "json_key", value: jsonKey),
+                                                                                                          RubyCommand.Argument(name: "json_key_data", value: jsonKeyData),
+                                                                                                          RubyCommand.Argument(name: "root_url", value: rootUrl),
+                                                                                                          RubyCommand.Argument(name: "timeout", value: timeout)])
+  _ = runner.executeCommand(command)
+}
 func dsymZip(archivePath: String? = nil,
              dsymPath: String? = nil,
              all: Bool = false) {
@@ -2076,6 +2094,7 @@ func makeChangelogFromJenkins(fallbackChangelog: String = "",
 func match(gitUrl: String = matchfile.gitUrl,
            gitBranch: String = matchfile.gitBranch,
            type: String = matchfile.type,
+           storageMode: String = matchfile.storageMode,
            appIdentifier: [String] = matchfile.appIdentifier,
            username: String = matchfile.username,
            keychainName: String = matchfile.keychainName,
@@ -2090,7 +2109,6 @@ func match(gitUrl: String = matchfile.gitUrl,
            skipConfirmation: Bool = matchfile.skipConfirmation,
            shallowClone: Bool = matchfile.shallowClone,
            cloneBranchDirectly: Bool = matchfile.cloneBranchDirectly,
-           workspace: String? = matchfile.workspace,
            forceForNewDevices: Bool = matchfile.forceForNewDevices,
            skipDocs: Bool = matchfile.skipDocs,
            platform: String = matchfile.platform,
@@ -2098,6 +2116,7 @@ func match(gitUrl: String = matchfile.gitUrl,
   let command = RubyCommand(commandID: "", methodName: "match", className: nil, args: [RubyCommand.Argument(name: "git_url", value: gitUrl),
                                                                                        RubyCommand.Argument(name: "git_branch", value: gitBranch),
                                                                                        RubyCommand.Argument(name: "type", value: type),
+                                                                                       RubyCommand.Argument(name: "storage_mode", value: storageMode),
                                                                                        RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                        RubyCommand.Argument(name: "username", value: username),
                                                                                        RubyCommand.Argument(name: "keychain_name", value: keychainName),
@@ -2112,7 +2131,6 @@ func match(gitUrl: String = matchfile.gitUrl,
                                                                                        RubyCommand.Argument(name: "skip_confirmation", value: skipConfirmation),
                                                                                        RubyCommand.Argument(name: "shallow_clone", value: shallowClone),
                                                                                        RubyCommand.Argument(name: "clone_branch_directly", value: cloneBranchDirectly),
-                                                                                       RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                        RubyCommand.Argument(name: "force_for_new_devices", value: forceForNewDevices),
                                                                                        RubyCommand.Argument(name: "skip_docs", value: skipDocs),
                                                                                        RubyCommand.Argument(name: "platform", value: platform),
@@ -3342,6 +3360,7 @@ func swiftlint(mode: String = "lint",
 func syncCodeSigning(gitUrl: String,
                      gitBranch: String = "master",
                      type: String = "development",
+                     storageMode: String = "git",
                      appIdentifier: [String],
                      username: String,
                      keychainName: String = "login.keychain",
@@ -3356,7 +3375,6 @@ func syncCodeSigning(gitUrl: String,
                      skipConfirmation: Bool = false,
                      shallowClone: Bool = false,
                      cloneBranchDirectly: Bool = false,
-                     workspace: String? = nil,
                      forceForNewDevices: Bool = false,
                      skipDocs: Bool = false,
                      platform: String = "ios",
@@ -3364,6 +3382,7 @@ func syncCodeSigning(gitUrl: String,
   let command = RubyCommand(commandID: "", methodName: "sync_code_signing", className: nil, args: [RubyCommand.Argument(name: "git_url", value: gitUrl),
                                                                                                    RubyCommand.Argument(name: "git_branch", value: gitBranch),
                                                                                                    RubyCommand.Argument(name: "type", value: type),
+                                                                                                   RubyCommand.Argument(name: "storage_mode", value: storageMode),
                                                                                                    RubyCommand.Argument(name: "app_identifier", value: appIdentifier),
                                                                                                    RubyCommand.Argument(name: "username", value: username),
                                                                                                    RubyCommand.Argument(name: "keychain_name", value: keychainName),
@@ -3378,7 +3397,6 @@ func syncCodeSigning(gitUrl: String,
                                                                                                    RubyCommand.Argument(name: "skip_confirmation", value: skipConfirmation),
                                                                                                    RubyCommand.Argument(name: "shallow_clone", value: shallowClone),
                                                                                                    RubyCommand.Argument(name: "clone_branch_directly", value: cloneBranchDirectly),
-                                                                                                   RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                                    RubyCommand.Argument(name: "force_for_new_devices", value: forceForNewDevices),
                                                                                                    RubyCommand.Argument(name: "skip_docs", value: skipDocs),
                                                                                                    RubyCommand.Argument(name: "platform", value: platform),
@@ -3983,7 +4001,7 @@ func xcov(workspace: String? = nil,
           coverallsServiceJobId: String? = nil,
           coverallsRepoToken: String? = nil,
           xcconfig: String? = nil,
-          ideFoundationPath: String = "/Applications/Xcode-10.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
+          ideFoundationPath: String = "/Applications/Xcode.app/Contents/Developer/../Frameworks/IDEFoundation.framework/Versions/A/IDEFoundation",
           legacySupport: Bool = false) {
   let command = RubyCommand(commandID: "", methodName: "xcov", className: nil, args: [RubyCommand.Argument(name: "workspace", value: workspace),
                                                                                       RubyCommand.Argument(name: "project", value: project),
@@ -4091,4 +4109,4 @@ let screengrabfile: Screengrabfile = Screengrabfile()
 let snapshotfile: Snapshotfile = Snapshotfile()
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.29]
+// FastlaneRunnerAPIVersion [0.9.30]

data/fastlane/swift/Gymfile.swift

@@ -18,4 +18,4 @@ class Gymfile: GymfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/Matchfile.swift

@@ -18,4 +18,4 @@ class Matchfile: MatchfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/MatchfileProtocol.swift

@@ -2,6 +2,7 @@ protocol MatchfileProtocol: class {
   var gitUrl: String { get }
   var gitBranch: String { get }
   var type: String { get }
+  var storageMode: String { get }
   var appIdentifier: [String] { get }
   var username: String { get }
   var keychainName: String { get }
@@ -16,7 +17,6 @@ protocol MatchfileProtocol: class {
   var skipConfirmation: Bool { get }
   var shallowClone: Bool { get }
   var cloneBranchDirectly: Bool { get }
-  var workspace: String? { get }
   var forceForNewDevices: Bool { get }
   var skipDocs: Bool { get }
   var platform: String { get }
@@ -27,6 +27,7 @@ extension MatchfileProtocol {
   var gitUrl: String { return "" }
   var gitBranch: String { return "master" }
   var type: String { return "development" }
+  var storageMode: String { return "git" }
   var appIdentifier: [String] { return [] }
   var username: String { return "" }
   var keychainName: String { return "login.keychain" }
@@ -41,14 +42,12 @@ extension MatchfileProtocol {
   var skipConfirmation: Bool { return false }
   var shallowClone: Bool { return false }
   var cloneBranchDirectly: Bool { return false }
-  var workspace: String? { return nil }
   var forceForNewDevices: Bool { return false }
   var skipDocs: Bool { return false }
   var platform: String { return "ios" }
   var templateName: String? { return nil }
 }
 
-
 // Please don't remove the lines below
 // They are used to detect outdated files
-// FastlaneRunnerAPIVersion [0.9.1]
+// FastlaneRunnerAPIVersion [0.9.2]

data/fastlane/swift/Precheckfile.swift

@@ -18,4 +18,4 @@ class Precheckfile: PrecheckfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/Scanfile.swift

@@ -18,4 +18,4 @@ class Scanfile: ScanfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/Screengrabfile.swift

@@ -18,4 +18,4 @@ class Screengrabfile: ScreengrabfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane/swift/Snapshotfile.swift

@@ -18,4 +18,4 @@ class Snapshotfile: SnapshotfileProtocol {
 
 
 
-// Generated with fastlane 2.105.2
+// Generated with fastlane 2.106.0

data/fastlane_core/lib/fastlane_core.rb

@@ -10,7 +10,6 @@ require_relative 'fastlane_core/helper'
 require_relative 'fastlane_core/configuration/configuration'
 require_relative 'fastlane_core/update_checker/update_checker'
 require_relative 'fastlane_core/languages'
-require_relative 'fastlane_core/itunes_search_api'
 require_relative 'fastlane_core/cert_checker'
 require_relative 'fastlane_core/ipa_file_analyser'
 require_relative 'fastlane_core/itunes_transporter'

data/fastlane_core/lib/fastlane_core/device_manager.rb

@@ -292,7 +292,7 @@ module FastlaneCore
       def copy_logarchive(device, log_identity, logs_destination_dir)
         require 'shellwords'
 
-        logarchive_dst = Shellwords.escape(File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive"))
+        logarchive_dst = File.join(logs_destination_dir, "system_logs-#{log_identity}.logarchive").shellescape
         FileUtils.rm_rf(logarchive_dst)
         FileUtils.mkdir_p(File.expand_path("..", logarchive_dst))
         command = "xcrun simctl spawn #{device.udid} log collect --output #{logarchive_dst} 2>/dev/null"

data/fastlane_core/lib/fastlane_core/helper.rb

@@ -72,7 +72,7 @@ module FastlaneCore
     # @return [boolean] true if building in a known CI environment
     def self.ci?
       # Check for Jenkins, Travis CI, ... environment variables
-      ['JENKINS_HOME', 'JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI', 'APPCENTER_BUILD_ID', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey', 'GITLAB_CI', 'XCS'].each do |current|
+      ['JENKINS_HOME', 'JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI', 'APPCENTER_BUILD_ID', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey', 'GITLAB_CI', 'XCS', 'TF_BUILD'].each do |current|
         return true if ENV.key?(current)
       end
       return false

data/fastlane_core/lib/fastlane_core/itunes_transporter.rb

@@ -33,14 +33,6 @@ module FastlaneCore
     def execute(command, hide_output)
       return command if Helper.test?
 
-      # Workaround because the traditional transporter broke on 1st March 2018
-      # More information https://github.com/fastlane/fastlane/issues/11958
-      # As there was no communication from Apple, we don't know if this is a temporary
-      # server outage, or something they changed without giving a heads-up
-      if ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"].to_s.length == 0
-        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = "-t DAV"
-      end
-
       @errors = []
       @warnings = []
       @all_lines = []
@@ -151,6 +143,17 @@ module FastlaneCore
         end
       end
     end
+
+    def additional_upload_parameters
+      # Workaround because the traditional transporter broke on 1st March 2018
+      # More information https://github.com/fastlane/fastlane/issues/11958
+      # As there was no communication from Apple, we don't know if this is a temporary
+      # server outage, or something they changed without giving a heads-up
+      if ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"].to_s.length == 0
+        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = "-t DAV"
+      end
+      return ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"]
+    end
   end
 
   # Generates commands and executes the iTMSTransporter through the shell script it provides by the same name
@@ -162,7 +165,7 @@ module FastlaneCore
         "-u \"#{username}\"",
         "-p #{shell_escaped_password(password)}",
         "-f \"#{source}\"",
-        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
+        additional_upload_parameters, # that's here, because the user might overwrite the -t option
         "-t Signiant",
         "-k 100000",
         ("-WONoPause true" if Helper.windows?), # Windows only: process instantly returns instead of waiting for key press
@@ -236,7 +239,7 @@ module FastlaneCore
         "-u #{username.shellescape}",
         "-p #{password.shellescape}",
         "-f #{source.shellescape}",
-        ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"], # that's here, because the user might overwrite the -t option
+        additional_upload_parameters, # that's here, because the user might overwrite the -t option
         '-t Signiant',
         '-k 100000',
         ("-itc_provider #{provider_short_name}" unless provider_short_name.to_s.empty?),

data/frameit/lib/frameit/editor.rb

@@ -19,8 +19,9 @@ module Frameit
       self.screenshot = screenshot
       prepare_image
 
-      if load_frame # Mac doesn't need a frame
-        self.frame = MiniMagick::Image.open(load_frame)
+      frame = load_frame
+      if frame # Mac doesn't need a frame
+        self.frame = MiniMagick::Image.open(frame)
         # Rotate the frame according to the device orientation
         self.frame.rotate(self.rotation_for_device_orientation)
       elsif self.class == Editor

data/frameit/lib/frameit/frame_downloader.rb

@@ -21,7 +21,7 @@ module Frameit
       files = JSON.parse(download_file("files.json"))
       files.each_with_index do |current, index|
         content = download_file(current, txt: "#{index + 1} of #{files.count} files")
-        File.write(File.join(templates_path, current), content)
+        File.binwrite(File.join(templates_path, current), content)
       end
       File.write(File.join(templates_path, "offsets.json"), download_file("offsets.json"))
 

data/match/lib/match.rb

@@ -3,10 +3,10 @@ require_relative 'match/runner'
 require_relative 'match/nuke'
 require_relative 'match/utils'
 require_relative 'match/table_printer'
-require_relative 'match/git_helper'
 require_relative 'match/generator'
 require_relative 'match/setup'
-require_relative 'match/encrypt'
 require_relative 'match/spaceship_ensure'
 require_relative 'match/change_password'
+require_relative 'match/storage'
+require_relative 'match/encryption'
 require_relative 'match/module'

data/match/lib/match/change_password.rb

@@ -1,31 +1,44 @@
 require_relative 'module'
-require_relative 'encrypt'
-require_relative 'git_helper'
+
+require_relative 'storage'
+require_relative 'encryption'
 
 module Match
   # These functions should only be used while in (UI.) interactive mode
   class ChangePassword
-    def self.update(params: nil, from: nil, to: nil)
+    def self.update(params: nil)
       ensure_ui_interactive
-      to ||= ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: false)
-      from ||= ChangePassword.ask_password(message: "Old passphrase for Git Repo: ", confirm: true)
-      GitHelper.clear_changes
-      workspace = GitHelper.clone(params[:git_url],
-                                  params[:shallow_clone],
-                                  manual_password: from,
-                                  skip_docs: params[:skip_docs],
-                                  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])
-      Encrypt.new.clear_password(params[:git_url])
-      Encrypt.new.store_password(params[:git_url], to)
+
+      to = ChangePassword.ask_password(message: "New passphrase for Git Repo: ", confirm: true)
+
+      # Choose the right storage and encryption implementations
+      storage = Storage.for_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        shallow_clone: params[:shallow_clone],
+        skip_docs: params[:skip_docs],
+        git_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]
+      })
+      storage.download
+
+      encryption = Encryption.for_storage_mode(params[:storage_mode], {
+        git_url: params[:git_url],
+        working_directory: storage.working_directory
+      })
+      encryption.decrypt_files
+
+      encryption.clear_password
+      encryption.store_password(to)
 
       message = "[fastlane] Changed passphrase"
-      GitHelper.commit_changes(workspace, message, params[:git_url], params[:git_branch])
+      encryption.encrypt_files
+      storage.save_changes!(custom_message: message)
     end
 
-    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: true)
+    # This method is called from both here, and from `openssl.rb`
+    def self.ask_password(message: "Passphrase for Git Repo: ", confirm: nil)
       ensure_ui_interactive
       loop do
         password = UI.password(message)