fastlane 2.141.0 → 2.146.0

data/fastlane/lib/fastlane/actions/frame_screenshots.rb

@@ -45,6 +45,7 @@ module Fastlane
         [
           'frame_screenshots',
           'frameit # alias for "frame_screenshots"',
+          'frame_screenshots(use_platform: "ANDROID")',
           'frame_screenshots(silver: true)',
           'frame_screenshots(path: "/screenshots")',
           'frame_screenshots(rose_gold: true)'
@@ -56,7 +57,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?(platform)
+        [:ios, :mac, :android].include?(platform)
       end
     end
   end

data/fastlane/lib/fastlane/actions/get_github_release.rb

@@ -129,6 +129,9 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :api_token,
                                        env_name: "FL_GITHUB_RELEASE_API_TOKEN",
                                        sensitive: true,
+                                       code_gen_sensitive: true,
+                                       default_value: ENV["GITHUB_API_TOKEN"],
+                                       default_value_dynamic: true,
                                        description: "GitHub Personal Token (required for private repositories)",
                                        optional: true)
         ]

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -82,7 +82,7 @@ module Fastlane
       def self.get_version_number_from_build_settings!(target, variable, configuration = nil)
         target.build_configurations.each do |config|
           if configuration.nil? || config.name == configuration
-            value = config.build_settings[variable]
+            value = config.resolve_build_setting(variable)
             return value if value
           end
         end

data/fastlane/lib/fastlane/actions/latest_testflight_build_number.rb

@@ -4,12 +4,17 @@ module Fastlane
   module Actions
     module SharedValues
       LATEST_TESTFLIGHT_BUILD_NUMBER = :LATEST_TESTFLIGHT_BUILD_NUMBER
+      LATEST_TESTFLIGHT_VERSION = :LATEST_TESTFLIGHT_VERSION
     end
 
     class LatestTestflightBuildNumberAction < Action
       def self.run(params)
-        build_number = AppStoreBuildNumberAction.run(params)
-        Actions.lane_context[SharedValues::LATEST_TESTFLIGHT_BUILD_NUMBER] = build_number
+        AppStoreBuildNumberAction.run(params)
+        build_nr = Actions.lane_context[SharedValues::LATEST_BUILD_NUMBER]
+        build_v = Actions.lane_context[SharedValues::LATEST_VERSION]
+        Actions.lane_context[SharedValues::LATEST_TESTFLIGHT_BUILD_NUMBER] = build_nr
+        Actions.lane_context[SharedValues::LATEST_TESTFLIGHT_VERSION] = build_v
+        return build_nr
       end
 
       #####################################################
@@ -93,7 +98,8 @@ module Fastlane
 
       def self.output
         [
-          ['LATEST_TESTFLIGHT_BUILD_NUMBER', 'The latest build number of the latest version of the app uploaded to TestFlight']
+          ['LATEST_TESTFLIGHT_BUILD_NUMBER', 'The latest build number of the latest version of the app uploaded to TestFlight'],
+          ['LATEST_TESTFLIGHT_VERSION', 'The version of the latest build number']
         ]
       end
 

data/fastlane/lib/fastlane/actions/notarize.rb

@@ -0,0 +1,183 @@
+module Fastlane
+  module Actions
+    class NotarizeAction < Action
+      def self.run(params)
+        package_path = params[:package]
+        bundle_id = params[:bundle_id]
+        try_early_stapling = params[:try_early_stapling]
+        print_log = params[:print_log]
+        verbose = params[:verbose]
+
+        # Compress and read bundle identifier only for .app bundle.
+        compressed_package_path = nil
+        if File.extname(package_path) == '.app'
+          compressed_package_path = "#{package_path}.zip"
+          Actions.sh(
+            "ditto -c -k --rsrc --keepParent \"#{package_path}\" \"#{compressed_package_path}\"",
+            log: verbose
+          )
+
+          unless bundle_id
+            info_plist_path = File.join(package_path, 'Contents', 'Info.plist')
+            bundle_id = Actions.sh(
+              "/usr/libexec/PlistBuddy -c \"Print :CFBundleIdentifier\" \"#{info_plist_path}\"",
+              log: verbose
+            ).strip
+          end
+        end
+
+        UI.user_error!('Could not read bundle identifier, provide as a parameter') unless bundle_id
+
+        apple_id_account = CredentialsManager::AccountManager.new(user: params[:username])
+
+        # Add password as a temporary environment variable for altool.
+        # Use app specific password if specified.
+        ENV['FL_NOTARIZE_PASSWORD'] = ENV['FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD'] || apple_id_account.password
+
+        UI.message('Uploading package to notarization service, might take a while')
+
+        notarization_upload_command = "xcrun altool --notarize-app -t osx -f \"#{compressed_package_path || package_path}\" --primary-bundle-id #{bundle_id} -u #{apple_id_account.user} -p @env:FL_NOTARIZE_PASSWORD --output-format xml"
+        notarization_upload_command << " --asc-provider \"#{params[:asc_provider]}\"" if params[:asc_provider]
+
+        notarization_upload_response = Actions.sh(
+          notarization_upload_command,
+          log: verbose
+        )
+
+        FileUtils.rm_rf(compressed_package_path) if compressed_package_path
+
+        notarization_upload_plist = Plist.parse_xml(notarization_upload_response)
+        notarization_request_id = notarization_upload_plist['notarization-upload']['RequestUUID']
+
+        UI.success("Successfully uploaded package to notarization service with request identifier #{notarization_request_id}")
+
+        notarization_info = {}
+        while notarization_info.empty? || (notarization_info['Status'] == 'in progress')
+          if notarization_info.empty?
+            UI.message('Waiting to query request status')
+          elsif try_early_stapling
+            UI.message('Request in progress, trying early staple')
+
+            begin
+              self.staple(package_path, verbose)
+              UI.message('Successfully notarized and early stapled package.')
+
+              return
+            rescue
+              UI.message('Early staple failed, waiting to query again')
+            end
+          end
+
+          sleep(30)
+
+          UI.message('Querying request status')
+
+          notarization_info_response = Actions.sh(
+            "xcrun altool --notarization-info #{notarization_request_id} -u #{apple_id_account.user} -p @env:FL_NOTARIZE_PASSWORD --output-format xml",
+            log: verbose
+          )
+
+          notarization_info_plist = Plist.parse_xml(notarization_info_response)
+          notarization_info = notarization_info_plist['notarization-info']
+        end
+
+        log_url = notarization_info['LogFileURL']
+        ENV['FL_NOTARIZE_LOG_FILE_URL'] = log_url
+        log_suffix = ''
+        if log_url && print_log
+          log_response = Net::HTTP.get(URI(log_url))
+          log_json_object = JSON.parse(log_response)
+          log_suffix = ", with log:\n#{JSON.pretty_generate(log_json_object)}"
+        end
+
+        case notarization_info['Status']
+        when 'success'
+          UI.message('Stapling package')
+
+          self.staple(package_path, verbose)
+
+          UI.success("Successfully notarized and stapled package#{log_suffix}")
+        when 'invalid'
+          UI.user_error!("Could not notarize package with message '#{notarization_info['Status Message']}'#{log_suffix}")
+        else
+          UI.crash!("Could not notarize package with status '#{notarization_info['Status']}'#{log_suffix}")
+        end
+      ensure
+        ENV.delete('FL_NOTARIZE_PASSWORD')
+      end
+
+      def self.staple(package_path, verbose)
+        Actions.sh(
+          "xcrun stapler staple \"#{package_path}\"",
+          log: verbose
+        )
+      end
+
+      def self.description
+        'Notarizes a macOS app'
+      end
+
+      def self.authors
+        ['zeplin']
+      end
+
+      def self.available_options
+        username = CredentialsManager::AppfileConfig.try_fetch_value(:apple_dev_portal_id)
+        username ||= CredentialsManager::AppfileConfig.try_fetch_value(:apple_id)
+
+        asc_provider = CredentialsManager::AppfileConfig.try_fetch_value(:itc_team_id)
+
+        [
+          FastlaneCore::ConfigItem.new(key: :package,
+                                       env_name: 'FL_NOTARIZE_PACKAGE',
+                                       description: 'Path to package to notarize, e.g. .app bundle or disk image',
+                                       is_string: true,
+                                       verify_block: proc do |value|
+                                         UI.user_error!("Could not find package at '#{value}'") unless File.exist?(value)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :try_early_stapling,
+                                       env_name: 'FL_NOTARIZE_TRY_EARLY_STAPLING',
+                                       description: 'Whether to try early stapling while the notarization request is in progress',
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean),
+          FastlaneCore::ConfigItem.new(key: :bundle_id,
+                                       env_name: 'FL_NOTARIZE_BUNDLE_ID',
+                                       description: 'Bundle identifier to uniquely identify the package',
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :username,
+                                       env_name: 'FL_NOTARIZE_USERNAME',
+                                       description: 'Apple ID username',
+                                       default_value: username,
+                                       default_value_dynamic: true),
+          FastlaneCore::ConfigItem.new(key: :asc_provider,
+                                       env_name: 'FL_NOTARIZE_ASC_PROVIDER',
+                                       description: 'Provider short name for accounts associated with multiple providers',
+                                       optional: true,
+                                       default_value: asc_provider),
+          FastlaneCore::ConfigItem.new(key: :print_log,
+                                       env_name: 'FL_NOTARIZE_PRINT_LOG',
+                                       description: 'Whether to print notarization log file, listing issues on failure and warnings on success',
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean),
+          FastlaneCore::ConfigItem.new(key: :verbose,
+                                       env_name: 'FL_NOTARIZE_VERBOSE',
+                                       description: 'Whether to log requests',
+                                       optional: true,
+                                       default_value: false,
+                                       type: Boolean)
+        ]
+      end
+
+      def self.is_supported?(platform)
+        platform == :mac
+      end
+
+      def self.category
+        :code_signing
+      end
+    end
+  end
+end

