fastlane-plugin-cordova 1.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33b2941827c2c572a8200023baae74e14e12e6f4
-  data.tar.gz: 0c7020beddba620ee44a645a0624b2e756a77d97
+SHA256:
+  metadata.gz: 8e99de8a0b61971ce82e999b29ca6e69149bf4cfd9d10878bc12c567630afdef
+  data.tar.gz: 1ee12a3b5401561de12fe1c3dda8d995a2bc368df1c9cdac38f168bcc992a967
 SHA512:
-  metadata.gz: 8b945078aeaa1b382fd71f6666b0352e858b73c49dc237f810a52bc97f78c4c78ce39ba2fbc3d89b4f664ce923a1e006ae00f9f0d39892a52d7af90410ac921f
-  data.tar.gz: f6bd05bf69941f5e76bd4c37918895d3a18d45594adc72fd7673da24cbd2d26a94ca793c95e6a941a92709f23300245c58aa18e79ad7bf65a6e60f828b2aa8e5
+  metadata.gz: e134266eecc26bdbf6662cf9f08bd60d1316590b5eded1ea9f67cccd6fec5e45daf39d362fede2d9194137be2e7a703826b03f1f97e8b5358fa4e7004b9e204c
+  data.tar.gz: db4ef75db27170061b9fae83c90b2648d8c4014bee40f95aeea845cf6303f6e13c875bf7ff839f68dfa41b0ddbabd3cb61a484fda666bdd4a87e0aa55a73ce1a

data/README.md

@@ -15,6 +15,8 @@ This project is a [fastlane](https://github.com/fastlane/fastlane) plugin. To ge
 fastlane add_plugin cordova
 ```
 
+:warning: *If you're using a Cordova version below 7, you need to use version `1.0.1` of this plugin*
+
 Then you can integrate it into your Fastlane setup:
 
 ```ruby
@@ -77,6 +79,7 @@ Which will produce:
 | **device**               | Build for device                                          | CORDOVA_DEVICE              | *true* |
 | **type**                 | This will determine what type of build is generated by Xcode. <br>Valid options are development, enterprise, adhoc, and appstore| CORDOVA_IOS_PACKAGE_TYPE    | appstore |
 | **team_id**              | The development team (Team ID) to use for code signing  | CORDOVA_IOS_TEAM_ID               | *28323HT* |
+| **build_flag**           | An array of Xcode buildFlag. Will be appended on compile command.  | CORDOVA_IOS_BUILD_FLAG               | [] |
 | **provisioning_profile** | GUID of the provisioning profile to be used for signing | CORDOVA_IOS_PROVISIONING_PROFILE  |           |
 | **keystore_path**        | Path to the Keystore for Android                        | CORDOVA_ANDROID_KEYSTORE_PATH     |           |
 | **keystore_password**    | Android Keystore password                               | CORDOVA_ANDROID_KEYSTORE_PASSWORD |           |
@@ -87,6 +90,7 @@ Which will produce:
 | **browserify**           | Specifies whether to browserify build or not            | CORDOVA_BROWSERIFY                |  *false*  |
 | **cordova_prepare**      | Specifies whether to run `cordova prepare` before building  | CORDOVA_PREPARE               |  *true*   |
 | **cordova_no_fetch**      | Specifies whether to run `cordova platform add` with `--nofetch` parameter  | CORDOVA_NO_FETCH               |  *false*   |
+| **cordova_build_config_file**      | Call `cordova compile` with `--buildConfig=<ConfigFile>` to specify build config file path  | CORDOVA_BUILD_CONFIG_FILE               |     |
 
 ## Run tests for this plugin
 

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

@@ -20,14 +20,24 @@ module Fastlane
         type: 'packageType',
         team_id: 'developmentTeam',
         provisioning_profile: 'provisioningProfile',
+        build_flag: 'buildFlag'
       }
 
       def self.get_platform_args(params, args_map)
         platform_args = []
         args_map.each do |action_key, cli_param|
           param_value = params[action_key]
-          unless param_value.to_s.empty?
-            platform_args << "--#{cli_param}=#{Shellwords.escape(param_value)}"
+
+          if action_key.to_s == 'build_flag' && param_value.kind_of?(Array)
+            unless param_value.empty?
+              param_value.each do |flag|
+                platform_args << "--#{cli_param}=#{flag.shellescape}"
+              end
+            end
+          else
+            unless param_value.to_s.empty?
+              platform_args << "--#{cli_param}=#{Shellwords.escape(param_value)}"
+            end
           end
         end
 
@@ -63,9 +73,9 @@ module Fastlane
         platform = params[:platform]
         if platform && !File.directory?("./platforms/#{platform}")
           if params[:cordova_no_fetch]
-            sh "cordova platform add #{platform} --nofetch"
+            sh "npx --no-install cordova platform add #{platform} --nofetch"
           else
-            sh "cordova platform add #{platform}"
+            sh "npx --no-install cordova platform add #{platform}"
           end
         end
       end
@@ -79,11 +89,16 @@ module Fastlane
         args = [params[:release] ? '--release' : '--debug']
         args << '--device' if params[:device]
         args << '--browserify' if params[:browserify]
+
+        if !params[:cordova_build_config_file].to_s.empty?
+          args << "--buildConfig=#{Shellwords.escape(params[:cordova_build_config_file])}"
+        end
+
         android_args = self.get_android_args(params) if params[:platform].to_s == 'android'
         ios_args = self.get_ios_args(params) if params[:platform].to_s == 'ios'
 
         if params[:cordova_prepare]
-          sh "cordova prepare #{params[:platform]} #{args.join(' ')} #{ios_args} -- #{android_args}"
+          sh "npx --no-install cordova prepare #{params[:platform]} #{args.join(' ')} #{ios_args} -- #{android_args}"
         end
 
         if params[:platform].to_s == 'ios' && !params[:build_number].to_s.empty?
@@ -97,14 +112,14 @@ module Fastlane
           )
         end
 
-        sh "cordova compile #{params[:platform]} #{args.join(' ')} #{ios_args} -- #{android_args}"
+        sh "npx --no-install cordova compile #{params[:platform]} #{args.join(' ')} #{ios_args} -- #{android_args}"
       end
 
       def self.set_build_paths(is_release)
         app_name = self.get_app_name()
         build_type = is_release ? 'release' : 'debug'
 
-        ENV['CORDOVA_ANDROID_RELEASE_BUILD_PATH'] = "./platforms/android/build/outputs/apk/android-#{build_type}.apk"
+        ENV['CORDOVA_ANDROID_RELEASE_BUILD_PATH'] = "./platforms/android/app/build/outputs/apk/#{build_type}/app-#{build_type}.apk"
         ENV['CORDOVA_IOS_RELEASE_BUILD_PATH'] = "./platforms/ios/build/device/#{app_name}.ipa"
       end
 
@@ -227,7 +242,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :cordova_prepare,
             env_name: "CORDOVA_PREPARE",
-            description: "Specifies whether to run `cordova prepare` before building",
+            description: "Specifies whether to run `npx cordova prepare` before building",
             default_value: true,
             is_string: false
           ),
@@ -241,9 +256,25 @@ module Fastlane
           FastlaneCore::ConfigItem.new(
             key: :cordova_no_fetch,
             env_name: "CORDOVA_NO_FETCH",
-            description: "Call `cordova platform add` with `--nofetch` parameter",
+            description: "Call `npx cordova platform add` with `--nofetch` parameter",
             default_value: false,
             is_string: false
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :build_flag,
+            env_name: "CORDOVA_IOS_BUILD_FLAG",
+            description: "An array of Xcode buildFlag. Will be appended on compile command",
+            is_string: false,
+            optional: true,
+            default_value: []
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :cordova_build_config_file,
+            env_name: "CORDOVA_BUILD_CONFIG_FILE",
+            description: "Call `npx cordova compile` with `--buildConfig=<ConfigFile>` to specify build config file path",
+            is_string: true,
+            optional: true,
+            default_value: ''
           )
         ]
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Cordova
-    VERSION = "1.0.1"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-cordova
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Almouro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.111.0
-description: 
+description:
 email: contact@almouro.com
 executables: []
 extensions: []
@@ -110,7 +110,7 @@ homepage: https://github.com/almouro/fastlane-plugin-cordova
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,9 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Build your Cordova app
 test_files: []