fastlane-plugin-cordova 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a4b5b48aa28034b00f28805ce38d774482cb0b1395276e2ca2f41e1be8cbb8
-  data.tar.gz: e19f9770b313b16898a2fcfd82f2fbd3c1bed883b1f7c98a4b85582b2ff6b85f
+  metadata.gz: d52fb1a54180a3d41cbe389df9c680280d9b7ab47321db121a496a214a324d47
+  data.tar.gz: 1b3735a564b445227be2727bd9fbcce560231df67f66519ef503613dda36b15c
 SHA512:
-  metadata.gz: 29793953c8d3ba76fced81de00c853cd9b7f2627b4f535fccc77c83d8930a60ca08d61cbb7095d10d4f3c09494f678011f09375f77792da91465d5cccf764f0f
-  data.tar.gz: d2736e308f3da7e4cd4586c3a61717a711fadf50bd358eb6adbbb903baa61996775e6455cdab1fbe7db91cfd754d90a9d8d5c6f6328e0061448d3cfd336fd9d1
+  metadata.gz: 43ab3d3bc03ebd87627d6ccd1938c0882bb5192df86da1a8143bb3bbee2e3a56f2454594890bbd8938b27981638138771eeb71f48bb291df9abab0220b1df0a8
+  data.tar.gz: 47259c49e981c2913e81b9165b36ed93b243937a0abf31120d5c1412b555044940cefc340dd06103737bca0bf22f47795ff46f2b5f8a1ca5a1ef5c9fa60d992b

data/lib/fastlane/plugin/cordova/actions/cordova_action.rb

@@ -116,9 +116,31 @@ module Fastlane
         sh "npx --no-install cordova compile #{params[:platform]} #{args.join(' ')} #{ios_args} -- #{android_args}"
       end
 
-      def self.set_build_paths(is_release)
+      # @param [String] platforms_output The output from running +cordova platform ls+.
+      # @return [true] if the platforms_output indicates Cordova iOS version 7.0.0 or greater is installed
+      def self.output_has_ios_7_or_greater(platforms_output)
+        # Extract the Cordova iOS version by searching for a string like "ios 7.0.0"
+        platforms_regex = /^.*ios\s(\d+).\d+.\d+/
+        match_data = platforms_output.match(platforms_regex)
+        if match_data != nil && match_data.size() > 1
+          ios_major_version = match_data[1].to_i
+          return ios_major_version >= 7
+        end
+        return false
+      end
+
+      # @return [true] if Cordova iOS version 7.0.0 or greater is installed
+      def self.using_ios_7_or_greater(params)
+        if params[:platform].to_s != 'ios'
+          return false
+        end
+        platforms_output = sh "npx --no-install cordova platform ls"
+        return self.output_has_ios_7_or_greater(platforms_output)
+      end
+
+      def self.set_build_paths(params)
         app_name = self.get_app_name()
-        build_type = is_release ? 'release' : 'debug'
+        build_type = params[:release] ? 'release' : 'debug'
 
         # Update the build path accordingly if Android is being 
         # built as an Android Application Bundle.
@@ -126,13 +148,14 @@ module Fastlane
         android_package_extension = android_package_type == 'bundle' ? '.aab' : '.apk'
 
         ENV['CORDOVA_ANDROID_RELEASE_BUILD_PATH'] = "./platforms/android/app/build/outputs/#{android_package_type}/#{build_type}/app-#{build_type}#{android_package_extension}"
-        ENV['CORDOVA_IOS_RELEASE_BUILD_PATH'] = "./platforms/ios/build/device/#{app_name}.ipa"
+        ios_subdirectory = self.using_ios_7_or_greater(params) ? 'Release-iphoneos' : 'device'
+        ENV['CORDOVA_IOS_RELEASE_BUILD_PATH'] = "./platforms/ios/build/#{ios_subdirectory}/#{app_name}.ipa"
       end
 
       def self.run(params)
         self.check_platform(params)
         self.build(params)
-        self.set_build_paths(params[:release])
+        self.set_build_paths(params)
       end
 
       #####################################################

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Cordova
-    VERSION = "3.1.0"
+    VERSION = "3.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-cordova
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Almouro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2023-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Build your Cordova app