data/fastlane/lib/fastlane/actions/pod_lib_lint.rb

@@ -26,6 +26,7 @@ module Fastlane
         command << "--platforms=#{params[:platforms]}" if params[:platforms]
         command << "--skip-import-validation" if params[:skip_import_validation]
         command << "--skip-tests" if params[:skip_tests]
+        command << "--analyze" if params[:analyze]
 
         result = Actions.sh(command.join(' '))
         UI.success("Pod lib lint Successfully ⬆️ ")
@@ -144,7 +145,12 @@ module Fastlane
                                        description: "Lint skips building and running tests during validation (available since cocoapods >= 1.3)",
                                        type: Boolean,
                                        default_value: false,
-                                       env_name: "FL_POD_LIB_LINT_SKIP_TESTS")
+                                       env_name: "FL_POD_LIB_LINT_SKIP_TESTS"),
+          FastlaneCore::ConfigItem.new(key: :analyze,
+                                       description: "Validate with the Xcode Static Analysis tool (available since cocoapods >= 1.6.1)",
+                                       type: Boolean,
+                                       default_value: false,
+                                       env_name: "FL_POD_LIB_LINT_ANALYZE")
         ]
       end
 

data/fastlane/lib/fastlane/actions/s3.rb

@@ -1,4 +1,5 @@
 require 'fastlane/erb_template_helper'
+require 'fastlane/helper/s3_client_helper'
 require 'ostruct'
 require 'uri'
 require 'cgi'
@@ -15,296 +16,9 @@ module Fastlane
       S3_VERSION_OUTPUT_PATH ||= :S3_VERSION_OUTPUT_PATH
     end
 
-    S3_ARGS_MAP = {
-      ipa: '-f',
-      dsym: '-d',
-      access_key: '-a',
-      secret_access_key: '-s',
-      bucket: '-b',
-      region: '-r',
-      acl: '--acl',
-      source: '--source-dir',
-      path: '-P'
-    }
-
-    # rubocop:disable Metrics/ClassLength
     class S3Action < Action
       def self.run(config)
-        # Calling fetch on config so that default values will be used
-        params = {}
-        params[:ipa] = config[:ipa]
-        params[:dsym] = config[:dsym]
-        params[:access_key] = config[:access_key]
-        params[:secret_access_key] = config[:secret_access_key]
-        params[:bucket] = config[:bucket]
-        params[:region] = config[:region]
-        params[:acl] = config[:acl]
-        params[:source] = config[:source]
-        params[:path] = config[:path]
-        params[:upload_metadata] = config[:upload_metadata]
-        params[:plist_template_path] = config[:plist_template_path]
-        params[:plist_file_name] = config[:plist_file_name]
-        params[:html_template_path] = config[:html_template_path]
-        params[:html_file_name] = config[:html_file_name]
-        params[:version_template_path] = config[:version_template_path]
-        params[:version_file_name] = config[:version_file_name]
-
-        # Pulling parameters for other uses
-        s3_region = params[:region]
-        s3_access_key = params[:access_key]
-        s3_secret_access_key = params[:secret_access_key]
-        s3_bucket = params[:bucket]
-        ipa_file = params[:ipa]
-        dsym_file = params[:dsym]
-        s3_path = params[:path]
-        acl     = params[:acl].to_sym
-
-        UI.user_error!("No S3 access key given, pass using `access_key: 'key'`") unless s3_access_key.to_s.length > 0
-        UI.user_error!("No S3 secret access key given, pass using `secret_access_key: 'secret key'`") unless s3_secret_access_key.to_s.length > 0
-        UI.user_error!("No S3 bucket given, pass using `bucket: 'bucket'`") unless s3_bucket.to_s.length > 0
-        UI.user_error!("No IPA file path given, pass using `ipa: 'ipa path'`") unless ipa_file.to_s.length > 0
-
-        plist_template_path = params[:plist_template_path]
-        plist_file_name = params[:plist_file_name]
-        html_template_path = params[:html_template_path]
-        html_file_name = params[:html_file_name]
-        version_template_path = params[:version_template_path]
-        version_file_name = params[:version_file_name]
-
-        s3_client = self.s3_client(s3_access_key, s3_secret_access_key, s3_region)
-        bucket = s3_client.buckets[s3_bucket]
-
-        url_part = self.expand_path_with_substitutions_from_ipa_plist(ipa_file, s3_path)
-
-        ipa_file_basename = File.basename(ipa_file)
-        ipa_file_name = "#{url_part}#{ipa_file_basename}"
-        ipa_file_data = File.open(ipa_file, 'rb')
-
-        ipa_url = self.upload_file(bucket, ipa_file_name, ipa_file_data, acl)
-
-        # Setting action and environment variables
-        Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH] = ipa_url
-        ENV[SharedValues::S3_IPA_OUTPUT_PATH.to_s] = ipa_url
-
-        if dsym_file
-          dsym_file_basename = File.basename(dsym_file)
-          dsym_file_name = "#{url_part}#{dsym_file_basename}"
-          dsym_file_data = File.open(dsym_file, 'rb')
-
-          dsym_url = self.upload_file(bucket, dsym_file_name, dsym_file_data, acl)
-
-          # Setting action and environment variables
-          Actions.lane_context[SharedValues::S3_DSYM_OUTPUT_PATH] = dsym_url
-          ENV[SharedValues::S3_DSYM_OUTPUT_PATH.to_s] = dsym_url
-
-        end
-
-        if params[:upload_metadata] == false
-          return true
-        end
-
-        #####################################
-        #
-        # html and plist building
-        #
-        #####################################
-
-        # Gets info used for the plist
-        info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa_file)
-
-        build_num = info['CFBundleVersion']
-        bundle_id = info['CFBundleIdentifier']
-        bundle_version = info['CFBundleShortVersionString']
-        title = CGI.escapeHTML(info['CFBundleName'])
-        device_family = info['UIDeviceFamily']
-        full_version = "#{bundle_version}.#{build_num}"
-
-        # Creating plist and html names
-        s3_domain = AWS::Core::Endpoints.hostname(s3_region, 's3') || 's3.amazonaws.com'
-        plist_file_name ||= "#{url_part}#{URI.escape(title)}.plist"
-        plist_url = URI::HTTPS.build(host: s3_domain, path: "/#{s3_bucket}/#{plist_file_name}").to_s
-
-        html_file_name ||= "index.html"
-
-        version_file_name ||= "version.json"
-
-        # grabs module
-        eth = Fastlane::ErbTemplateHelper
-
-        # Creates plist from template
-        if plist_template_path && File.exist?(plist_template_path)
-          plist_template = eth.load_from_path(plist_template_path)
-        else
-          plist_template = eth.load("s3_plist_template")
-        end
-        plist_render = eth.render(plist_template, {
-          url: ipa_url,
-          ipa_url: ipa_url,
-          build_num: build_num,
-          bundle_id: bundle_id,
-          bundle_version: bundle_version,
-          title: title
-        })
-
-        # Creates html from template
-        if html_template_path && File.exist?(html_template_path)
-          html_template = eth.load_from_path(html_template_path)
-        else
-          html_template = eth.load("s3_html_template")
-        end
-
-        html_render = eth.render(html_template, {
-          url: plist_url,
-          plist_url: plist_url,
-          ipa_url: ipa_url,
-          build_num: build_num,
-          bundle_id: bundle_id,
-          bundle_version: bundle_version,
-          title: title,
-          device_family: device_family
-        })
-
-        # Creates version from template
-        if version_template_path && File.exist?(version_template_path)
-          version_template = eth.load_from_path(version_template_path)
-        else
-          version_template = eth.load("s3_version_template")
-        end
-        version_render = eth.render(version_template, {
-          url: plist_url,
-          plist_url: plist_url,
-          ipa_url: ipa_url,
-          build_num: build_num,
-          bundle_version: bundle_version,
-          full_version: full_version
-        })
-
-        #####################################
-        #
-        # html and plist uploading
-        #
-        #####################################
-
-        plist_url = self.upload_file(bucket, plist_file_name, plist_render, acl)
-        html_url = self.upload_file(bucket, html_file_name, html_render, acl)
-        version_url = self.upload_file(bucket, version_file_name, version_render, acl)
-
-        # Setting action and environment variables
-        Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
-        ENV[SharedValues::S3_PLIST_OUTPUT_PATH.to_s] = plist_url
-
-        Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
-        ENV[SharedValues::S3_HTML_OUTPUT_PATH.to_s] = html_url
-
-        Actions.lane_context[SharedValues::S3_VERSION_OUTPUT_PATH] = version_url
-        ENV[SharedValues::S3_VERSION_OUTPUT_PATH.to_s] = version_url
-
-        UI.success("Successfully uploaded ipa file to '#{Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH]}'")
-
-        return true
-      end
-
-      # @return true if loading the AWS SDK from the 'aws-sdk' gem yields the expected v1 API, or false otherwise
-      def self.load_from_original_gem_name
-        begin
-          # We don't use `Actions.verify_gem!` here, because we want to silently be OK with this gem not being
-          # present, in case the user has already migrated to 'aws-sdk-v1' (see #load_from_v1_gem_name)
-          Gem::Specification.find_by_name('aws-sdk')
-          require 'aws-sdk'
-        rescue Gem::LoadError
-          UI.verbose("The 'aws-sdk' gem is not present")
-          return false
-        end
-
-        UI.verbose("The 'aws-sdk' gem is present")
-        true
-      end
-
-      def self.load_from_v1_gem_name
-        Actions.verify_gem!('aws-sdk-v1')
-        require 'aws-sdk-v1'
-      end
-
-      def self.v1_sdk_module_present?
-        begin
-          # Here we'll make sure that the `AWS` module is defined. If it is, the gem is the v1.x API.
-          Object.const_get("AWS")
-        rescue NameError
-          UI.verbose("Couldn't find the needed `AWS` module in the 'aws-sdk' gem")
-          return false
-        end
-
-        UI.verbose("Found the needed `AWS` module in the 'aws-sdk' gem")
-        true
-      end
-
-      def self.s3_client(s3_access_key, s3_secret_access_key, s3_region)
-        # The AWS SDK API changed completely in v2.x. The most stable way to keep using the V1 API is to
-        # require the 'aws-sdk-v1' gem directly. However, for those customers who are using the 'aws-sdk'
-        # gem at v1.x, we don't want to break their setup which currently works.
-        #
-        # Therefore, we will attempt to load the v1 API from the original gem name, but go on to load
-        # from the aws-sdk-v1 gem name if necessary
-        loaded_original_gem = load_from_original_gem_name
-
-        if !loaded_original_gem || !v1_sdk_module_present?
-          load_from_v1_gem_name
-          UI.verbose("Loaded AWS SDK v1.x from the `aws-sdk-v1` gem")
-        else
-          UI.verbose("Loaded AWS SDK v1.x from the `aws-sdk` gem")
-        end
-
-        if s3_region
-          s3_client = AWS::S3.new(
-            access_key_id: s3_access_key,
-            secret_access_key: s3_secret_access_key,
-            region: s3_region
-          )
-        else
-          s3_client = AWS::S3.new(
-            access_key_id: s3_access_key,
-            secret_access_key: s3_secret_access_key
-          )
-        end
-        s3_client
-      end
-
-      def self.upload_file(bucket, file_name, file_data, acl)
-        obj = bucket.objects.create(file_name, file_data, acl: acl)
-
-        # When you enable versioning on a S3 bucket,
-        # writing to an object will create an object version
-        # instead of replacing the existing object.
-        # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
-        if obj.kind_of?(AWS::S3::ObjectVersion)
-          obj = obj.object
-        end
-
-        # Return public url
-        obj.public_url.to_s
-      end
-
-      #
-      # NOT a fan of this as this was taken straight from Shenzhen
-      # https://github.com/nomad/shenzhen/blob/986792db5d4d16a80c865a2748ee96ba63644821/lib/shenzhen/plugins/s3.rb#L32
-      #
-      # Need to find a way to not use this copied method
-      #
-      # AGAIN, I am not happy about this right now.
-      # Using this for prototype reasons.
-      #
-      def self.expand_path_with_substitutions_from_ipa_plist(ipa, path)
-        substitutions = path.scan(/\{CFBundle[^}]+\}/)
-        return path if substitutions.empty?
-        info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa) or return path
-
-        substitutions.uniq.each do |substitution|
-          key = substitution[1...-1]
-          value = info[key]
-          path.gsub!(Regexp.new(substitution), value) if value
-        end
-
-        return path
+        UI.user_error!("Please use the `aws_s3` plugin instead. Install using `fastlane add_plugin aws_s3`.")
       end
 
       def self.description
@@ -423,7 +137,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        false
       end
 
       def self.example_code
@@ -434,8 +148,8 @@ module Fastlane
             access_key: ENV["S3_ACCESS_KEY"],               # Required from user.
             secret_access_key: ENV["S3_SECRET_ACCESS_KEY"], # Required from user.
             bucket: ENV["S3_BUCKET"],                       # Required from user.
-            ipa: "AppName.ipa",                             # Optional is you use `ipa` to build
-            dsym: "AppName.app.dSYM.zip",                   # Optional is you use `ipa` to build
+            ipa: "AppName.ipa",                             # Optional if you use `ipa` to build
+            dsym: "AppName.app.dSYM.zip",                   # Optional if you use `ipa` to build
             path: "v{CFBundleShortVersionString}_b{CFBundleVersion}/", # This is actually the default.
             upload_metadata: true,                          # Upload version.json, plist and HTML. Set to false to skip uploading of these files.
             version_file_name: "app_version.json",          # Name of the file to upload to S3. Defaults to "version.json"