fastlane-plugin-android_version_manager 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0331fa284ccb5b902af7a6e72a906f86246a1bc6c8de7ad1408a895b3492c32
-  data.tar.gz: 29d85179e5833586615015a9b1501b8ccbadeb59c0d2c14354eb788fd108bc69
+  metadata.gz: 6b1e0dfd8cc3942fb547b66ce72266627f0dc60cb85a7f943dc9751dcaa9297f
+  data.tar.gz: 7551c6c16f603d46d4f49020718f7db55e36bb8c41fb7852354a16903d79b0df
 SHA512:
-  metadata.gz: 6bc09f990dce0ca847f0b44cc228f4f7063dab59b1f72d7c48f78131132863eb696e7676e314ccdb0c1b3ab9e3feee993d9021fec3bbb10f36d61058d70a7dc1
-  data.tar.gz: eff9e1d7dd5d50aa376f6d488e6ad59b250ce2953238c561d17757e47566e4672acea69c32fdfef07bc1ff7da5a7e443ee2609933cba48dffd473f04b9e5ef19
+  metadata.gz: 107429d92fab3046a9dafe59b57996e85eb24eda8d478f8adfbcc59cfc5fe2014ff34fad8648be74adad15bfd1badbabcc04d6ec9284b14203ff741d2df9affc
+  data.tar.gz: 8bbabcef5a2ebf190f91ecd4cd133047f6306f36f33545b52f4dfcdfc4518af1289fafcd6a88d874e04174d86f39887a4716f6f5104f05678c5d1e3a37cbf046

data/lib/fastlane/plugin/android_version_manager/actions/android_base_action.rb

@@ -0,0 +1,34 @@
+require "fastlane/action"
+require_relative "../helper/android_version_manager_helper"
+
+module Fastlane
+  module Actions
+    class AndroidBaseAction < Action
+      def self.authors
+        ["Jonathan Cardoso", "@_jonathancardos", "JCMais", "Nicolas Verinaud"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+
+      def self.app_project_dir_action
+        FastlaneCore::ConfigItem.new(
+          key: :app_project_dir,
+          env_name: "FL_ANDROID_GET_VERSION_CODE_APP_PROJECT_DIR",
+          description: "The path to the application source folder in the Android project (default: android/app)",
+          optional: true,
+          type: String,
+          default_value: "android/app",
+          verify_block: proc do |value|
+            UI.user_error!("Couldn't find build.gradle or build.gradle.kts file at path '#{value}'") unless Helper::AndroidVersionManagerHelper.build_gradle_exists?(value)
+          end
+        )
+      end
+
+      def self.find_build_gradle(app_project_dir)
+        Helper::AndroidVersionManagerHelper.find_build_gradle(app_project_dir)
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/android_version_manager/actions/android_get_value_from_build_action.rb

@@ -1,40 +1,24 @@
-# This source code is based on this one:
-# https://github.com/otkmnb2783/fastlane-plugin-android_versioning/blob/a9dc02d69a8c3a106d00b52ace78d4a763baf6af/lib/fastlane/plugin/android_versioning/actions/get_value_from_build.rb#L1
-require "fileutils"
+require_relative 'android_base_action'
+require_relative '../helper/android_version_manager_helper'
 
 module Fastlane
   module Actions
-    class AndroidGetValueFromBuildAction < Action
+    class AndroidGetValueFromBuildAction < AndroidBaseAction
       def self.run(params)
         app_project_dir ||= params[:app_project_dir]
-        value, _line, _line_index = Helper::AndroidVersionManagerHelper.get_key_from_gradle_file("#{app_project_dir}/build.gradle", params[:key])
+        file_path = find_build_gradle(app_project_dir)
+        value, _line, _line_index = Helper::AndroidVersionManagerHelper.get_key_from_gradle_file(file_path, params[:key])
         return value
       end
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                       description: "The path to the application source folder in the Android project, the one that contains the build.gradle file (default: android/app)",
-                                       optional: true,
-                                       type: String,
-                                       default_value: "android/app",
-                                       verify_block: proc do |value|
-                                         # Not using File.exist?("#{value}/build.gradle") because it does not handle globs
-                                         UI.user_error!("Couldn't find build.gradle file at path '#{value}'") unless Dir["#{value}/build.gradle"].any?
-                                       end),
+          app_project_dir_action,
           FastlaneCore::ConfigItem.new(key: :key,
                                        description: "The property key to retrieve the value from",
                                        type: String),
         ]
       end
