pantograph 0.1.12 → 0.1.13

data/pantograph/lib/pantograph/actions/download.rb

@@ -26,7 +26,7 @@ module Pantograph
       #####################################################
 
       def self.description
-        "Download a file from a remote server (e.g. JSON file)"
+        'Download a file from a remote server (e.g. JSON file)'
       end
 
       def self.details
@@ -40,7 +40,7 @@ module Pantograph
       def self.available_options
         [
           PantographCore::ConfigItem.new(key: :url,
-                                       env_name: "FL_DOWNLOAD_URL",
+                                       env_name: 'DOWNLOAD_URL',
                                        description: "The URL that should be downloaded",
                                        verify_block: proc do |value|
                                          UI.important("The URL doesn't start with http or https") unless value.start_with?("http")
@@ -65,7 +65,7 @@ module Pantograph
       end
 
       def self.authors
-        ["KrauseFx"]
+        ['KrauseFx']
       end
 
       def self.is_supported?(platform)

data/pantograph/lib/pantograph/actions/ensure_git_branch.rb

@@ -20,20 +20,20 @@ module Pantograph
       #####################################################
 
       def self.description
-        "Raises an exception if not on a specific git branch"
+        'Raises an exception if not on a specific git branch'
       end
 
       def self.details
         [
-          "This action will check if your git repo is checked out to a specific branch.",
-          "You may only want to make releases from a specific branch, so `ensure_git_branch` will stop a lane if it was accidentally executed on an incorrect branch."
+          'This action will check if your git repo is checked out to a specific branch.',
+          'You may only want to make releases from a specific branch, so `ensure_git_branch` will stop a lane if it was accidentally executed on an incorrect branch.'
         ].join("\n")
       end
 
       def self.available_options
         [
           PantographCore::ConfigItem.new(key: :branch,
-                                       env_name: "FL_ENSURE_GIT_BRANCH_NAME",
+                                       env_name: 'ENSURE_GIT_BRANCH_NAME',
                                        description: "The branch that should be checked for. String that can be either the full name of the branch or a regex to match",
                                        type: String,
                                        default_value: 'master')

data/pantograph/lib/pantograph/actions/ensure_git_status_clean.rb

@@ -14,7 +14,7 @@ module Pantograph
           UI.success('Git status is clean, all good! 💪')
           Actions.lane_context[SharedValues::GIT_REPO_WAS_CLEAN_ON_START] = true
         else
-          error_message = "Git repository is dirty! Please ensure the repo is in a clean state by committing/stashing/discarding all changes first."
+          error_message = 'Git repository is dirty! Please ensure the repo is in a clean state by committing/stashing/discarding all changes first.'
           error_message += "\nUncommitted changes:\n#{repo_status}" if params[:show_uncommitted_changes]
           if params[:show_diff]
             repo_diff = Actions.sh("git diff")
@@ -25,14 +25,14 @@ module Pantograph
       end
 
       def self.description
-        "Raises an exception if there are uncommitted git changes"
+        'Raises an exception if there are uncommitted git changes'
       end
 
       def self.details
         [
-          "A sanity check to make sure you are working in a repo that is clean.",
-          "Especially useful to put at the beginning of your Pantfile in the `before_all` block, if some of your other actions will touch your filesystem, do things to your git repo, or just as a general reminder to save your work.",
-          "Also needed as a prerequisite for some other actions like `reset_git_repo`."
+          'A sanity check to make sure you are working in a repo that is clean.',
+          'Especially useful to put at the beginning of your Pantfile in the `before_all` block, if some of your other actions will touch your filesystem, do things to your git repo, or just as a general reminder to save your work.',
+          'Also needed as a prerequisite for some other actions like `reset_git_repo`.'
         ].join("\n")
       end
 
@@ -43,7 +43,7 @@ module Pantograph
       end
 
       def self.author
-        ["lmirosevic", "antondomashnev"]
+        ['lmirosevic', 'antondomashnev']
       end
 
       def self.example_code
@@ -55,14 +55,14 @@ module Pantograph
       def self.available_options
         [
           PantographCore::ConfigItem.new(key: :show_uncommitted_changes,
-                                       env_name: "FL_ENSURE_GIT_STATUS_CLEAN_SHOW_UNCOMMITTED_CHANGES",
-                                       description: "The flag whether to show uncommitted changes if the repo is dirty",
+                                       env_name: 'ENSURE_GIT_STATUS_CLEAN_SHOW_UNCOMMITTED_CHANGES',
+                                       description: 'The flag whether to show uncommitted changes if the repo is dirty',
                                        optional: true,
                                        default_value: false,
                                        is_string: false),
           PantographCore::ConfigItem.new(key: :show_diff,
-                                       env_name: "FL_ENSURE_GIT_STATUS_CLEAN_SHOW_DIFF",
-                                       description: "The flag whether to show the git diff if the repo is dirty",
+                                       env_name: 'ENSURE_GIT_STATUS_CLEAN_SHOW_DIFF',
+                                       description: 'The flag whether to show the git diff if the repo is dirty',
                                        optional: true,
                                        default_value: false,
                                        is_string: false)

data/pantograph/lib/pantograph/actions/erb.rb

@@ -14,13 +14,13 @@ module Pantograph
       #####################################################
 
       def self.description
-        "Allows to Generate output files based on ERB templates"
+        'Allows to Generate output files based on ERB templates'
       end
 
       def self.details
         [
-          "Renders an ERB template with `:placeholders` given as a hash via parameter.",
-          "If no `:destination` is set, it returns the rendered template as string."
+          'Renders an ERB template with `:placeholders` given as a hash via parameter.',
+          'If no `:destination` is set, it returns the rendered template as string.'
         ].join("\n")
       end
 
@@ -28,21 +28,21 @@ module Pantograph
         [
 
           PantographCore::ConfigItem.new(key: :template,
-                                       short_option: "-T",
-                                       env_name: "FL_ERB_SRC",
-                                       description: "ERB Template File",
+                                       short_option: '-T',
+                                       env_name: 'ERB_SRC',
+                                       description: 'ERB Template File',
                                        optional: false,
                                        type: String),
           PantographCore::ConfigItem.new(key: :destination,
-                                       short_option: "-D",
-                                       env_name: "FL_ERB_DST",
-                                       description: "Destination file",
+                                       short_option: '-D',
+                                       env_name: 'ERB_DST',
+                                       description: 'Destination file',
                                        optional: true,
                                        type: String),
           PantographCore::ConfigItem.new(key: :placeholders,
-                                       short_option: "-p",
-                                       env_name: "FL_ERB_PLACEHOLDERS",
-                                       description: "Placeholders given as a hash",
+                                       short_option: '-p',
+                                       env_name: 'ERB_PLACEHOLDERS',
+                                       description: 'Placeholders given as a hash',
                                        default_value: {},
                                        is_string: false,
                                        type: Hash)

data/pantograph/lib/pantograph/actions/get_github_release.rb

@@ -95,7 +95,7 @@ module Pantograph
         SAMPLE
 
         [
-          "This will return all information about a release. For example:".markdown_preserve_newlines,
+          'This will return all information about a release. For example:'.markdown_preserve_newlines,
           sample
         ].join("\n")
       end
@@ -109,27 +109,27 @@ module Pantograph
       def self.available_options
         [
           PantographCore::ConfigItem.new(key: :url,
-                                       env_name: "FL_GET_GITHUB_RELEASE_URL",
-                                       description: "The path to your repo, e.g. 'KrauseFx/pantograph'",
+                                       env_name: 'GET_GITHUB_RELEASE_URL',
+                                       description: "The path to your repo, e.g. 'johnknapprs/pantograph'",
                                        verify_block: proc do |value|
-                                         UI.user_error!("Please only pass the path, e.g. 'KrauseFx/pantograph'") if value.include?("github.com")
+                                         UI.user_error!("Please only pass the path, e.g. 'KrauseFx/pantograph'") if value.include?('github.com')
                                          UI.user_error!("Please only pass the path, e.g. 'KrauseFx/pantograph'") if value.split('/').count != 2
                                        end),
           PantographCore::ConfigItem.new(key: :server_url,
-                                       env_name: "FL_GITHUB_RELEASE_SERVER_URL",
+                                       env_name: 'GITHUB_RELEASE_SERVER_URL',
                                        description: "The server url. e.g. 'https://your.github.server/api/v3' (Default: 'https://api.github.com')",
                                        default_value: "https://api.github.com",
                                        optional: true,
                                        verify_block: proc do |value|
-                                         UI.user_error!("Please include the protocol in the server url, e.g. https://your.github.server") unless value.include?("//")
+                                         UI.user_error!('Please include the protocol in the server url, e.g. https://your.github.server') unless value.include?("//")
                                        end),
           PantographCore::ConfigItem.new(key: :version,
-                                       env_name: "FL_GET_GITHUB_RELEASE_VERSION",
-                                       description: "The version tag of the release to check"),
+                                       env_name: 'GET_GITHUB_RELEASE_VERSION',
+                                       description: 'The version tag of the release to check'),
           PantographCore::ConfigItem.new(key: :api_token,
-                                       env_name: "FL_GITHUB_RELEASE_API_TOKEN",
+                                       env_name: 'GITHUB_RELEASE_API_TOKEN',
                                        sensitive: true,
-                                       description: "GitHub Personal Token (required for private repositories)",
+                                       description: 'GitHub Personal Token (required for private repositories)',
                                        optional: true)
         ]
       end

data/pantograph/lib/pantograph/actions/github_api.rb

@@ -79,26 +79,26 @@ module Pantograph
         def available_options
           [
             PantographCore::ConfigItem.new(key: :server_url,
-                                         env_name: "FL_GITHUB_API_SERVER_URL",
+                                         env_name: 'GITHUB_API_SERVER_URL',
                                          description: "The server url. e.g. 'https://your.internal.github.host/api/v3' (Default: 'https://api.github.com')",
-                                         default_value: "https://api.github.com",
+                                         default_value: 'https://api.github.com',
                                          optional: true,
                                          verify_block: proc do |value|
                                            UI.user_error!("Please include the protocol in the server url, e.g. https://your.github.server/api/v3") unless value.include?("//")
                                          end),
             PantographCore::ConfigItem.new(key: :api_token,
-                                         env_name: "FL_GITHUB_API_TOKEN",
-                                         description: "Personal API Token for GitHub - generate one at https://github.com/settings/tokens",
+                                         env_name: 'GITHUB_API_TOKEN',
+                                         description: 'Personal API Token for GitHub - generate one at https://github.com/settings/tokens',
                                          sensitive: true,
                                          code_gen_sensitive: true,
                                          type: String,
-                                         default_value: ENV["GITHUB_API_TOKEN"],
+                                         default_value: ENV['GITHUB_API_TOKEN'],
                                          default_value_dynamic: true,
                                          optional: false),
             PantographCore::ConfigItem.new(key: :http_method,
-                                         env_name: "FL_GITHUB_API_HTTP_METHOD",
-                                         description: "The HTTP method. e.g. GET / POST",
-                                         default_value: "GET",
+                                         env_name: 'GITHUB_API_HTTP_METHOD',
+                                         description: 'The HTTP method. e.g. GET / POST',
+                                         default_value: 'GET',
                                          optional: true,
                                          verify_block: proc do |value|
                                            unless %w(GET POST PUT DELETE HEAD CONNECT PATCH).include?(value.to_s.upcase)
@@ -106,22 +106,22 @@ module Pantograph
                                            end
                                          end),
             PantographCore::ConfigItem.new(key: :body,
-                                         env_name: "FL_GITHUB_API_REQUEST_BODY",
-                                         description: "The request body in JSON or hash format",
+                                         env_name: 'GITHUB_API_REQUEST_BODY',
+                                         description: 'The request body in JSON or hash format',
                                          is_string: false,
                                          default_value: {},
                                          optional: true),
             PantographCore::ConfigItem.new(key: :raw_body,
-                                         env_name: "FL_GITHUB_API_REQUEST_RAW_BODY",
-                                         description: "The request body taken verbatim instead of as JSON, useful for file uploads",
+                                         env_name: 'GITHUB_API_REQUEST_RAW_BODY',
+                                         description: 'The request body taken verbatim instead of as JSON, useful for file uploads',
                                          type: String,
                                          optional: true),
             PantographCore::ConfigItem.new(key: :path,
-                                         env_name: "FL_GITHUB_API_PATH",
+                                         env_name: 'GITHUB_API_PATH',
                                          description: "The endpoint path. e.g. '/repos/:owner/:repo/readme'",
                                          optional: true),
             PantographCore::ConfigItem.new(key: :url,
-                                         env_name: "FL_GITHUB_API_URL",
+                                         env_name: 'GITHUB_API_URL',
                                          description: "The complete full url - used instead of path. e.g. 'https://uploads.github.com/repos/pantograph...'",
                                          optional: true,
                                          verify_block: proc do |value|
@@ -133,13 +133,13 @@ module Pantograph
                                          default_value: {},
                                          optional: true),
             PantographCore::ConfigItem.new(key: :headers,
-                                         description: "Optional headers to apply",
+                                         description: 'Optional headers to apply',
                                          is_string: false,
                                          default_value: {},
                                          optional: true),
             PantographCore::ConfigItem.new(key: :secure,
-                                         env_name: "FL_GITHUB_API_SECURE",
-                                         description: "Optionally disable secure requests (ssl_verify_peer)",
+                                         env_name: 'GITHUB_API_SECURE',
+                                         description: 'Optionally disable secure requests (ssl_verify_peer)',
                                          type: Boolean,
                                          default_value: true,
                                          optional: true)
@@ -155,11 +155,11 @@ module Pantograph
         end
 
         def return_value
-          "A hash including the HTTP status code (:status), the response body (:body), and if valid JSON has been returned the parsed JSON (:json)."
+          'A hash including the HTTP status code (:status), the response body (:body), and if valid JSON has been returned the parsed JSON (:json).'
         end
 
         def authors
-          ["tommeier"]
+          ['tommeier']
         end
 
         def example_code
@@ -227,7 +227,7 @@ module Pantograph
           elsif body.kind_of?(Array)
             body.to_json
           else
-            UI.user_error!("Please provide valid JSON, or a hash as request body") unless parse_json(body)
+            UI.user_error!('Please provide valid JSON, or a hash as request body') unless parse_json(body)
             body
           end
         end

data/pantograph/lib/pantograph/actions/gradle.rb

@@ -4,27 +4,20 @@ require 'shellwords'
 module Pantograph
   module Actions
     module SharedValues
-      GRADLE_APK_OUTPUT_PATH = :GRADLE_APK_OUTPUT_PATH
-      GRADLE_ALL_APK_OUTPUT_PATHS = :GRADLE_ALL_APK_OUTPUT_PATHS
-      GRADLE_AAB_OUTPUT_PATH = :GRADLE_AAB_OUTPUT_PATH
-      GRADLE_ALL_AAB_OUTPUT_PATHS = :GRADLE_ALL_AAB_OUTPUT_PATHS
-      GRADLE_OUTPUT_JSON_OUTPUT_PATH = :GRADLE_OUTPUT_JSON_OUTPUT_PATH
-      GRADLE_ALL_OUTPUT_JSON_OUTPUT_PATHS = :GRADLE_ALL_OUTPUT_JSON_OUTPUT_PATHS
-      GRADLE_FLAVOR = :GRADLE_FLAVOR
-      GRADLE_BUILD_TYPE = :GRADLE_BUILD_TYPE
+      GRADLE_ARTIFACT_OUTPUT_PATH    = :GRADLE_ARTIFACT_OUTPUT_PATH
+      GRADLE_FLAVOR                  = :GRADLE_FLAVOR
+      GRADLE_BUILD_TYPE              = :GRADLE_BUILD_TYPE
     end
 
     class GradleAction < Action
       def self.run(params)
-        task = params[:task]
-        flavor = params[:flavor]
-        build_type = params[:build_type]
-
+        task        = params[:task]
+        flavor      = params[:flavor]
+        build_type  = params[:build_type]
         gradle_task = [task, flavor, build_type].join
 
-        project_dir = params[:project_dir]
-
-        gradle_path_param = params[:gradle_path] || './gradlew'
+        project_dir       = params[:project_dir]
+        gradle_path_param = params[:gradle_path]
 
         # Get the path to gradle, if it's an absolute path we take it as is, if it's relative we assume it's relative to the project_dir
         gradle_path = if Pathname.new(gradle_path_param).absolute?
@@ -39,8 +32,15 @@ module Pantograph
         # Construct our flags
         flags = []
         flags << "-p #{project_dir.shellescape}"
-        flags << params[:properties].map { |k, v| "-P#{k.to_s.shellescape}=#{v.to_s.shellescape}" }.join(' ') unless params[:properties].nil?
-        flags << params[:system_properties].map { |k, v| "-D#{k.to_s.shellescape}=#{v.to_s.shellescape}" }.join(' ') unless params[:system_properties].nil?
+
+        unless params[:properties].nil?
+          flags << params[:properties].map { |k, v| "-P#{k.to_s.shellescape}=#{v.to_s.shellescape}" }.join(' ')
+        end
+
+        unless params[:system_properties].nil?
+          flags << params[:system_properties].map { |k, v| "-D#{k.to_s.shellescape}=#{v.to_s.shellescape}" }.join(' ')
+        end
+
         flags << params[:flags] unless params[:flags].nil?
 
         # Run the actual gradle task
@@ -51,45 +51,30 @@ module Pantograph
         Actions.lane_context[SharedValues::GRADLE_FLAVOR] = flavor if flavor
 
         # We run the actual gradle task
-        result = gradle.trigger(task: gradle_task,
-                                serial: params[:serial],
-                                flags: flags.join(' '),
-                                print_command: params[:print_command],
-                                print_command_output: params[:print_command_output])
-
-        # If we didn't build, then we return now, as it makes no sense to search for apk's in a non-`assemble` or non-`build` scenario
-        return result unless task =~ /\b(assemble)/ || task =~ /\b(bundle)/
-
-        apk_search_path = File.join(project_dir, '**', 'build', 'outputs', 'apk', '**', '*.apk')
-        aab_search_path = File.join(project_dir, '**', 'build', 'outputs', 'bundle', '**', '*.aab')
-        output_json_search_path = File.join(project_dir, '**', 'build', 'outputs', 'apk', '**', 'output.json')
-
-        # Our apk/aab is now built, but there might actually be multiple ones that were built if a flavor was not specified in a multi-flavor project (e.g. `assembleRelease`)
-        # However, we're not interested in unaligned apk's...
-        new_apks = Dir[apk_search_path].reject { |path| path =~ /^.*-unaligned.apk$/i }
-        new_apks = new_apks.map { |path| File.expand_path(path) }
-        new_aabs = Dir[aab_search_path]
-        new_aabs = new_aabs.map { |path| File.expand_path(path) }
-        new_output_jsons = Dir[output_json_search_path]
-        new_output_jsons = new_output_jsons.map { |path| File.expand_path(path) }
-
-        # We expose all of these new apks and aabs
-        Actions.lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = new_apks
-        Actions.lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] = new_aabs
-        Actions.lane_context[SharedValues::GRADLE_ALL_OUTPUT_JSON_OUTPUT_PATHS] = new_output_jsons
-
-        # We also take the most recent apk and aab to return as SharedValues::GRADLE_APK_OUTPUT_PATH and SharedValues::GRADLE_AAB_OUTPUT_PATH
+        result = gradle.trigger(
+          task: gradle_task,
+          flags: flags.join(' '),
+          print_command: params[:print_command],
+          print_command_output: params[:print_command_output]
+        )
+
+        # If we didn't build, then we return now, as it makes no sense to search for artifacts's in a non-`assemble` or non-`build` scenario
+        return result unless task =~ /\b(assemble)/ || task =~ /\b(build)/
+
+        artifact_search_path = File.join(project_dir, '**', 'build', '**', "*.#{params[:artifact_extension].gsub('.', '')}")
+
+        # Our artifact is now built, but there might actually be multiple ones that were built if a flavor was not specified in a multi-flavor project (e.g. `assembleRelease`)
+        new_artifacts = Dir[artifact_search_path].map { |path| File.expand_path(path) }
+
+        # We also take the most recent artifact to return as SharedValues::GRADLE_ARTIFACT_OUTPUT_PATH
         # This is the one that will be relevant for most projects that just build a single build variant (flavor + build type combo).
         # In multi build variants this value is undefined
-        last_apk_path = new_apks.sort_by(&File.method(:mtime)).last
-        last_aab_path = new_aabs.sort_by(&File.method(:mtime)).last
-        last_output_json_path = new_output_jsons.sort_by(&File.method(:mtime)).last
-        Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] = File.expand_path(last_apk_path) if last_apk_path
-        Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH] = File.expand_path(last_aab_path) if last_aab_path
-        Actions.lane_context[SharedValues::GRADLE_OUTPUT_JSON_OUTPUT_PATH] = File.expand_path(last_output_json_path) if last_output_json_path
+        last_artifact_path = new_artifacts.sort_by(&File.method(:mtime)).last
+        Actions.lane_context[SharedValues::GRADLE_ARTIFACT_OUTPUT_PATH] = File.expand_path(last_artifact_path) if last_artifact_path
 
-        # Give a helpful message in case there were no new apks or aabs. Remember we're only running this code when assembling, in which case we certainly expect there to be an apk or aab
-        UI.message('Couldn\'t find any new signed apk files...') if new_apks.empty? && new_aabs.empty?
+        # Give a helpful message in case there were no new artifacts.
+        # Remember we're only running this code when assembling, in which case we certainly expect there to be an artifact
+        UI.message('Couldn\'t find any new artifact files...') if new_artifacts.empty?
 
         return result
       end
@@ -99,7 +84,7 @@ module Pantograph
       #####################################################
 
       def self.description
-        'All gradle related actions, including building and testing your Android app'
+        'All gradle related actions, including building and testing your application'
       end
 
       def self.details
@@ -109,57 +94,59 @@ module Pantograph
       def self.available_options
         [
           PantographCore::ConfigItem.new(key: :task,
-                                       env_name: 'FL_GRADLE_TASK',
+                                       env_name: 'GRADLE_TASK',
                                        description: 'The gradle task you want to execute, e.g. `assemble`, `bundle` or `test`. For tasks such as `assembleMyFlavorRelease` you should use gradle(task: \'assemble\', flavor: \'Myflavor\', build_type: \'Release\')',
                                        optional: false,
                                        type: String),
           PantographCore::ConfigItem.new(key: :flavor,
-                                       env_name: 'FL_GRADLE_FLAVOR',
+                                       env_name: 'GRADLE_FLAVOR',
                                        description: 'The flavor that you want the task for, e.g. `MyFlavor`. If you are running the `assemble` task in a multi-flavor project, and you rely on Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH] then you must specify a flavor here or else this value will be undefined',
                                        optional: true,
                                        type: String),
           PantographCore::ConfigItem.new(key: :build_type,
-                                       env_name: 'FL_GRADLE_BUILD_TYPE',
+                                       env_name: 'GRADLE_BUILD_TYPE',
                                        description: 'The build type that you want the task for, e.g. `Release`. Useful for some tasks such as `assemble`',
                                        optional: true,
                                        type: String),
           PantographCore::ConfigItem.new(key: :flags,
-                                       env_name: 'FL_GRADLE_FLAGS',
+                                       env_name: 'GRADLE_FLAGS',
                                        description: 'All parameter flags you want to pass to the gradle command, e.g. `--exitcode --xml file.xml`',
                                        optional: true,
                                        type: String),
           PantographCore::ConfigItem.new(key: :project_dir,
-                                       env_name: 'FL_GRADLE_PROJECT_DIR',
+                                       env_name: 'GRADLE_PROJECT_DIR',
                                        description: 'The root directory of the gradle project',
                                        default_value: '.',
                                        type: String),
           PantographCore::ConfigItem.new(key: :gradle_path,
-                                       env_name: 'FL_GRADLE_PATH',
+                                       env_name: 'GRADLE_PATH',
                                        description: 'The path to your `gradlew`. If you specify a relative path, it is assumed to be relative to the `project_dir`',
                                        optional: true,
-                                       type: String),
+                                       type: String,
+                                       default_value: './gradlew'),
           PantographCore::ConfigItem.new(key: :properties,
-                                       env_name: 'FL_GRADLE_PROPERTIES',
+                                       env_name: 'GRADLE_PROPERTIES',
                                        description: 'Gradle properties to be exposed to the gradle script',
                                        optional: true,
                                        is_string: false),
+          PantographCore::ConfigItem.new(key: :artifact_extension,
+                                       env_name: 'GRADLE_ARTIFACT_EXTENSION',
+                                       description: 'Gradle build output filetype extension',
+                                       optional: true,
+                                       is_string: true,
+                                       default_value: 'jar'),
           PantographCore::ConfigItem.new(key: :system_properties,
-                                       env_name: 'FL_GRADLE_SYSTEM_PROPERTIES',
+                                       env_name: 'GRADLE_SYSTEM_PROPERTIES',
                                        description: 'Gradle system properties to be exposed to the gradle script',
                                        optional: true,
                                        is_string: false),
-          PantographCore::ConfigItem.new(key: :serial,
-                                       env_name: 'FL_ANDROID_SERIAL',
-                                       description: 'Android serial, which device should be used for this command',
-                                       type: String,
-                                       default_value: ''),
           PantographCore::ConfigItem.new(key: :print_command,
-                                       env_name: 'FL_GRADLE_PRINT_COMMAND',
+                                       env_name: 'GRADLE_PRINT_COMMAND',
                                        description: 'Control whether the generated Gradle command is printed as output before running it (true/false)',
                                        is_string: false,
                                        default_value: true),
           PantographCore::ConfigItem.new(key: :print_command_output,
-                                       env_name: 'FL_GRADLE_PRINT_COMMAND_OUTPUT',
+                                       env_name: 'GRADLE_PRINT_COMMAND_OUTPUT',
                                        description: 'Control whether the output produced by given Gradle command is printed while running (true/false)',
                                        is_string: false,
                                        default_value: true)
@@ -168,14 +155,9 @@ module Pantograph
 
       def self.output
         [
-          ['GRADLE_APK_OUTPUT_PATH', 'The path to the newly generated apk file. Undefined in a multi-variant assemble scenario'],
-          ['GRADLE_ALL_APK_OUTPUT_PATHS', 'When running a multi-variant `assemble`, the array of signed apk\'s that were generated'],
+          ['GRADLE_ARTIFACT_OUTPUT_PATH', 'The path to the newly generated artifact file. Undefined in a multi-variant assemble scenario'],
           ['GRADLE_FLAVOR', 'The flavor, e.g. `MyFlavor`'],
-          ['GRADLE_BUILD_TYPE', 'The build type, e.g. `Release`'],
-          ['GRADLE_AAB_OUTPUT_PATH', 'The path to the most recent Android app bundle'],
-          ['GRADLE_ALL_AAB_OUTPUT_PATHS', 'The paths to the most recent Android app bundles'],
-          ['GRADLE_OUTPUT_JSON_OUTPUT_PATH', 'The path to the most recent output.json file'],
-          ['GRADLE_ALL_OUTPUT_JSON_OUTPUT_PATHS', 'The path to the newly generated output.json files']
+          ['GRADLE_BUILD_TYPE', 'The build type, e.g. `Release`']
         ]
       end
 
@@ -184,11 +166,11 @@ module Pantograph
       end
 
       def self.authors
-        ['KrauseFx', 'lmirosevic']
+        ['KrauseFx', 'lmirosevic', 'johnknapprs']
       end
 
       def self.is_supported?(platform)
-        [:ios, :android].include?(platform) # we support iOS as cross platforms apps might want to call `gradle` also
+        true
       end
 
       def self.example_code
@@ -222,17 +204,17 @@ module Pantograph
           )
           ```
 
-          You can use this to automatically [sign and zipalign](https://developer.android.com/studio/publish/app-signing.html) your app:
+          You can use this to automatically [sign and zipalign] your app:
           ```ruby
           gradle(
             task: "assemble",
             build_type: "Release",
             print_command: false,
             properties: {
-              "android.injected.signing.store.file" => "keystore.jks",
-              "android.injected.signing.store.password" => "store_password",
-              "android.injected.signing.key.alias" => "key_alias",
-              "android.injected.signing.key.password" => "key_password",
+              "app.injected.signing.store.file" => "keystore.jks",
+              "app.injected.signing.store.password" => "store_password",
+              "app.injected.signing.key.alias" => "key_alias",
+              "app.injected.signing.key.password" => "key_password",
             }
           )
           ```
@@ -262,7 +244,7 @@ module Pantograph
           )
           ```
 
-          Delete the build directory, generated APKs and AABs
+          Delete the build directory, generated artifacts
           ```ruby
           gradle(
             task: "clean"