fastlane-plugin-semantic_versioning 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1205dbf528eadda53b7561ee36d93418c9f12fd7e5b8baa1f93f3f338411baa8
-  data.tar.gz: e083a5c015ecd318254c853589dc9233aa3e86b3da96699ebeaeecf95c2630f7
+  metadata.gz: c974c8e59adc155a1442566a6198e81d8192a85c2f0822cf20acccf8d3c6a320
+  data.tar.gz: 61060c47ebc660fdec7999392e05b7ee7303212b14cee2f414058579d7ee0840
 SHA512:
-  metadata.gz: 03b8bd862f3f5ef41791fd214864ac6d15c3928fe6e1fbf27acdb817619c6d3acae71b98c66b342a34d978795172e429fa7b0849e22313273fdbeac27a2fc4b5
-  data.tar.gz: c5efd5ec4a7f1e73150f105d6f82a0c54aa52926d694224286ce64fb38f5614abb916b25fb2c2933ad099bc843bad6e01f5ead837a9cacf980a3a321c811e6c9
+  metadata.gz: bca9ec5b145f927fab9a16bf6483b988133a30c7e4032ff756d3acbc24dffb3eae18b86ff02d1dcaa17293fd4077eab28a5f23ee3734401303fb1092dd2027e1
+  data.tar.gz: 4f04bc1f080a83b49d548a4e011692d0482c60dbc95e3601781f0239e672924ee1495ee4ebf114461dbef5cdbf627bbf1f24e75fc0fb70eb0b91816742080584

data/lib/fastlane/plugin/semantic_versioning/actions/get_versioning_info_action.rb

@@ -13,6 +13,7 @@ module Fastlane
       SEMVER_NEW_VERSION = :SEMVER_NEW_VERSION
       SEMVER_NEW_CHANGELOG = :SEMVER_NEW_CHANGELOG
       SEMVER_BUMPABLE = :SEMVER_BUMPABLE
+      SEMVER_VERSIONING_SYSTEM = :SEMVER_VERSIONING_SYSTEM
     end
 
     # Action to retrieve semantic versioning information from commit history.
@@ -23,9 +24,13 @@ module Fastlane
         params[:bump_map].transform_values!(&:to_sym)
         params[:force_type] = params[:force_type]&.to_sym
 
-        UI.message("The semantic_versioning plugin is working!")
+        verify_type_map(params[:type_map])
+        verify_bump_map(params[:bump_map])
+        Helper::SemanticVersioningHelper.verify_versioning_system(params[:versioning_system])
 
-        current_version = Helper::SemanticVersioningHelper.version_number
+        system = lane_context[SharedValues::SEMVER_VERSIONING_SYSTEM] = params[:versioning_system]
+
+        current_version = Helper::SemanticVersioningHelper.version_number(system: system)
         formatted_tag = Helper::SemanticVersioningHelper.formatted_tag(current_version, params[:tag_format])
 
         commits = Helper::SemanticVersioningHelper.git_commits(
@@ -68,7 +73,8 @@ module Fastlane
           ["SEMVER_BUMP_TYPE", "Type of version bump. One of major, minor, or patch"],
           ["SEMVER_NEW_VERSION", "New version that would have to be set from current version and commits"],
           ["SEMVER_NEW_CHANGELOG", "New changelog section for the new bump"],
-          ["SEMVER_BUMPABLE", "True if a version bump is possible"]
+          ["SEMVER_BUMPABLE", "True if a version bump is possible"],
+          ["SEMVER_VERSIONING_SYSTEM", "The versioning system used"]
         ]
       end
 
@@ -118,7 +124,16 @@ module Fastlane
                                        default_value: { breaking: "BREAKING CHANGES", feat: "Features",
                                                         fix: "Bug Fixes" },
                                        is_string: false,
-                                       verify_block: ->(value) { verify_type_map(value) })
+                                       verify_block: ->(value) { verify_type_map(value) }),
+          FastlaneCore::ConfigItem.new(key: :versioning_system,
+                                       env_name: "SEMANTIC_VERSIONING_VERSIONING_SYSTEM",
+                                       description: "Type of versioning to use. Can be 'manual' or 'apple-generic'." \
+                                                    "For 'apple-generic', the project has to be prepared with prepare_versioning." \
+                                                    "Defaults to 'manual'",
+                                       optional: true,
+                                       default_value: "manual",
+                                       is_string: true,
+                                       verify_block: ->(value) { Helper::SemanticVersioningHelper.verify_versioning_system(value) })
         ]
       end
 
@@ -135,8 +150,7 @@ module Fastlane
         # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
         # See: https://docs.fastlane.tools/advanced/#control-configuration-by-lane-and-by-platform
         #
-        # [:ios, :mac, :android].include?(platform)
-        true
+        %i[ios mac].include?(platform)
       end
       # :nocov:
     end

data/lib/fastlane/plugin/semantic_versioning/actions/prepare_versioning_action.rb

@@ -19,15 +19,20 @@ module Fastlane
         info_plist_file = File.join(main_group.path, "Info.plist")
         info_plist_path = File.join(project.path.dirname, info_plist_file)
 
+        current_version = Fastlane::Actions::GetVersionNumberAction.run(xcodeproj: xcodeproj_path)
+        Helper::SemanticVersioningHelper.ensure_info_plist(info_plist_path)
+        %w[CFBundleVersion CFBundleShortVersionString].each do |key|
+          unless Fastlane::Actions::GetInfoPlistValueAction.run(path: info_plist_path, key: key)
+            Fastlane::Actions::SetInfoPlistValueAction.run(path: info_plist_path, key: key, value: current_version)
+          end
+        end
+
         target.build_configurations.each do |config|
           config.build_settings["VERSIONING_SYSTEM"] = "apple-generic"
           config.build_settings.delete("MARKETING_VERSION")
           config.build_settings.delete("GENERATE_INFOPLIST_FILE")
-
-          config.build_settings["INFOPLIST_FILE"] = info_plist_file unless config.build_settings["INFOPLIST_FILE"]
-
-          Helper::SemanticVersioningHelper.ensure_info_plist(info_plist_path)
         end
+
         project.save
         true
       end

data/lib/fastlane/plugin/semantic_versioning/actions/semantic_bump_action.rb

@@ -8,19 +8,22 @@ module Fastlane
     # Action to bumps the version according to semantic versioning and writes a changelog.
     class SemanticBumpAction < Action
       def self.run(params)
-        unless Actions.lane_context.key?(SharedValues::SEMVER_BUMPABLE)
+        unless Actions.lane_context.key?(SharedValues::SEMVER_BUMPABLE) && Actions.lane_context.key?(SharedValues::SEMVER_VERSIONING_SYSTEM)
           UI.user_error!("No semver information found. Please run get_versioning_info beforehand.")
         end
 
+        Helper::SemanticVersioningHelper.verify_versioning_system(Actions.lane_context[SharedValues::SEMVER_VERSIONING_SYSTEM])
+
         unless Actions.lane_context[SharedValues::SEMVER_BUMPABLE]
           UI.message("No version bump detected.")
           return false
         end
 
+        system = Actions.lane_context[SharedValues::SEMVER_VERSIONING_SYSTEM]
         version_number = Actions.lane_context[SharedValues::SEMVER_NEW_VERSION]
         next_changelog = Actions.lane_context[SharedValues::SEMVER_NEW_CHANGELOG]
 
-        Fastlane::Actions::IncrementVersionNumberAction.run(version_number: version_number)
+        Helper::SemanticVersioningHelper.set_version_number(version_number: version_number, system: system)
 
         if params[:changelog_file]
           Helper::SemanticVersioningHelper.write_changelog(
@@ -75,7 +78,16 @@ module Fastlane
                                        description: "Filename for the changelog",
                                        optional: true,
                                        default_value: "CHANGELOG.md",
-                                       type: String)
+                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :versioning_system,
+                                       env_name: "SEMANTIC_VERSIONING_VERSIONING_SYSTEM",
+                                       description: "Type of versioning to use. Can be 'manual' or 'apple-generic'." \
+                                                    "For 'apple-generic', the project has to be prepared with prepare_versioning." \
+                                                    "Defaults to 'manual'",
+                                       optional: true,
+                                       default_value: "manual",
+                                       is_string: true,
+                                       verify_block: ->(value) { Helper::SemanticVersioningHelper.verify_versioning_system(value) })
         ]
       end
 
@@ -84,8 +96,7 @@ module Fastlane
         # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
         # See: https://docs.fastlane.tools/advanced/#control-configuration-by-lane-and-by-platform
         #
-        # [:ios, :mac, :android].include?(platform)
-        true
+        %i[ios mac].include?(platform)
       end
       # :nocov:
     end

data/lib/fastlane/plugin/semantic_versioning/helper/semantic_versioning_helper.rb

@@ -2,6 +2,7 @@
 
 require "fastlane_core/ui/ui"
 require "fastlane/actions/get_version_number"
+require "fastlane/plugin/versioning"
 require "git"
 require "xcodeproj"
 
@@ -13,12 +14,27 @@ module Fastlane
       # class methods that you define here become available in your action
       # as `Helper::SemanticVersioningHelper.your_method`
       #
-      def self.show_message
-        UI.message("Hello from the semantic_versioning plugin helper!")
+      def self.version_number(system:)
+        if system == "apple-generic"
+          Actions::GetVersionNumberAction.run({})
+        else
+          Actions::GetVersionNumberFromXcodeprojAction.run({})
+        end
+      end
+
+      def self.set_version_number(version_number:, system:)
+        if system == "apple-generic"
+          Fastlane::Actions::IncrementVersionNumberAction.run(version_number: version_number)
+        else
+          Actions::IncrementVersionNumberInXcodeprojAction.run(version_number: version_number)
+        end
       end
 
-      def self.version_number
-        Actions::GetVersionNumberAction.run({})
+      def self.verify_versioning_system(value)
+        allowed = %w[apple-generic manual]
+        return if allowed.include?(value)
+
+        UI.user_error!("'versioning_system' must be one of #{allowed}")
       end
 
       def self.formatted_tag(tag, format)
@@ -185,10 +201,6 @@ module Fastlane
         project.targets.first
       end
 
-      def self.current_version
-        @current_version ||= main_target.build_configurations.first.build_settings["MARKETING_VERSION"] || "1.0"
-      end
-
       def self.main_group(name = nil)
         project.main_group[name || main_target.name]
       end
@@ -196,22 +208,21 @@ module Fastlane
       def self.ensure_info_plist(path)
         return if File.exist?(path)
 
-        File.write(path, <<-"PLIST")
-              <?xml version="1.0" encoding="UTF-8"?>
-              <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-              <plist version="1.0">
-              <dict>
-                <key>CFBundleVersion</key>
-                <string>#{current_version}</string>
-                <key>CFBundleShortVersionString</key>
-                <string>#{current_version}</string>
-              </dict>
-              </plist>
+        File.write(path, <<-PLIST)
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+          </dict>
+          </plist>
         PLIST
 
         info_plist = main_group.new_file("Info.plist")
-        main_target.add_file_references([info_plist])
-        Fastlane::UI.success("Successfully created the file '#{path}' for agvtool")
+        info_plist.include_in_index = nil
+        info_plist.set_last_known_file_type("text.plist")
+        main_target.build_configurations.each do |config|
+          config.build_settings["INFOPLIST_FILE"] = info_plist.full_path.to_s
+        end
       end
     end
   end

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

@@ -2,6 +2,6 @@
 
 module Fastlane
   module SemanticVersioning
-    VERSION = "2.1.0"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-semantic_versioning
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Karsten Silkenbäumer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-20 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fastlane-plugin-versioning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement