fastlane-plugin-versioning 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b5abd3eb817480131289c1374ab663b59e7fba7a97c17421499b05a934200c
-  data.tar.gz: cec5b6815e3f92e082cf2f19efe560849d655eca18f5fc37d3521aa5618f8d63
+  metadata.gz: 31846ea92bbacc5b95feebd8e2dd1e9df3494d4aeef5373410b12adc2dabb881
+  data.tar.gz: 34853fe36a10ee78737918dbcd6ffdeda1322bfe55305f842288d6c7adb9557e
 SHA512:
-  metadata.gz: 53a42411d4b491df7e872269fa6c6cfe083e597dfdef9e83fe819697f9c5960a4d49f835116077db5e70a774191843f4e98d969502ae93eaba49a1110e18215b
-  data.tar.gz: 63beb92a441fa492f3082229007bf6fc36a88d68bc3ef2f79340155d57b61842ad3b3f9605a3f7925e8e3a45dee5a42bbabc2bc4cca55ea923f7cdc30e244cb1
+  metadata.gz: 24b894e961b6a22a26c50ab83f02fc2d78e814bb6a4f7d7c4db30d5d717c419d35ac0c44ab3586401120e7e17988e0fc50955d6bbf446c6d988bedf2ee3a93e6
+  data.tar.gz: 57f1527939970e9513536c9767ee7bb8dbde29ada4e2eb1890741f13b0f296ed711604ea1747429789f14975d38f1b9bcb94328778b2876bd54abdfa79878936

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

@@ -20,15 +20,28 @@ module Fastlane
         random = Helper.test? ? "123" : SecureRandom.uuid
 
         if params[:country]
-          uri = URI("http://itunes.apple.com/lookup?bundleId=#{bundle_id}&country=#{params[:country]}&rand=#{random}")
+          uri = URI("https://itunes.apple.com/lookup?bundleId=#{bundle_id}&country=#{params[:country]}&rand=#{random}")
         else
-          uri = URI("http://itunes.apple.com/lookup?bundleId=#{bundle_id}&rand=#{random}")
+          uri = URI("https://itunes.apple.com/lookup?bundleId=#{bundle_id}&rand=#{random}")
         end
         Net::HTTP.get(uri)
 
         response = Net::HTTP.get_response(uri)
-        UI.crash!("Unexpected status code from iTunes Search API") unless response.kind_of?(Net::HTTPSuccess)
-        response_body = JSON.parse(response.body)
+        case response
+        when Net::HTTPSuccess
+          response_body = JSON.parse(response.body)
+        when Net::HTTPRedirection
+          UI.crash!("iTunes Search API resolved with status code 302, but no redirect url has been received") unless response['location']
+          UI.important("iTunes Search API resolved with status code 302, redirecting to new url")
+
+          new_url = response['location']
+          response = Net::HTTP.get_response(URI(new_url))
+          UI.crash!("Unexpected status code from iTunes Search API") unless response.kind_of?(Net::HTTPSuccess)
+
+          response_body = JSON.parse(response.body)
+        else
+          UI.crash!("Unexpected status code from iTunes Search API")
+        end
 
         UI.user_error!("Cannot find app with #{bundle_id} bundle ID in the App Store") if response_body["resultCount"] == 0
 

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

@@ -16,7 +16,8 @@ module Fastlane
         if params[:target]
           version_number = get_version_number_using_target(params)
         else
-          version_number = get_version_number_using_scheme(params)
+          version_number = get_version_number_using_project(params) if params[:scheme].nil?
+          version_number = get_version_number_using_scheme(params) if version_number.nil?
         end
 
         Actions.lane_context[SharedValues::VERSION_NUMBER] = version_number
@@ -66,6 +67,18 @@ module Fastlane
         build_number
       end
 
+      def self.get_version_number_using_project(params)
+        project = Xcodeproj::Project.open(params[:xcodeproj])
+
+        if params[:build_configuration_name] && !params[:build_configuration_name].empty?
+          build_configuration_name = params[:build_configuration_name]
+        else
+          build_configuration_name = project.build_configurations.first.name
+        end
+
+        version_number = project.build_settings(build_configuration_name)["MARKETING_VERSION"]
+      end
+
       #####################################################
       # @!group Documentation
       #####################################################

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

@@ -32,7 +32,7 @@ module Fastlane
           next_version_number = version_array.join(".")
           end
 
-        if Helper.test?
+        if Helper.test? && params[:xcodeproj].nil?
           params[:xcodeproj] = "/tmp/fastlane/tests/fastlane/xcodeproj/versioning_fixture_project.xcodeproj"
         else
           params[:xcodeproj] = Dir["*.xcodeproj"][0] unless params[:xcodeproj]
@@ -52,9 +52,16 @@ module Fastlane
 
       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
+
+        if project.build_configurations.find { |config| !config.build_settings["MARKETING_VERSION"].nil? }
+          project.build_configurations.each do |config|
+            config.build_settings["MARKETING_VERSION"] = next_version_number
+          end
+        else
+          configs = project.objects.select { |obj| select_build_configuration_predicate(nil, obj) }
+          configs.each do |config|
+            config.build_settings["MARKETING_VERSION"] = next_version_number
+          end
         end
         project.save
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Versioning
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-versioning
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Siarhei Fiedartsou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry