fastlane-plugin-polidea 0.6.0.pre.1 → 2.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: be076a2a89ea81f868e0bc29afa822e777db46df
-  data.tar.gz: 23beb381c6345feb480f1490c2566194ed0bc35a
+SHA256:
+  metadata.gz: 195dd2dd89017eb5f7bbd37fbed5081b8c2ea42434114e7d2b3930385f7b084b
+  data.tar.gz: 3c58ca6693ead25acc9614bcfe4ae20af1f9326d2d69f801f46c4a52e6df7abf
 SHA512:
-  metadata.gz: f42c2e49419f370e4cdb0a1d63e313eef5af5c2121778d6c498f1483d6766f9be164c07c8a48415f5aa63d10490121d893922b1fa3f8afacd7d639036e3ce7c6
-  data.tar.gz: 96b6c431a3d233948d3e84253ab97b3641e02cf27f254c5211fa88ab42fdcbd0907bff749d804f870401690092be59269718bd8062cdc425e739bbde5c648f22
+  metadata.gz: ce476129578f0e4302a1cc43373ff20e55f01a67dae595d95d13af8d07569d0534d8c961c17e12433e071a7bfe4b56cba8f961c6bf63946d9d128d8565def56a
+  data.tar.gz: f3e9a3d619bbcdb8c7f1d9df4886f567ee3d02c88eeab03cb56bd889f3494a1848750540a74a0a861e6d97a339f5249bf68cbce6b1edf93bfe1d4fcc4c35c65d

data/README.md

@@ -1,6 +1,6 @@
 # fastlane-plugin-polidea
 
-[![build status](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea/badges/master/build.svg)](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea)
+[![build status](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/badges/master/pipeline.svg)](https://gitlab.polidea.com/CICD/fastlane-plugin-polidea/pipelines)
 [![Gem](https://img.shields.io/gem/v/fastlane-plugin-polidea.svg?style=flat)](http://rubygems.org/gems/fastlane-plugin-polidea)
 
 
@@ -20,8 +20,7 @@ Plugin contains following actions:
 - `extract_version`: Extracts app version and build number from .ipa/.apk
 - `get_binary_size`: Measures binary size in bytes
 - `s3`: Custom version of s3 action with Polidea's installation page
-- `mailgun`: Custom version of mailgun action with Polidea's mail template
-- `polidea_store`: Notifies Polidea Store about new app version
+- `fota_mail`: Custom version of mailgun action with Polidea's mail template
 
 See more details [here](https://gitlab2.polidea.com/CI/fastlane-plugin-polidea/blob/master/docs/Actions.md).
 To list all available actions run:
@@ -39,8 +38,7 @@ lane :deploy do
   extract_version
   get_binary_size
   s3
-  polidea_store
-  mailgun(
+  fota_mail(
     to: "piotr.dubiel@polidea.com"
   )
 end

data/lib/fastlane/plugin/polidea.rb

@@ -1,4 +1,5 @@
 require 'fastlane/plugin/polidea/version'
+require 'fastlane/plugin/polidea/helper/analytics'
 
 module Fastlane
   module Polidea
@@ -6,6 +7,12 @@ module Fastlane
     def self.all_classes
       Dir[File.expand_path('**/{actions,helper}/*.rb', File.dirname(__FILE__))]
     end
+
+    def self.session
+      require 'securerandom'
+      @session_id ||= SecureRandom.uuid
+      @session ||= Analytics.new(@session_id)
+    end
   end
 end
 

data/lib/fastlane/plugin/polidea/actions/add_prefix_schema.rb

@@ -8,9 +8,11 @@ module Fastlane
 
     class AddPrefixSchemaAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("add_prefix_schema", config)
+
         prefix_schema = generate_url_scheme
 
-        info_plists = Dir.glob(File.join(config[:path], "**/*Info.plist"))
+        info_plists = Dir.glob(File.join(config[:path], "**/*.plist"))
         UI.user_error!("There isn't any Info.plist in this directory") if info_plists.empty?
         info_plists.each do |info_plist|
           update_plist(info_plist, prefix_schema)
@@ -18,6 +20,7 @@ module Fastlane
 
         Actions.lane_context[SharedValues::PREFIX_SCHEMA] = prefix_schema
 
+        Fastlane::Polidea.session.action_completed("add_prefix_schema")
         prefix_schema
       end
 

data/lib/fastlane/plugin/polidea/actions/extract_app_icon.rb

@@ -10,6 +10,8 @@ module Fastlane
 
     class ExtractAppIconAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_icon", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
         icon_output_path = config[:icon_output_path]
 
@@ -24,6 +26,8 @@ module Fastlane
         else
           UI.important("No icon found.")
         end
+
+        Fastlane::Polidea.session.action_completed("extract_app_icon")
       end
 
       def self.extract_icon(platform, config)

data/lib/fastlane/plugin/polidea/actions/extract_app_info.rb

@@ -15,6 +15,8 @@ module Fastlane
 
     class ExtractAppInfoAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_info", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         icon_output_path = config[:icon_output_path]
@@ -34,6 +36,8 @@ module Fastlane
           SharedValues::APP_VERSION => app_version,
           SharedValues::BUILD_NUMBER => build_number
         )
+
+        Fastlane::Polidea.session.action_completed("extract_app_info")
       end
 
       def self.validate(platform, config)
@@ -65,7 +69,7 @@ module Fastlane
         case platform
         when :ios
           info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(config[:ipa])
-          return info['CFBundleName'], info['CFBundleIdentifier']
+          return info['CFBundleDisplayName'] || info['CFBundleName'], info['CFBundleIdentifier']
         when :android
           apk = Android::Apk.new(config[:apk])
           return apk.manifest.label, apk.manifest.package_name
@@ -133,7 +137,7 @@ module Fastlane
         info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa_file)
         icon_files = ipa_icon_files(info)
         return if icon_files.empty?
-        icon_file_name = icon_files.first
+        icon_file_name = icon_files.sort.last
         Zip::File.open(ipa_file) do |zipfile|
           icon_file = self.largest_ios_icon(zipfile.glob("**/Payload/**/#{icon_file_name}*.png"))
           return nil unless icon_file
@@ -145,13 +149,12 @@ module Fastlane
       end
 
       def self.ipa_icon_files(info)
-        icons = info['CFBundleIcons']
-        unless icons.nil?
-          primary_icon = icons['CFBundlePrimaryIcon']
-          unless primary_icon.nil?
-            return primary_icon['CFBundleIconFiles']
-          end
-        end
+        # try iPhone
+        icons = info.dig('CFBundleIcons', 'CFBundlePrimaryIcon', 'CFBundleIconFiles')
+        return icons unless icons.nil?
+        # try iPad
+        icons = info.dig('CFBundleIcons~ipad', 'CFBundlePrimaryIcon', 'CFBundleIconFiles')
+        return icons unless icons.nil?
         []
       end
 

data/lib/fastlane/plugin/polidea/actions/extract_app_name.rb

@@ -10,6 +10,8 @@ module Fastlane
 
     class ExtractAppNameAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_app_name", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Gets name from ipa/apk
@@ -20,6 +22,7 @@ module Fastlane
 
         UI.success("Successfully extracted app name: '#{Actions.lane_context[SharedValues::APP_NAME]}'")
 
+        Fastlane::Polidea.session.action_completed("extract_app_name")
         app_name
       end
 
@@ -41,7 +44,7 @@ module Fastlane
 
       def self.extract_name_from_ipa(ipa_file)
         info = FastlaneCore::IpaFileAnalyser.fetch_info_plist_file(ipa_file)
-        info['CFBundleName']
+        info['CFBundleDisplayName'] || info['CFBundleName']
       end
 
       ######## android specific

data/lib/fastlane/plugin/polidea/actions/extract_version.rb

@@ -11,6 +11,8 @@ module Fastlane
 
     class ExtractVersionAction < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("extract_version", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Gets version from ipa/apk
@@ -24,6 +26,8 @@ module Fastlane
 
         UI.success("Successfully extracted app version: '#{Actions.lane_context[SharedValues::APP_VERSION]}', build number: #{Actions.lane_context[SharedValues::BUILD_NUMBER]}")
 
+        Fastlane::Polidea.session.action_completed("extract_version")
+
         return app_version, build_number
       end
 

data/lib/fastlane/plugin/polidea/actions/{mailgun.rb → fota_mail.rb}

@@ -1,18 +1,24 @@
 # rubocop:disable Metrics/MethodLength
+require 'redcarpet'
 require 'fastlane/erb_template_helper'
 
 module Fastlane
   module Actions
-    class MailgunAction < Action
+    class FotaMailAction < Action
       def self.is_supported?(platform)
         true
       end
 
       def self.run(options)
+        Fastlane::Polidea.session.action_launched("fota_mail", options)
+
         Actions.verify_gem!('premailer')
         require 'premailer'
         inline_images(options)
         mailgunit(options)
+
+        Fastlane::Polidea.session.action_completed("fota_mail")
+        UI.success "Mail sent!"
       end
 
       def self.description
@@ -51,6 +57,11 @@ module Fastlane
                                       description: "Mail HTML template",
                                       optional: true,
                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :platform,
+                                      env_name: "MAILGUN_PLATFORM",
+                                      description: "Platform used in mail template",
+                                      optional: true,
+                                      default_value: Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]),
           FastlaneCore::ConfigItem.new(key: :app_icon,
                                       env_name: "MAILGUN_APP_ICON",
                                       description: "Path to app icon file",
@@ -99,24 +110,15 @@ module Fastlane
       end
 
       def self.inline_images(options)
-        base_path = "#{__dir__}/../templates/images"
         options[:inline] = [
           qr_code(options[:installation_link])
         ]
         options[:inline] << File.new(options[:app_icon]) if options[:app_icon]
-        images = [
-          "polidea-facebook-icon.png",
-          "polidea-github-icon.png",
-          "polidea-logo.png",
-          "polidea-twitter-icon.png"
-        ]
-        images << "icon-placeholder.png" unless options[:app_icon]
-        options[:inline].concat(images.map { |image| File.new("#{base_path}/#{image}") })
       end
 
       def self.qr_code(installation_link)
         qr_code_path = "/tmp/qr_code.png"
-        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(103, 103, 103)).generate(qr_code_path)
+        QRGenerator.new(installation_link, false, ::ChunkyPNG::Color.rgb(21, 18, 126)).generate(qr_code_path)
         File.new(qr_code_path)
       end
 
@@ -128,8 +130,8 @@ module Fastlane
           https://api.mailgun.net/v3/#{sandbox_domain}/messages \
           -F from='#{options[:from]} <#{options[:postmaster]}>' \
           -F to='#{options[:to]}' \
-          -F subject='#{options[:app_name]} #{options[:app_version]} (#{options[:build_number]}) for #{Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]} is ready to install' \
-          --form-string html=#{Shellwords.escape(body)} \ """ + options[:inline].map { |file| "-F inline=@#{file.path}" }.join(" "), print_command: false
+          -F subject='#{options[:app_name]} #{options[:app_version]} (#{options[:build_number]}) for #{options[:platform]} is ready to install' \
+          --form-string html=#{Shellwords.escape(body)} \ """ + options[:inline].map { |file| "-F inline=@#{file.path}" }.join(" "), print_command: false, print_command_output: false
 
         return body
       end
@@ -138,31 +140,33 @@ module Fastlane
         hash = {
           author: Actions.git_author_email,
           last_commit: Actions.last_git_commit_message,
-          is_android: Actions.lane_context[Actions::SharedValues::PLATFORM_NAME] == :android,
+          is_android: options[:platform] == :android,
           app_icon: options[:app_icon] ? File.basename(options[:app_icon]) : nil,
           app_name: options[:app_name],
           app_version: options[:app_version],
           build_number: options[:build_number],
           installation_link: options[:installation_link],
-          release_notes: (options[:release_notes] || "").split("\n"),
-          platform: Actions.lane_context[Actions::SharedValues::PLATFORM_NAME],
+          release_notes: options[:release_notes],
+          platform: options[:platform],
           release_date: DateTime.now.strftime('%b %d, %Y'),
-          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s
+          binary_size: (options[:binary_size] / 1024.0 / 1024.0).round(2).to_s,
+          qr_code: "qr_code.png"
         }
         hash[:success] = options[:success]
         hash[:ci_build_link] = options[:ci_build_link]
 
-        # grabs module
-        eth = Fastlane::ErbTemplateHelper
         # create html from template
         html_template_path = options[:template_path]
         if html_template_path && File.exist?(html_template_path)
+          eth = Fastlane::ErbTemplateHelper
           html_template = eth.load_from_path(html_template_path)
+          mail_html = eth.render(html_template, hash)
         else
-          html_template = eth.load_from_path("#{__dir__}/../templates/mailgun_template.erb")
+          mail_html = PageGenerator.mail(hash)
         end
+
         premailer = Premailer.new(
-          eth.render(html_template, hash),
+          mail_html,
           { warn_level: Premailer::Warnings::SAFE, with_html_string: true }
         )
         premailer.to_inline_css

data/lib/fastlane/plugin/polidea/actions/{s3.rb → fota_s3.rb}

@@ -28,8 +28,10 @@ module Fastlane
       path: '-P'
     }
 
-    class S3Action < Action
+    class FotaS3Action < Action
       def self.run(config)
+        Fastlane::Polidea.session.action_launched("fota_s3", config)
+
         platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME].to_sym
 
         # Calling fetch on config so that default values will be used
@@ -51,6 +53,8 @@ module Fastlane
         params[:version_file_name] = config[:version_file_name]
         params[:acl] = config[:acl]
         params[:installation_password] = config[:installation_password]
+        params[:release_notes] = config[:release_notes]
+        params[:treat_bucket_as_domain_name] = config[:treat_bucket_as_domain_name]
 
         case platform
         when :ios
@@ -59,6 +63,7 @@ module Fastlane
           upload_android(params)
         end
 
+        Fastlane::Polidea.session.action_completed("fota_s3")
         return true
       end
 
@@ -74,10 +79,14 @@ module Fastlane
         dsym_file = params[:dsym]
         acl = params[:acl]
         installation_password = params[:installation_password]
+        release_notes = params[:release_notes]
+        treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
         validate(params)
         UI.user_error!("No IPA file path given, pass using `ipa: 'ipa path'`") unless ipa_file.to_s.length > 0
 
+        UI.message("Will transform S3 urls from https://s3.amazonaws.com/#{s3_bucket} to https://#{s3_bucket}") if treat_bucket_as_domain_name
+
         bucket = get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
 
         # Gets info used for the plist
@@ -86,7 +95,7 @@ module Fastlane
         build_number = info['CFBundleVersion']
         bundle_id = info['CFBundleIdentifier']
         bundle_version = info['CFBundleShortVersionString']
-        app_name = info['CFBundleName']
+        app_name = info['CFBundleDisplayName'] || info['CFBundleName']
         full_version = "#{bundle_version}.#{build_number}"
         url_part = get_url_part(app_name, "ios", bundle_version, build_number)
 
@@ -99,7 +108,7 @@ module Fastlane
         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)
+        ipa_url = self.upload_file(bucket, ipa_file_name, ipa_file_data, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_IPA_OUTPUT_PATH] = ipa_url
@@ -110,12 +119,11 @@ module Fastlane
           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)
+          dsym_url = self.upload_file(bucket, dsym_file_name, dsym_file_data, acl, treat_bucket_as_domain_name)
 
           # 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
@@ -156,17 +164,18 @@ module Fastlane
         })
 
         # Gets icon from ipa and uploads it
-        icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
+        icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: "itms-services://?action=download-manifest&url=#{URI.encode_www_form_component(plist_url)}",
           installation_password: installation_password,
           app_version: bundle_version,
           build_number: build_number,
           app_name: app_name,
           app_icon: icon_url,
-          platform: "ios"
+          platform: "ios",
+          release_notes: release_notes
         })
 
         # Creates version from template
@@ -190,10 +199,10 @@ module Fastlane
         #
         #####################################
 
-        plist_url = self.upload_file(bucket, plist_file_name, plist_render, acl)
-        html_url = self.upload_file(bucket, html_file_name, html_render, acl)
+        plist_url = self.upload_file(bucket, plist_file_name, plist_render, acl, treat_bucket_as_domain_name)
+        html_url = self.upload_file(bucket, html_file_name, html_render, acl, treat_bucket_as_domain_name)
         self.upload_directory(bucket, html_resources_name, "#{__dir__}/../templates/installation-page", acl)
-        version_url = self.upload_file(bucket, version_file_name, version_render, acl)
+        version_url = self.upload_file(bucket, version_file_name, version_render, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_PLIST_OUTPUT_PATH] = plist_url
@@ -227,10 +236,14 @@ module Fastlane
         icon_file = params[:icon]
         acl = params[:acl]
         installation_password = params[:installation_password]
+        release_notes = params[:release_notes]
+        treat_bucket_as_domain_name = params[:treat_bucket_as_domain_name]
 
         validate(params)
         UI.user_error!("No APK file path given, pass using `apk: 'apk path'`") unless apk_file.to_s.length > 0
 
+        UI.message("Will transform S3 urls from https://s3.amazonaws.com/#{s3_bucket} to https://#{s3_bucket}") if treat_bucket_as_domain_name
+
         bucket = get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
 
         # Gets info used from the apk manifest
@@ -247,7 +260,7 @@ module Fastlane
         apk_file_name = "#{url_part}#{apk_file_basename}"
         apk_file_data = File.open(apk_file, 'rb')
 
-        apk_url = self.upload_file(bucket, apk_file_name, apk_file_data, acl)
+        apk_url = self.upload_file(bucket, apk_file_name, apk_file_data, acl, treat_bucket_as_domain_name)
 
         # Setting action and environment variables
         Actions.lane_context[SharedValues::S3_APK_OUTPUT_PATH] = apk_url
@@ -265,20 +278,21 @@ module Fastlane
         html_resources_name = "#{url_part}installation-page"
 
         # Gets icon from ipa and uploads it
-        icon_url = self.upload_icon(icon_file, url_part, bucket, acl)
+        icon_url = self.upload_icon(icon_file, url_part, bucket, acl, treat_bucket_as_domain_name)
 
         # Creates html from template
