fastlane-plugin-versioning 0.3.3 → 0.4.4

data/lib/fastlane/plugin/versioning/actions/increment_version_number_in_plist.rb

@@ -15,32 +15,52 @@ module Fastlane
           version_array = current_version.split(".").map(&:to_i)
           case params[:bump_type]
           when "patch"
-            version_array[2] = (version_array[2] ? version_array[2] : 0) + 1
+            version_array[2] = (version_array[2] || 0) + 1
           when "minor"
-            version_array[1] = (version_array[1] ? version_array[1] : 0) + 1
+            version_array[1] = (version_array[1] || 0) + 1
             version_array[2] = version_array[2] = 0
           when "major"
-            version_array[0] = (version_array[0] ? version_array[0] : 0) + 1
+            version_array[0] = (version_array[0] || 0) + 1
             version_array[1] = version_array[1] = 0
             version_array[1] = version_array[2] = 0
           end
 
           if params[:omit_zero_patch_version] && version_array[2] == 0
-            version_array.pop()
+            version_array.pop
           end
 
           next_version_number = version_array.join(".")
         end
 
         if Helper.test?
-          plist = "/tmp/fastlane/tests/fastlane/Info.plist"
+          plist = "/tmp/fastlane/tests/fastlane/plist/Info.plist"
         else
           plist = GetInfoPlistPathAction.run(params)
         end
 
-        SetInfoPlistValueAction.run(path: plist, key: 'CFBundleShortVersionString', value: next_version_number)
+        if current_version =~ /\$\(([\w\-]+)\)/
+          UI.important "detected that version is a build setting."
+          if params[:plist_build_setting_support]
+            UI.important "will continue and update the xcodeproj MARKETING_VERSION instead."
+            IncrementVersionNumberInXcodeprojAction.run(params)
+          else
+            UI.important "will continue and update the info plist key. this will replace the existing value."
+            SetInfoPlistValueAction.run(path: plist, key: 'CFBundleShortVersionString', value: next_version_number)
+          end
+        else
+          if params[:plist_build_setting_support]
+            UI.important "will update the xcodeproj MARKETING_VERSION."
+            IncrementVersionNumberInXcodeprojAction.run(params)
+            UI.important "will also update info plist key to be a build setting"
+            SetInfoPlistValueAction.run(path: plist, key: 'CFBundleShortVersionString', value: "$(MARKETING_VERSION)")
+          else
+            UI.important "will update the info plist key. this will replace the existing value."
+            SetInfoPlistValueAction.run(path: plist, key: 'CFBundleShortVersionString', value: next_version_number)
+          end
+        end
 
         Actions.lane_context[SharedValues::VERSION_NUMBER] = next_version_number
+        next_version_number
       end
 
       def self.description
@@ -49,7 +69,8 @@ module Fastlane
 
       def self.details
         [
-          "This action will increment the version number directly in Info.plist. "
+          "This action will increment the version number directly in Info.plist. ",
+          "unless plist_build_setting_support: true is passed in as parameters"
         ].join("\n")
       end
 
@@ -76,7 +97,7 @@ module Fastlane
                                        env_name: "FL_APPSTORE_VERSION_NUMBER_BUNDLE_ID",
                                        description: "Bundle ID of the application",
                                        optional: true,
-                                       conflicting_options: [:xcodeproj, :target, :build_configuration_name, :scheme],
+                                       conflicting_options: %i[xcodeproj target build_configuration_name scheme],
                                        is_string: true),
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                                        env_name: "FL_VERSION_NUMBER_PROJECT",
@@ -90,12 +111,12 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :target,
                                        env_name: "FL_VERSION_NUMBER_TARGET",
                                        optional: true,
-                                       conflicting_options: [:bundle_id, :scheme],
+                                       conflicting_options: %i[bundle_id scheme],
                                        description: "Specify a specific target if you have multiple per project, optional"),
           FastlaneCore::ConfigItem.new(key: :scheme,
                                        env_name: "FL_VERSION_NUMBER_SCHEME",
                                        optional: true,
-                                       conflicting_options: [:bundle_id, :target],
+                                       conflicting_options: %i[bundle_id target],
                                        description: "Specify a specific scheme if you have multiple per project, optional"),
           FastlaneCore::ConfigItem.new(key: :build_configuration_name,
                                        optional: true,
@@ -107,7 +128,11 @@ module Fastlane
                                        verify_block: proc do |value|
                                          UI.user_error!("Available values are 'plist' and 'appstore'") unless ['plist', 'appstore'].include? value
                                        end,
-                                       description: "Source version to increment. Available options: plist, appstore")
+                                       description: "Source version to increment. Available options: plist, appstore"),
+          FastlaneCore::ConfigItem.new(key: :plist_build_setting_support,
+                                        description: "support automatic resolution of build setting from xcodeproj if not a literal value in the plist",
+                                        is_string: false,
+                                        default_value: false)
         ]
       end
 
@@ -117,12 +142,12 @@ module Fastlane
         ]
       end
 
-      def self.author
-        "SiarheiFedartsou"
+      def self.authors
+        ["SiarheiFedartsou", "jdouglas-nz"]
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include? platform
+        %i[ios mac].include? platform
       end
     end
   end

data/lib/fastlane/plugin/versioning/actions/increment_version_number_in_xcodeproj.rb

@@ -0,0 +1,178 @@
+module Fastlane
+  module Actions
+    class IncrementVersionNumberInXcodeprojAction < Action
+      def self.run(params)
+        if params[:version_number]
+          next_version_number = params[:version_number]
+        else
+          case params[:version_source]
+          when "xcodeproj"
+            current_version = GetVersionNumberFromXcodeprojAction.run(params)
+          when "appstore"
+            current_version = GetAppStoreVersionNumberAction.run(params)
+          end
+
+          version_array = current_version.split(".").map(&:to_i)
+          case params[:bump_type]
+          when "patch"
+            version_array[2] = (version_array[2] || 0) + 1
+          when "minor"
+            version_array[1] = (version_array[1] || 0) + 1
+            version_array[2] = version_array[2] = 0
+          when "major"
+            version_array[0] = (version_array[0] || 0) + 1
+            version_array[1] = version_array[1] = 0
+            version_array[1] = version_array[2] = 0
+          end
+
+          if params[:omit_zero_patch_version] && version_array[2] == 0
+            version_array.pop
+          end
+
+          next_version_number = version_array.join(".")
+          end
+
+        if Helper.test?
+          params[:xcodeproj] = "/tmp/fastlane/tests/fastlane/xcodeproj/versioning_fixture_project.xcodeproj"
+        else
+          params[:xcodeproj] = Dir["*.xcodeproj"][0] unless params[:xcodeproj]
+        end
+
+        if params[:target]
+          set_version_number_using_target(params, next_version_number)
+        elsif params[:build_configuration_name] && params[:scheme]
+          set_version_number_using_scheme(params, next_version_number)
+        else
+          set_all_xcodeproj_version_numbers(params, next_version_number)
+        end
+
+        Actions.lane_context[SharedValues::VERSION_NUMBER] = next_version_number
+        next_version_number
+      end
+
+      def self.set_all_xcodeproj_version_numbers(params, next_version_number)
+        project = Xcodeproj::Project.open(params[:xcodeproj])
+        configs = project.objects.select { |obj| select_build_configuration_predicate(nil, obj) }
+        configs.each do |config|
+          config.build_settings["MARKETING_VERSION"] = next_version_number
+        end
+        project.save
+      end
+
+      private_class_method
+      def self.select_build_configuration_predicate(name, configuration)
+        is_build_valid_configuration = configuration.isa == "XCBuildConfiguration" && !configuration.build_settings["PRODUCT_BUNDLE_IDENTIFIER"].nil?
+        is_build_valid_configuration &&= configuration.name == name unless name.nil?
+        return is_build_valid_configuration
+      end
+
+      def self.set_version_number_using_target(params, next_version_number)
+        project = Xcodeproj::Project.open(params[:xcodeproj])
+        if params[:target]
+          target = project.targets.detect { |t| t.name == params[:target] }
+        else
+          # firstly we are trying to find modern application target
+          target = project.targets.detect do |t|
+            t.kind_of?(Xcodeproj::Project::Object::PBXNativeTarget) &&
+              t.product_type == 'com.apple.product-type.application'
+          end
+          target = project.targets[0] if target.nil?
+        end
+
+        target.build_configurations.each do |config|
+          UI.message "updating #{config.name} to version #{next_version_number}"
+          config.build_settings["MARKETING_VERSION"] = next_version_number
+        end unless target.nil?
+
+        project.save
+      end
+
+      def self.set_version_number_using_scheme(params, next_version_number)
+        config = { project: params[:xcodeproj], scheme: params[:scheme], configuration: params[:build_configuration_name] }
+        project = FastlaneCore::Project.new(config)
+        project.select_scheme
+
+        project.build_settings["MARKETING_VERSION"] = next_version_number
+        project.save
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Increment build number in xcodeproj"
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :bump_type,
+              env_name: "FL_VERSION_NUMBER_BUMP_TYPE",
+              description: "The type of this version bump. Available: patch, minor, major",
+              default_value: "patch",
+              verify_block: proc do |value|
+                UI.user_error!("Available values are 'patch', 'minor' and 'major'") unless ['patch', 'minor', 'major'].include? value
+              end),
+          FastlaneCore::ConfigItem.new(key: :version_number,
+                        env_name: "FL_VERSION_NUMBER_VERSION_NUMBER",
+                        description: "Change to a specific version. This will replace the bump type value",
+                        optional: true),
+          FastlaneCore::ConfigItem.new(key: :omit_zero_patch_version,
+                        env_name: "FL_VERSION_NUMBER_OMIT_ZERO_PATCH_VERSION",
+                        description: "If true omits zero in patch version(so 42.10.0 will become 42.10 and 42.10.1 will remain 42.10.1)",
+                        default_value: false,
+                        optional: true,
+                        is_string: false),
+          FastlaneCore::ConfigItem.new(key: :bundle_id,
+                        env_name: "FL_APPSTORE_VERSION_NUMBER_BUNDLE_ID",
+                        description: "Bundle ID of the application",
+                        optional: true,
+                        conflicting_options: %i[xcodeproj target build_configuration_name scheme],
+                        is_string: true),
+          FastlaneCore::ConfigItem.new(key: :xcodeproj,
+                        env_name: "FL_VERSION_NUMBER_PROJECT",
+                        description: "optional, you must specify the path to your main Xcode project if it is not in the project root directory",
+                        optional: true,
+                        conflicting_options: [:bundle_id],
+                        verify_block: proc do |value|
+                          UI.user_error!("Please pass the path to the project, not the workspace") if value.end_with? ".xcworkspace"
+                          UI.user_error!("Could not find Xcode project at path '#{File.expand_path(value)}'") if !File.exist?(value) and !Helper.is_test?
+                        end),
+          FastlaneCore::ConfigItem.new(key: :target,
+                        env_name: "FL_VERSION_NUMBER_TARGET",
+                        optional: true,
+                        conflicting_options: %i[bundle_id scheme],
+                        description: "Specify a specific target if you have multiple per project, optional"),
+          FastlaneCore::ConfigItem.new(key: :scheme,
+                        env_name: "FL_VERSION_NUMBER_SCHEME",
+                        optional: true,
+                        conflicting_options: %i[bundle_id target],
+                        description: "Specify a specific scheme if you have multiple per project, optional"),
+          FastlaneCore::ConfigItem.new(key: :build_configuration_name,
+                        optional: true,
+                        conflicting_options: [:bundle_id],
+                        description: "Specify a specific build configuration if you have different build settings for each configuration"),
+          FastlaneCore::ConfigItem.new(key: :version_source,
+                        optional: true,
+                        default_value: 'xcodeproj',
+                        verify_block: proc do |value|
+                          UI.user_error!("Available values are 'xcodeproj' and 'appstore'") unless ['xcodeproj', 'appstore'].include? value
+                        end,
+                        description: "Source version to increment. Available options: xcodeproj, appstore"),
+          FastlaneCore::ConfigItem.new(key: :plist_build_setting_support,
+                         description: "support automatic resolution of build setting from xcodeproj if not a literal value in the plist",
+                         is_string: false,
+                         default_value: false)
+        ]
+      end
+
+      def self.authors
+        ["jdouglas-nz"]
+      end
+
+      def self.is_supported?(platform)
+        %i[ios mac android].include? platform
+      end
+    end
+  end
+    end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Versioning
-    VERSION = "0.3.3"
+    VERSION = "0.4.4"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-versioning
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Siarhei Fiedartsou
+- John Douglas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-10 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -67,7 +68,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.93.1
 description: 
-email: siarhei.fedartsou@gmail.com
+email:
+- siarhei.fedartsou@gmail.com
+- john.douglas.nz@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,11 +81,15 @@ files:
 - lib/fastlane/plugin/versioning/actions/ci_build_number.rb
 - lib/fastlane/plugin/versioning/actions/get_app_store_version_number.rb
 - lib/fastlane/plugin/versioning/actions/get_build_number_from_plist.rb
+- lib/fastlane/plugin/versioning/actions/get_build_number_from_xcodeproj.rb
 - lib/fastlane/plugin/versioning/actions/get_info_plist_path.rb
 - lib/fastlane/plugin/versioning/actions/get_version_number_from_git_branch.rb
 - lib/fastlane/plugin/versioning/actions/get_version_number_from_plist.rb
+- lib/fastlane/plugin/versioning/actions/get_version_number_from_xcodeproj.rb
 - lib/fastlane/plugin/versioning/actions/increment_build_number_in_plist.rb
+- lib/fastlane/plugin/versioning/actions/increment_build_number_in_xcodeproj.rb
 - lib/fastlane/plugin/versioning/actions/increment_version_number_in_plist.rb
+- lib/fastlane/plugin/versioning/actions/increment_version_number_in_xcodeproj.rb
 - lib/fastlane/plugin/versioning/version.rb
 homepage: https://github.com/SiarheiFedartsou/fastlane-plugin-versioning
 licenses:
@@ -103,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Allows to set/get app version and build number directly to/from Info.plist