fastlane-plugin-increment_build_number 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0b9ad87c01d1b3f674890d3be0e2c06da3f18d3fdb4149540149517d111e8e
-  data.tar.gz: 9cd662317f181b278cc9cb820031de67079638e442f1ce9c832e1aecd1c269c7
+  metadata.gz: c7b77d132dd354766922104678c7a4b529f3b924f20413b8a6ccbdf195c5108d
+  data.tar.gz: e51b3d909eefe14218cc673a4071ee0f29d99782696c1a410f0bac77f5dcddbd
 SHA512:
-  metadata.gz: 87444d4179940a53f8e1291072892ae9ace086a4dadd3ce6ca5d7e70b1260e645e6d6305290be1b8da4c127695aa091909d3f4512e94950672d4d84fb6de3eec
-  data.tar.gz: 87f8f09ffc3c69f74ddbefc5d4f3a239b872562df991dd3427def92b232fb2ebbf005f98444878e36e491c57f9ed896b94b0fc7da550ca2ca7fcbb1c56aa1b1f
+  metadata.gz: 70d376abcd7908be0f558c279e353b1f492bb01bf373f009c6682184144dc76d3208897aefa6d3bdeb16bfb48db0419ab5985062dc1db5f0928534c70826e5ad
+  data.tar.gz: e8acce84987919108a0b3947af65efa8ef6c5dfb771377c0e012b4ad7e4ca98514c3d8ee6a16e9a0af0077d52b83a37a2deb79cc4641295ffdf6b286f775c27e

data/lib/fastlane/plugin/increment_build_number/actions/increment_bundle_version_action.rb

@@ -5,13 +5,22 @@ module Fastlane
   module Actions
     class IncrementBundleVersionAction < Action
       def self.run(params)
-        ver_code = Fastlane::Actions::GetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleVersion")
-        new_ver = self.number?(ver_code).nil? ? nil : ver_code.to_i + 1
-        if new_ver.nil?
-          UI.user_error!("Failure - Increment bundle version #{params[:info_plist]} from #{ver_code} to #{new_ver}.")
+        org_version = Fastlane::Actions::GetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleShortVersionString")
+        version = params[:version_number] || org_version
+        org_build = Fastlane::Actions::GetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleVersion")
+        build = params[:build_number] || org_build
+        auto_increment = params[:auto_increment].nil? ? true : params[:auto_increment]
+        new_build = if self.number?(build).nil?
+                      nil
+                    else
+                      auto_increment ? build.to_i + 1 : build.to_i
+                    end
+        if new_build.nil?
+          UI.user_error!("Failure - Increment/Change bundle version #{params[:info_plist]} from #{org_build} to #{new_build} and change version from #{org_version} to #{version}.")
         else
-          Fastlane::Actions::SetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleVersion", value: new_ver.to_s)
-          UI.success("Success - Increment bundle version #{params[:info_plist]} from #{ver_code} to #{new_ver}!")
+          Fastlane::Actions::SetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleShortVersionString", value: version.to_s)
+          Fastlane::Actions::SetInfoPlistValueAction.run(path: params[:info_plist], key: "CFBundleVersion", value: new_build.to_s)
+          UI.success("Success - Increment/Change bundle version #{params[:info_plist]} from #{org_build} to #{new_build} and change version from #{org_version} to #{version}!")
         end
       end
 
@@ -41,10 +50,29 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :info_plist,
                                        env_name: "FL_BUILD_NUMBER_INFO_PLIST",
                                        description: "optional, you must specify the path to your Info.plist file if it is not in the project root directory",
+                                       type: String,
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find Info.plist") if !File.exist?(value) && !Helper.test?
                                        end),
+          FastlaneCore::ConfigItem.new(key: :version_number,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_VERSION_NUMBER",
+                                       description: "Change to a specific version number. This will replace the bump type value",
+                                       type: String,
+                                       optional: true,
+                                       skip_type_validation: true),
+          FastlaneCore::ConfigItem.new(key: :build_number,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_BUILD_NUMBER",
+                                       description: "Change to a specific build number",
+                                       type: String,
+                                       optional: true,
+                                       skip_type_validation: true),
+          FastlaneCore::ConfigItem.new(key: :auto_increment,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_AUTO_INCREMENT",
+                                       description: "Auto increment version code from your AndroidManifest.xml's original version code",
+                                       type: Boolean,
+                                       optional: true,
+                                       default_value: true)
         ]
       end
 

data/lib/fastlane/plugin/increment_build_number/actions/increment_version_code_action.rb

@@ -8,15 +8,24 @@ module Fastlane
         require "nokogiri"
         require "open-uri"
 
-        manifest = Nokogiri::XML(open(params[:manifest]))
-        ver_code = manifest.xpath("//manifest").first["android:versionCode"]
-        new_ver = self.number?(ver_code).nil? ? nil : ver_code.to_i + 1
-        if new_ver.nil?
-          UI.user_error!("Failure - Increment version code #{params[:manifest]} from #{ver_code} to #{new_ver}.")
+        manifest = Nokogiri::XML(File.open(params[:manifest]))
+        org_name = manifest.xpath("//manifest").first["android:versionName"]
+        ver_name = params[:version_name] || org_name
+        org_code = manifest.xpath("//manifest").first["android:versionCode"]
+        ver_code = params[:version_code] || org_code
+        auto_increment = params[:auto_increment].nil? ? true : params[:auto_increment]
+        new_code = if self.number?(ver_code).nil?
+                     nil
+                   else
+                     auto_increment ? ver_code.to_i + 1 : ver_code.to_i
+                   end
+        if new_code.nil?
+          UI.user_error!("Failure - Increment/Change version code #{params[:manifest]} from #{org_code} to #{new_code} and change version name from #{org_name} to #{ver_name}.")
         else
-          manifest.xpath("//manifest").first["android:versionCode"] = new_ver
+          manifest.xpath("//manifest").first["android:versionName"] = ver_name
+          manifest.xpath("//manifest").first["android:versionCode"] = new_code
           File.write(params[:manifest], manifest.to_xml)
-          UI.success("Success - Increment version code #{params[:manifest]} from #{ver_code} to #{new_ver}!")
+          UI.success("Success - Increment/Change version code #{params[:manifest]} from #{org_code} to #{new_code} and change version name from #{org_name} to #{ver_name}!")
         end
       end
 
@@ -44,12 +53,28 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :manifest,
-                                       env_name: "FL_BUILD_NUMBER_MANIFEST",
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_MANIFEST",
                                        description: "optional, you must specify the path to your AndroidManifest.xml file if it is not in the project root directory",
                                        optional: true,
                                        verify_block: proc do |value|
                                          UI.user_error!("Could not find AndroidManifest.xml") if !File.exist?(value) && !Helper.test?
                                        end),
+          FastlaneCore::ConfigItem.new(key: :version_name,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_VERSION_NAME",
+                                       description: "Change to a specific version name. This will replace the bump type value",
+                                       optional: true,
+                                       skip_type_validation: true),
+          FastlaneCore::ConfigItem.new(key: :version_code,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_VERSION_CODE",
+                                       description: "Change to a specific version code.",
+                                       optional: true,
+                                       skip_type_validation: true),
+          FastlaneCore::ConfigItem.new(key: :auto_increment,
+                                       env_name: "FL_INCREMENT_BUILD_NUMBER_AUTO_INCREMENT",
+                                       description: "Auto increment version code from your AndroidManifest.xml's original version code",
+                                       type: Boolean,
+                                       optional: true,
+                                       default_value: true)
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module IncrementBuildNumber
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-increment_build_number
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Miyabi Ogino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-21 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.198.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -150,20 +164,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: miyabichan@aol.jp
 executables: []