-
-      def self.authors
-        ["Jonathan Cardoso", "@_jonathancardos", "JCMais"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/actions/android_get_version_code_action.rb

@@ -1,4 +1,4 @@
-require "fastlane/action"
+require_relative 'android_base_action'
 require_relative "../helper/android_version_manager_helper"
 
 module Fastlane
@@ -8,14 +8,15 @@ module Fastlane
       ANDROID_VERSION_CODE ||= :ANDROID_VERSION_CODE
     end
 
-    class AndroidGetVersionCodeAction < Action
+    class AndroidGetVersionCodeAction < AndroidBaseAction
       def self.run(params)
         # fastlane will take care of reading in the parameter and fetching the environment variable:
         UI.message("Parameter app_project_dir: #{params[:app_project_dir]}")
         UI.message("Parameter key: #{params[:key]}")
 
+        file_path = find_build_gradle(params[:app_project_dir])
         # We can expect version_code to be an existing and valid version code
-        version_code = Helper::AndroidVersionManagerHelper.get_version_code_from_gradle_file("#{params[:app_project_dir]}/build.gradle", params[:key])
+        version_code = Helper::AndroidVersionManagerHelper.get_version_code_from_gradle_file(file_path, params[:key])
 
         Actions.lane_context[Fastlane::Actions::SharedValues::ANDROID_VERSION_CODE] = version_code
 
@@ -36,16 +37,7 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                       env_name: "FL_ANDROID_GET_VERSION_CODE_APP_PROJECT_DIR",
-                                       description: "The path to the application source folder in the Android project (default: android/app)",
-                                       optional: true,
-                                       type: String,
-                                       default_value: "android/app",
-                                       verify_block: proc do |value|
-                                         # Not using File.exist?("#{value}/build.gradle") because it does not handle globs
-                                         UI.user_error!("Couldn't find build.gradle file at path '#{value}'") unless Dir["#{value}/build.gradle"].any?
-                                       end),
+          app_project_dir_action,
           FastlaneCore::ConfigItem.new(key: :key,
                                        env_name: "FL_ANDROID_GET_VERSION_CODE_KEY",
                                        description: "The property key",
@@ -84,14 +76,6 @@ module Fastlane
         # https://github.com/fastlane/fastlane/blob/051e5012984d97257571a76627c1261946afb8f8/fastlane/lib/fastlane/action.rb#L23-L30
         :int
       end
-
-      def self.authors
-        ["Jonathan Cardoso", "@_jonathancardos", "JCMais"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/actions/android_get_version_name_action.rb

@@ -1,4 +1,4 @@
-require "fastlane/action"
+require_relative 'android_base_action'
 require_relative "../helper/android_version_manager_helper"
 
 module Fastlane
@@ -8,14 +8,15 @@ module Fastlane
       ANDROID_VERSION_NAME ||= :ANDROID_VERSION_NAME
     end
 
-    class AndroidGetVersionNameAction < Action
+    class AndroidGetVersionNameAction < AndroidBaseAction
       def self.run(params)
         # fastlane will take care of reading in the parameter and fetching the environment variable:
         UI.message("Parameter app_project_dir: #{params[:app_project_dir]}")
         UI.message("Parameter key: #{params[:key]}")
 
+        file_path = find_build_gradle(params[:app_project_dir])
         # We can expect version_name to be an existing and valid semver version name
-        version_name = Helper::AndroidVersionManagerHelper.get_version_name_from_gradle_file("#{params[:app_project_dir]}/build.gradle", params[:key])
+        version_name = Helper::AndroidVersionManagerHelper.get_version_name_from_gradle_file(file_path, params[:key])
 
         Actions.lane_context[Fastlane::Actions::SharedValues::ANDROID_VERSION_NAME] = version_name
 
@@ -36,16 +37,7 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                       env_name: "FL_ANDROID_GET_VERSION_CODE_APP_PROJECT_DIR",
-                                       description: "The path to the application source folder in the Android project (default: android/app)",
-                                       optional: true,
-                                       type: String,
-                                       default_value: "android/app",
-                                       verify_block: proc do |value|
-                                         # Not using File.exist?("#{value}/build.gradle") because it does not handle globs
-                                         UI.user_error!("Couldn't find build.gradle file at path '#{value}'") unless Dir["#{value}/build.gradle"].any?
-                                       end),
+          app_project_dir_action,
           FastlaneCore::ConfigItem.new(key: :key,
                                        env_name: "FL_ANDROID_GET_VERSION_CODE_KEY",
                                        description: "The property key",
@@ -84,14 +76,6 @@ module Fastlane
         # https://github.com/fastlane/fastlane/blob/051e5012984d97257571a76627c1261946afb8f8/fastlane/lib/fastlane/action.rb#L23-L30
         :int
       end
-
-      def self.authors
-        ["Jonathan Cardoso", "@_jonathancardos", "JCMais"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/actions/android_increment_version_code_action.rb

@@ -1,4 +1,4 @@
-require "fastlane/action"
+require_relative 'android_base_action'
 require_relative "../helper/android_version_manager_helper"
 
 module Fastlane
@@ -8,13 +8,13 @@ module Fastlane
       ANDROID_VERSION_CODE ||= :ANDROID_VERSION_CODE
     end
 
-    class AndroidIncrementVersionCodeAction < Action
+    class AndroidIncrementVersionCodeAction < AndroidBaseAction
       def self.run(params)
         UI.message("Param app_project_dir: #{params[:app_project_dir]}")
         UI.message("Param version_code: #{params[:version_code]}")
         UI.message("Param key: #{params[:key]}")
 
-        file_path = "#{params[:app_project_dir]}/build.gradle"
+        file_path = find_build_gradle(params[:app_project_dir])
 
         # We can expect version_code to be an existing and valid version code
         version_code = Helper::AndroidVersionManagerHelper.get_version_code_from_gradle_file(file_path, params[:key])
@@ -45,16 +45,7 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                       env_name: "FL_ANDROID_INCREMENT_VERSION_CODE_APP_PROJECT_DIR",
-                                       description: "The path to the application source folder in the Android project (default: android/app)",
-                                       optional: true,
-                                       type: String,
-                                       default_value: "android/app",
-                                       verify_block: proc do |value|
-                                         # Not using File.exist?("#{value}/build.gradle") because it does not handle globs
-                                         UI.user_error!("Couldn't find build.gradle file at path '#{value}'") unless Dir["#{value}/build.gradle"].any?
-                                       end),
+          app_project_dir_action,
           FastlaneCore::ConfigItem.new(key: :key,
                                        env_name: "FL_ANDROID_INCREMENT_VERSION_CODE_KEY",
                                        description: "The property key",
@@ -98,14 +89,6 @@ module Fastlane
         # https://github.com/fastlane/fastlane/blob/051e5012984d97257571a76627c1261946afb8f8/fastlane/lib/fastlane/action.rb#L23-L30
         :int
       end
-
-      def self.authors
-        ["Jonathan Cardoso", "@_jonathancardos", "JCMais"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/actions/android_increment_version_name_action.rb

@@ -1,6 +1,5 @@
-require "fastlane/action"
 require "semantic"
-
+require_relative 'android_base_action'
 require_relative "../helper/android_version_manager_helper"
 
 module Fastlane
@@ -10,14 +9,14 @@ module Fastlane
       ANDROID_VERSION_NAME ||= :ANDROID_VERSION_NAME
     end
 
-    class AndroidIncrementVersionNameAction < Action
+    class AndroidIncrementVersionNameAction < AndroidBaseAction
       def self.run(params)
         UI.message("Param app_project_dir: #{params[:app_project_dir]}")
         UI.message("Param version_name: #{params[:version_name]}")
         UI.message("Param increment_type: #{params[:increment_type]}")
         UI.message("Param key: #{params[:key]}")
 
-        file_path = "#{params[:app_project_dir]}/build.gradle"
+        file_path = find_build_gradle(params[:app_project_dir])
         increment_type = params[:increment_type].to_sym
 
         # We can expect version_code to be an existing and valid version code
@@ -58,16 +57,7 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                       env_name: "FL_ANDROID_INCREMENT_VERSION_NAME_APP_PROJECT_DIR",
-                                       description: "The path to the application source folder in the Android project (default: android/app)",
-                                       optional: true,
-                                       type: String,
-                                       default_value: "android/app",
-                                       verify_block: proc do |value|
-                                         # Not using File.exist?("#{value}/build.gradle") because it does not handle globs
-                                         UI.user_error!("Couldn't find build.gradle file at path '#{value}'") unless Dir["#{value}/build.gradle"].any?
-                                       end),
+          app_project_dir_action,
           FastlaneCore::ConfigItem.new(key: :key,
                                        env_name: "FL_ANDROID_INCREMENT_VERSION_NAME_KEY",
                                        description: "The property key",
@@ -120,14 +110,6 @@ module Fastlane
         # https://github.com/fastlane/fastlane/blob/051e5012984d97257571a76627c1261946afb8f8/fastlane/lib/fastlane/action.rb#L23-L30
         :int
       end
-
-      def self.authors
-        ["Jonathan Cardoso", "@_jonathancardos", "JCMais"]
-      end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/actions/android_version_manager_action.rb

@@ -1,9 +1,9 @@
-require 'fastlane/action'
+require_relative 'android_base_action'
 require_relative '../helper/android_version_manager_helper'
 
 module Fastlane
   module Actions
-    class AndroidVersionManagerAction < Action
+    class AndroidVersionManagerAction < AndroidBaseAction
       def self.run(params)
         UI.message("The android_version_manager plugin is working!")
       end
@@ -12,10 +12,6 @@ module Fastlane
         "Android's App Version Managment"
       end
 
-      def self.authors
-        ["Jonathan Cardoso Machado"]
-      end
-
       def self.return_value
         # If your method provides a return value, you can describe here what it does
       end
@@ -27,22 +23,9 @@ module Fastlane
 
       def self.available_options
         [
-          FastlaneCore::ConfigItem.new(key: :app_project_dir,
-                                  env_name: "ANDROID_VERSIONING_APP_PROJECT_DIR",
-                               description: "The path to the application source folder in the Android project (default: android/app)",
-                                  optional: true,
-                                      type: String,
-                             default_value: "android/app"),
-          FastlaneCore::ConfigItem.new(key: :key,
-                               description: "The property key",
-                                      type: String)
-
+          app_project_dir_action
         ]
       end
-
-      def self.is_supported?(platform)
-        platform == :android
-      end
     end
   end
 end

data/lib/fastlane/plugin/android_version_manager/helper/android_version_manager_helper.rb

@@ -9,6 +9,14 @@ module Fastlane
 
   module Helper
     class AndroidVersionManagerHelper
+      def self.build_gradle_exists?(app_project_dir)
+        return BuildGradleFile.new(app_project_dir).exists?
+      end
+
+      def self.find_build_gradle(app_project_dir)
+        return BuildGradleFile.new(app_project_dir).find
+      end
+
       # class methods that you define here become available in your action
       # as `Helper::AndroidVersionManagerHelper.your_method`
       # Most actions code are here to follow this advice: https://docs.fastlane.tools/advanced/actions/#calling-other-actions

data/lib/fastlane/plugin/android_version_manager/helper/build_gradle_file.rb

@@ -0,0 +1,38 @@
+
+class BuildGradleFile
+  def initialize(app_project_dir)
+    @app_project_dir = app_project_dir
+  end
+
+  def find
+    if kts_exists?
+      return kts
+    end
+    return classic
+  end
+
+  def exists?
+    return kts_exists? || classic_exists?
+  end
+
+  def kts_exists?
+    return file_exists?(kts)
+  end
+
+  def classic_exists?
+    return file_exists?(classic)
+  end
+
+  def kts
+    return "#{@app_project_dir}/build.gradle.kts"
+  end
+
+  def classic
+    return "#{@app_project_dir}/build.gradle"
+  end
+
+  def file_exists?(path)
+    # Not using File.exist? because it does not handle globs
+    return Dir[path].any?
+  end
+end

data/lib/fastlane/plugin/android_version_manager/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidVersionManager
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_version_manager
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jonathan Cardoso Machado
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -159,6 +159,7 @@ files:
 - LICENSE
 - README.md
 - lib/fastlane/plugin/android_version_manager.rb
+- lib/fastlane/plugin/android_version_manager/actions/android_base_action.rb
 - lib/fastlane/plugin/android_version_manager/actions/android_get_value_from_build_action.rb
 - lib/fastlane/plugin/android_version_manager/actions/android_get_version_code_action.rb
 - lib/fastlane/plugin/android_version_manager/actions/android_get_version_name_action.rb
@@ -166,6 +167,7 @@ files:
 - lib/fastlane/plugin/android_version_manager/actions/android_increment_version_name_action.rb
 - lib/fastlane/plugin/android_version_manager/actions/android_version_manager_action.rb
 - lib/fastlane/plugin/android_version_manager/helper/android_version_manager_helper.rb
+- lib/fastlane/plugin/android_version_manager/helper/build_gradle_file.rb
 - lib/fastlane/plugin/android_version_manager/version.rb
 homepage: https://github.com/JCMais/fastlane-plugin-android_version_manager
 licenses: