fastlane-plugin-versioning 0.4.0 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168e204d03dbb77518ab76a1b29af130fdeb931ca84638cbf6c714cb6e2302a6
-  data.tar.gz: 2844377544c63bd02137e6d9fc4f878a4e0b3eae142f9fde6334fbe9eb6cc24f
+  metadata.gz: b702f4098465814793901e44ceeb26fc25065051ad0eadfbb60500129210b43f
+  data.tar.gz: d43d02bd7b29f9d4cfc90f024831427ba997300520ccaada886943289e393710
 SHA512:
-  metadata.gz: 664ed3aaf04e09e5c36744c83f03c7a4325a077bd45f52a1606216c10c0b85948f519907340f0e8df6a6f5968dea2b220ba1758a4e70fc3b91b145ce650b3f62
-  data.tar.gz: 4837f797b26815e6cc1565b1fa6faa6c164047c24be2ef1741d48819367d19b7bb87d31f4bea3510aabb6c8ac7697de55a883df20ba6d98931332e1432e37252
+  metadata.gz: b705c684f255b4e7fcd7f93005772b33c9226881eda1a17b4837aa6da30fa4cc04b414b42044c47a21a342e2f970b5493344f016c0fcbc51f0796a40f124c1b0
+  data.tar.gz: 9d1ce19055ce84510a73be5aa01c50adf0e391807703dfb4ed923a29300db196d079d2bf66aff4475d9d074b4fb445db9d1b522a241c41859eb2c0f2b9c760d2

data/README.md

@@ -158,7 +158,7 @@ version = get_build_number_from_plist(xcodeproj: "Project.xcodeproj", # optional
 
 ### get_build_number_from_xcodeproj
 
-Get the build number from a xcodeproj - specific to a target. Doesn't use agvtool (unlike default `get_build_number`).
+Get the build number from a xcodeproj - specific to a target. Doesn't use `agvtool` (unlike default `get_build_number`).
 
 ```ruby
 version = get_build_number_from_xcodeproj(xcodeproj: "Project.xcodeproj", # optional
@@ -168,7 +168,7 @@ version = get_build_number_from_xcodeproj(xcodeproj: "Project.xcodeproj", # opti
 
 ### get_version_number_from_xcodeproj
 
-Get the version number from a xcodeproj - specific to a target. Doesn't use agvtool (unlike default `get_build_number`).
+Get the version number from a xcodeproj - specific to a target. Doesn't use `agvtool` (unlike default `get_build_number`).
 
 ```ruby
 version = get_version_number_from_xcodeproj(xcodeproj: 'Project.xcodeproj', # optional

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

@@ -27,7 +27,7 @@ module Fastlane
         end
 
         if ENV.key?('GITLAB_CI')
-          return ENV['CI_JOB_ID']
+          return ENV['CI_PIPELINE_IID'] || ENV['CI_JOB_ID']
         end
 
         if ENV.key?('XCS')
@@ -50,7 +50,7 @@ module Fastlane
           return ENV['APPVEYOR_BUILD_NUMBER']
         end
 
-        UI.error("Cannot detect current CI build number. Use 1 by default.")
+        UI.error("Cannot detect current CI build number. Defaulting to \"1\".")
         "1"
       end
 
@@ -63,7 +63,7 @@ module Fastlane
       end
 
       def self.authors
-        ["Siarhei Fedartsou"]
+        ["Siarhei Fedartsou", "John Douglas"]
       end
 
       def self.example_code

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

@@ -57,7 +57,7 @@ module Fastlane
 
         if !(build_configuration_name = params[:build_configuration_name]).nil?
           build_number = build_number[build_configuration_name]
-          UI.user_error! "Cannot resolve $(CURRENT_PROJECT_VERSION) build setting for #{build_configuration_name}." if plist.nil?
+          UI.user_error! "Cannot resolve $(CURRENT_PROJECT_VERSION) build setting for #{build_configuration_name}." if build_number.nil?
         else
           build_number = build_number.values.compact.uniq
           UI.user_error! 'Cannot accurately resolve $(CURRENT_PROJECT_VERSION) build setting, try specifying :build_configuration_name.' if build_number.count > 1

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

@@ -41,7 +41,7 @@ module Fastlane
 
         if !(build_configuration_name = params[:build_configuration_name]).nil?
           version_number = version_number[build_configuration_name]
-          UI.user_error! "Cannot resolve $(MARKETING_VERSION) build setting for #{build_configuration_name}." if plist.nil?
+          UI.user_error! "Cannot resolve $(MARKETING_VERSION) build setting for #{build_configuration_name}." if version_number.nil?
         else
           version_number = version_number.values.compact.uniq
           UI.user_error! 'Cannot accurately resolve $(MARKETING_VERSION) build setting, try specifying :build_configuration_name.' if version_number.count > 1

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

@@ -59,16 +59,21 @@ module Fastlane
           target = project.targets[0] if target.nil?
         end
 
-        project.build_settings["CURRENT_PROJECT_VERSION"] = next_build_number
+        target.build_configurations.each do |config|
+          UI.message "updating #{config.name} to build #{next_build_number}"
+          config.build_settings["CURRENT_PROJECT_VERSION"] = next_build_number
+        end unless target.nil?
+
         project.save
       end
 
       def self.set_build_number_using_scheme(params, next_build_number)
-        config = { project: params[:xcodeproj], scheme: params[:scheme], configuration: params[:build_configuration_name] }
-        project = FastlaneCore::Project.new(config)
-        project.select_scheme
-
-        project.build_settings["CURRENT_PROJECT_VERSION"] = next_build_number
+        project = Xcodeproj::Project.open(params[:xcodeproj])
+        configs = project.objects.select { |obj| select_build_configuration_predicate(params[:build_configuration_name], obj) }
+        configs.each do |config|
+          config.build_settings["CURRENT_PROJECT_VERSION"] = next_build_number
+        end
+        
         project.save
       end
 
@@ -111,7 +116,7 @@ module Fastlane
       end
 
       def self.authors
-        ["jdouglas-nz"]
+        ["jdouglas-nz", "neilb01"]
       end
 
       def self.is_supported?(platform)

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

@@ -66,7 +66,7 @@ module Fastlane
         return is_build_valid_configuration
       end
 
-      def self.set_build_version_using_target(params, next_version_number)
+      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] }
@@ -79,17 +79,21 @@ module Fastlane
           target = project.targets[0] if target.nil?
         end
 
-        project.build_settings["MARKETING_VERSION"] = next_version_number
+        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_build_version_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
+      def self.set_version_number_using_scheme(params, next_version_number)
+          project = Xcodeproj::Project.open(params[:xcodeproj])
+          configs = project.objects.select { |obj| select_build_configuration_predicate(params[:build_configuration_name], obj) }
+          configs.each do |config|
+            config.build_settings["MARKETING_VERSION"] = next_version_number
+          end
+          project.save
       end
 
       #####################################################
@@ -163,7 +167,7 @@ module Fastlane
       end
 
       def self.authors
-        ["jdouglas-nz"]
+        ["jdouglas-nz", "neilb01"]
       end
 
       def self.is_supported?(platform)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Versioning
-    VERSION = "0.4.0"
+    VERSION = "0.4.6"
   end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-versioning
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.6
 platform: ruby
 authors:
 - Siarhei Fiedartsou
+- John Douglas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2021-07-11 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: []
@@ -107,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+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