fastlane-plugin-android_versioning_kts 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6d0cc411f15eaa1426d3280109c7af26f6e8545ca5f52a22542cf490e5386c8
-  data.tar.gz: d18e94c2670b2063de334ca26be51f3df0228046d7472af0be673bcf07635d55
+  metadata.gz: 2956b1ea371117d6a9b3593a205a8ef467cf8004febc361075ca8b8aacda9449
+  data.tar.gz: 1545f0a91b4a23491aab64f44a55d3a951534ff57f3911caa75ac496cf8c71b6
 SHA512:
-  metadata.gz: bc9a2008ee34caf5405b366f7c0c4cd03aaa0fefffd9400f6ba4936b018e019a0f643e47fd4e513200a757dd1cd8c7f83ea2084c8a80aeae84eda2512d5f0417
-  data.tar.gz: d08a4f1df14f9391fec4d1d2fd2b33686374cb4334609bd8f897233a29a53299eab51965d448820520ac294ebff8ed437c8691cee462a4c219345ef90ef3f00d
+  metadata.gz: 5c67ccbad3f2267f7c53a4f09a231af9122c1e5e6f78d992e6b086039acf6acc6ef3ffc25e7047b17cef9702e12e32921fa75bc3e2c19fecf042c5e6cbcc98c2
+  data.tar.gz: d5d4d079801e5bcea33c13f93bf1b10ae0bf979e64f15a33a722344392ea7f079a006e713a397dbfb3ea3d1e3653d39254a71b2df52116a6cf75f89762da7036

data/lib/fastlane/plugin/android_versioning_kts/actions/get_value_from_build.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Fastlane
@@ -9,33 +11,63 @@ module Fastlane
         type ||= params[:type]
 
         case type
-          when "param"
-            regex = Regexp.new(/\s*(?<key>#{params[:key]}\s*=\s*)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
-          when "function"
-            regex = Regexp.new(/\s*(?<key>#{params[:key]}\s*\(\s*)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*\).*)/)
-          else
-            throw "#{type} is not valid type"
+        when 'param'
+          regex = /
+            \s*
+            (?<key>#{params[:key]}\s*=\s*)
+            (?<left>['"]?)
+            (?<value>[a-zA-Z0-9._]*)
+            (?<right>['"]?)
+            (?<comment>.*)
+          /x
+        when 'function'
+          regex = /
+            \s*
+            (?<key>#{params[:key]}\s*\(\s*)
+            (?<left>['"]?)
+            (?<value>[a-zA-Z0-9._]*)
+            (?<right>['"]?)
+            (?<comment>.*\).*)
+          /x
+        else
+          throw "#{type} is not valid type"
         end
 
-        value = ""
+        flavor = params[:flavor]
+        flavor_specified = !(flavor.nil? || flavor.empty?)
+        regex_flavor = Regexp.new(/[ \t]create\("#{flavor}"\)[ \t]/)
+        value = ''
         found = false
+        flavor_found = false
+        product_flavors_section = false
+
         Dir.glob("#{app_project_dir}/build.gradle.kts") do |path|
           UI.verbose("path: #{path}")
           UI.verbose("absolute_path: #{File.expand_path(path)}")
-          begin
-            File.open(path, 'r') do |file|
-              file.each_line do |line|
-                unless line.match(regex) and !found
-                  next
-                end
-                key, left, value, right, comment = line.match(regex).captures
-                break
+
+          File.open(path, 'r') do |file|
+            file.each_line do |line|
+              if flavor_specified && !product_flavors_section
+                next unless line.include? 'productFlavors'
+
+                product_flavors_section = true
               end
-              file.close
+
+              if flavor_specified && !flavor_found
+                next unless line.match(regex_flavor)
+
+                flavor_found = true
+              end
+
+              next unless line.match(regex) && !found
+
+              key, left, value, right, comment = line.match(regex).captures
+              break
             end
+            file.close
           end
         end
-        return value
+        value
       end
 
       #####################################################
@@ -43,25 +75,39 @@ 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),
-          FastlaneCore::ConfigItem.new(key: :type,
-                               description: "The property Type [\"function\", \"param\"])",
-                                      type: String,
-                             default_value: "param")
+          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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :key,
+            description: 'The property key',
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :type,
+            description: 'The property Type ["function", "param"])',
+            type: String,
+            default_value: 'param'
+          )
 
         ]
       end
 
       def self.authors
-        ["zmunm"]
+        ['zmunm']
       end
 
       def self.is_supported?(platform)

data/lib/fastlane/plugin/android_versioning_kts/actions/get_version_code.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Fastlane
@@ -6,6 +8,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: 'versionCode',
           type: 'param'
         )
@@ -16,12 +19,22 @@ 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: :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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          )
         ]
       end
 
@@ -31,7 +44,8 @@ module Fastlane
 
       def self.details
         [
-          "This action will return the current version code set on your project's build.gradle.kts."
+          "This action will return the current version code set
+            on your project's build.gradle.kts."
         ].join(' ')
       end
 

data/lib/fastlane/plugin/android_versioning_kts/actions/get_version_name.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Fastlane
@@ -6,6 +8,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: 'versionName',
           type: 'param'
         )
@@ -16,12 +19,21 @@ 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: :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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          )
         ]
       end
 
@@ -31,7 +43,8 @@ module Fastlane
 
       def self.details
         [
-          "This action will return the current version name set on your project's build.gradle.kts."
+          "This action will return the current version name set
+            on your project's build.gradle.kts."
         ].join(' ')
       end
 

data/lib/fastlane/plugin/android_versioning_kts/actions/increment_version_code.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+require 'fileutils'
+
+module Fastlane
+  module Actions
+    module SharedValues
+      VERSION_CODE = :VERSION_CODE
+    end
+
+    class IncrementVersionCodeAction < Action
+      def self.run(params)
+        current_version_code = GetVersionCodeAction.run(params)
+
+        new_version_code =
+          if params[:version_code].nil?
+            current_version_code.to_i + 1
+          elsif params[:version_code] == -1
+            ((Time.now.to_f * 1000).to_i / (60 * 1000)).to_i
+          else
+            params[:version_code].to_i
+          end
+
+        SetValueInBuildAction.run(
+          app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
+          key: 'versionCode',
+          value: new_version_code
+        )
+        Actions.lane_context[SharedValues::VERSION_CODE] = new_version_code.to_s
+        new_version_code.to_s
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+      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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :version_code,
+            env_name: 'ANDROID_VERSIONING_VERSION_CODE',
+            description: 'Change to a specific version (optional)',
+            optional: true,
+            type: Integer
+          )
+        ]
+      end
+
+      def self.description
+        'Increment the version code of your project'
+      end
+
+      def self.details
+        [
+          'This action will increment the version code directly
+            in build.gradle.kts'
+        ].join("\n")
+      end
+
+      def self.output
+        [
+          ['VERSION_CODE', 'The new version code']
+        ]
+      end
+
+      def self.authors
+        ['Manabu OHTAKE']
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/android_versioning_kts/actions/increment_version_name.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+require 'fileutils'
+
+module Fastlane
+  module Actions
+    module SharedValues
+      VERSION_NAME = :VERSION_NAME
+    end
+
+    class IncrementVersionNameAction < Action
+      def self.run(params)
+        if params[:version_name].nil? || params[:version_name].empty?
+          current_version = GetVersionNameAction.run(params)
+          unless current_version =~ /\d+.\d+.\d+/
+            UI.user_error!(
+              "Your current version (#{current_version})
+               does not respect the format A.B.C"
+            )
+          end
+          version = current_version.split('.').map(&:to_i)
+          case params[:bump_type]
+          when 'patch'
+            version[2] = version[2] + 1
+            new_version = version.join('.')
+          when 'minor'
+            version[1] = version[1] + 1
+            version[2] = version[2] = 0
+            new_version = version.join('.')
+          when 'major'
+            version[0] = version[0] + 1
+            version[1] = 0
+            version[2] = 0
+            new_version = version.join('.')
+          end
+        else
+          new_version = params[:version_name]
+        end
+        SetValueInBuildAction.run(
+          app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
+          key: 'versionName',
+          value: new_version
+        )
+        Actions.lane_context[SharedValues::VERSION_NAME] = new_version
+        new_version
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+      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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :bump_type,
+            env_name: 'ANDROID_VERSIONING_BUMP_TYPE',
+            description: 'Change to a specific type (optional)',
+            optional: true,
+            type: String,
+            default_value: 'patch',
+            verify_block:
+              proc do |value|
+                unless %w[
+                  patch minor major
+                ].include? value
+                  UI.user_error!(
+                    "Available values are 'patch', 'minor' and 'major'"
+                  )
+                end
+              end
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :version_name,
+            env_name: 'ANDROID_VERSIONING_VERSION_NAME',
+            description: 'Change to a specific version (optional)',
+            optional: true,
+            type: String
+          )
+        ]
+      end
+
+      def self.description
+        'Increment the version name of your project'
+      end
+
+      def self.details
+        [
+          'This action will increment the version name directly
+            in build.gradle.kts'
+        ].join("\n")
+      end
+
+      def self.output
+        [
+          ['VERSION_NAME', 'The new version name']
+        ]
+      end
+
+      def self.authors
+        ['Manabu OHTAKE']
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/android_versioning_kts/actions/set_value_in_build.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require 'tempfile'
+require 'fileutils'
+
+module Fastlane
+  module Actions
+    class SetValueInBuildAction < Action
+      def self.run(params)
+        app_project_dir ||= params[:app_project_dir]
+        regex = /
+          (?<key>#{params[:key]}\s*=\s*)
+          (?<left>['"]?)
+          (?<value>[a-zA-Z0-9._]*)
+          (?<right>['"]?)
+          (?<comment>.*)
+        /x
+        flavor = params[:flavor]
+        flavor_specified = !(flavor.nil? || flavor.empty?)
+        regex_flavor = /[ \t]create\("#{flavor}"\)[ \t]/
+        found = false
+        product_flavors_section = false
+        flavor_found = false
+        Dir.glob("#{app_project_dir}/build.gradle.kts") do |path|
+          temp_file = Tempfile.new('versioning')
+          File.open(path, 'r') do |file|
+            file.each_line do |line|
+              if flavor_specified && !product_flavors_section
+                unless line.include?('productFlavors') || product_flavors_section
+                  temp_file.puts line
+                  next
+                end
+                product_flavors_section = true
+              end
+
+              if flavor_specified && !flavor_found
+                unless line.match(regex_flavor)
+                  temp_file.puts line
+                  next
+                end
+                flavor_found = true
+              end
+
+              unless line.match(regex) && !found
+                temp_file.puts line
+                next
+              end
+              line = line.gsub regex,
+                               "\\k<key>\\k<left>#{params[:value]}\\k<right>\\k<comment>"
+              found = true
+              temp_file.puts line
+            end
+            file.close
+          end
+          temp_file.rewind
+          temp_file.close
+
+          begin
+            FileUtils.mv(temp_file.path, path)
+          rescue => ex
+            if ex.message.to_s.include? 'Operation not permitted'
+              FileUtils.cp(temp_file.path, path)
+              FileUtils.rm(temp_file.path)
+            else
+              raise ex
+            end
+          end
+
+          temp_file.unlink
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+      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: :flavor,
+            env_name: 'ANDROID_VERSIONING_FLAVOR',
+            description: 'The product flavor name (optional)',
+            optional: true,
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :key,
+            description: 'The property key',
+            type: String
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :value,
+            description: 'The property value',
+            type: String
+          )
+        ]
+      end
+
+      def self.description
+        'Set the value of your project'
+      end
+
+      def self.details
+        [
+          'This action will set the value directly in build.gradle.kts '
+        ].join("\n")
+      end
+
+      def self.authors
+        ['Manabu OHTAKE']
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

data/lib/fastlane/plugin/android_versioning_kts/helper/android_versioning_kts_helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'fastlane_core/ui/ui'
 
 module Fastlane
-  UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
+  UI = FastlaneCore::UI unless Fastlane.const_defined?('UI')
 
   module Helper
     class AndroidVersioningKtsHelper
@@ -9,7 +11,7 @@ module Fastlane
       # as `Helper::AndroidVersioningKtsHelper.your_method`
       #
       def self.show_message
-        UI.message("Hello from the android_versioning_kts plugin helper!")
+        UI.message('Hello from the android_versioning_kts plugin helper!')
       end
     end
   end

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Fastlane
   module AndroidVersioningKts
-    VERSION = "0.1.0"
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/fastlane/plugin/android_versioning_kts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fastlane/plugin/android_versioning_kts/version'
 
 module Fastlane

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_versioning_kts
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - zmunm
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: fastlane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.130.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.130.0
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,21 +136,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fastlane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.130.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.130.0
-description: 
+description:
 email: atheist2197@gmail.com
 executables: []
 extensions: []
@@ -148,13 +148,16 @@ files:
 - lib/fastlane/plugin/android_versioning_kts/actions/get_value_from_build.rb
 - lib/fastlane/plugin/android_versioning_kts/actions/get_version_code.rb
 - lib/fastlane/plugin/android_versioning_kts/actions/get_version_name.rb
+- lib/fastlane/plugin/android_versioning_kts/actions/increment_version_code.rb
+- lib/fastlane/plugin/android_versioning_kts/actions/increment_version_name.rb
+- lib/fastlane/plugin/android_versioning_kts/actions/set_value_in_build.rb
 - lib/fastlane/plugin/android_versioning_kts/helper/android_versioning_kts_helper.rb
 - lib/fastlane/plugin/android_versioning_kts/version.rb
 homepage: https://github.com/zmunm/fastlane-plugin-android-versioning-kts
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: android versioning for gradle kotlin DSL
 test_files: []