-        html_render = PageGenerator.generate({
+        html_render = PageGenerator.installation_page({
           url: apk_url,
           installation_password: installation_password,
           app_version: app_version,
           build_number: build_number,
           app_name: app_name,
           app_icon: icon_url,
-          platform: "android"
+          platform: "android",
+          release_notes: release_notes
         })
 
-        html_url = self.upload_file(bucket, html_file_name, html_render, acl)
+        html_url = self.upload_file(bucket, html_file_name, html_render, acl, treat_bucket_as_domain_name)
         self.upload_directory(bucket, html_resources_name, "#{__dir__}/../templates/installation-page", acl)
 
         Actions.lane_context[SharedValues::S3_HTML_OUTPUT_PATH] = html_url
@@ -310,20 +324,21 @@ module Fastlane
       end
 
       def self.get_bucket(s3_access_key, s3_secret_access_key, s3_region, s3_bucket)
-        self.s3_client(s3_access_key, s3_secret_access_key, s3_region).buckets[s3_bucket]
+        self.s3_client(s3_access_key, s3_secret_access_key, s3_region).bucket(s3_bucket)
       end
 
       def self.s3_client(s3_access_key, s3_secret_access_key, s3_region)
-        Actions.verify_gem!('aws-sdk')
-        require 'aws-sdk'
+        Actions.verify_gem!('aws-sdk-s3')
+        require 'aws-sdk-s3'
+
         if s3_region
-          s3_client = AWS::S3.new(
+          s3_client = Aws::S3::Resource.new(
             access_key_id: s3_access_key,
             secret_access_key: s3_secret_access_key,
             region: s3_region
           )
         else
-          s3_client = AWS::S3.new(
+          s3_client = Aws::S3::Resource.new(
             access_key_id: s3_access_key,
             secret_access_key: s3_secret_access_key
           )
@@ -331,19 +346,28 @@ module Fastlane
         s3_client
       end
 
-      def self.upload_file(bucket, file_name, file_data, acl)
-        obj = bucket.objects.create(file_name, file_data, acl: acl)
+      def self.upload_file(bucket, file_name, file_data, acl, treat_bucket_as_domain_name)
+        obj = bucket.put_object({
+          key: file_name,
+          body: file_data,
+          acl: acl,
+          content_type: Mime.content_type_for_file(file_name)
+        })
 
         # 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
+        if obj.kind_of? Aws::S3::ObjectVersion
           obj = obj.object
         end
 
-        # Return public url
-        shorten_url(obj.public_url.to_s)
+        if treat_bucket_as_domain_name
+          # Return public url
+          shorten_url(obj.public_url.to_s)
+        else
+          obj.public_url.to_s
+        end
       end
 
       def self.upload_directory(bucket, directory_name, directory_path, acl)
@@ -352,8 +376,13 @@ module Fastlane
         files.each do |file|
           local_path = directory_path + file
           s3_path = directory_name + file
-          obj = bucket.objects[s3_path]
-          obj.write(file: local_path, content_type: content_type_for_file(local_path), acl: "public_read")
+
+          bucket.put_object({
+            key: s3_path,
+            body: File.open(local_path),
+            acl: acl,
+            content_type: Mime.content_type_for_file(local_path)
+          })
         end
       end
 
@@ -373,25 +402,6 @@ module Fastlane
         return files
       end
 
-      def self.content_type_for_file(file)
-        file_extension = File.extname(file)
-        extensions_to_type = {
-          ".html" => "text/html",
-          ".png"  => "image/png",
-          ".jpg"  => "text/jpeg",
-          ".gif"  => "image/gif",
-          ".svg"  => "image/svg+xml",
-          ".log"  => "text/plain",
-          ".css"  => "text/css",
-          ".js"   => "application/javascript"
-        }
-        if extensions_to_type[file_extension].nil?
-          "application/octet-stream"
-        else
-          extensions_to_type[file_extension]
-        end
-      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
@@ -415,12 +425,12 @@ module Fastlane
         return path
       end
 
-      def self.upload_icon(icon_path, url_part, bucket, acl)
+      def self.upload_icon(icon_path, url_part, bucket, acl, treat_bucket_as_domain_name)
         return unless icon_path
         icon_file_basename = File.basename(icon_path)
         icon_file = File.open(icon_path)
         icon_file_name = "#{url_part}#{icon_file_basename}"
-        self.upload_file(bucket, icon_file_name, icon_file, acl)
+        self.upload_file(bucket, icon_file_name, icon_file, acl, treat_bucket_as_domain_name)
       end
 
       def self.shorten_url(url)
@@ -504,12 +514,23 @@ module Fastlane
                                        env_name: "S3_ACL",
                                        description: "Uploaded object permissions e.g public_read (default), private, public_read_write, authenticated_read ",
                                        optional: true,
-                                       default_value: "public_read"),
+                                       default_value: "public-read"),
           FastlaneCore::ConfigItem.new(key: :installation_password,
                                        env_name: "INSTALLATION_PASSWORD",
                                        description: "Password for installation page",
                                        optional: true,
-                                       default_value: nil)
+                                       default_value: nil),
+          FastlaneCore::ConfigItem.new(key: :release_notes,
+                                      env_name: "S3_RELEASE_NOTES",
+                                      description: "Release notes",
+                                      type: String,
+                                      optional: true,
+                                      default_value: Actions.lane_context[SharedValues::RELEASE_NOTES]),
+          FastlaneCore::ConfigItem.new(key: :treat_bucket_as_domain_name,
+                                      description: "If it's true, it transforms all urls from https://s3.amazonaws.com/BUCKET_NAME to https://BUCKET_NAME",
+                                      is_string: false,
+                                      optional: true,
+                                      default_value: true)
         ]
       end