fastlane-plugin-cordova 2.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b5b2458d8d510b739b9c972d12c42e5cd3f54639
-  data.tar.gz: 3e8e159db5d56b803107684ec86c3eb6e2fe1c4d
+SHA256:
+  metadata.gz: a6a4b5b48aa28034b00f28805ce38d774482cb0b1395276e2ca2f41e1be8cbb8
+  data.tar.gz: e19f9770b313b16898a2fcfd82f2fbd3c1bed883b1f7c98a4b85582b2ff6b85f
 SHA512:
-  metadata.gz: 3cecb5a0af264f126416a023005dd2361b66bc26fdce87bdb84caad30747993f41ae25b1d1aec88a715337b713bca6e3ea6028ac5b0b5635c2033e0ead83327e
-  data.tar.gz: 0b30240650e59f05a54d3e4060975fb54758bd0f9e5920e5d14995815fad2a2721b0e98e7b4551aa8d773bd4c0d8c934988d79b5d1cfe94c2c07aa7b023becfe
+  metadata.gz: 29793953c8d3ba76fced81de00c853cd9b7f2627b4f535fccc77c83d8930a60ca08d61cbb7095d10d4f3c09494f678011f09375f77792da91465d5cccf764f0f
+  data.tar.gz: d2736e308f3da7e4cd4586c3a61717a711fadf50bd358eb6adbbb903baa61996775e6455cdab1fbe7db91cfd754d90a9d8d5c6f6328e0061448d3cfd336fd9d1

data/README.md

@@ -41,6 +41,16 @@ platform :android do
       keystore_password: 'password'
     )
     supply(apk: ENV['CORDOVA_ANDROID_RELEASE_BUILD_PATH'])
+
+    # Alternatively, deploy an Android Application Bundle
+    # cordova(
+    #   package_type: 'bundle',
+    #   platform: 'android',
+    #   keystore_path: './prod.keystore',
+    #   keystore_alias: 'prod',
+    #   keystore_password: 'password'
+    # )
+    # supply(aab: ENV['CORDOVA_ANDROID_RELEASE_BUILD_PATH'])
   end
 end
 ```
@@ -79,7 +89,9 @@ 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  |           |
+| **package_type**         | This will determine what type of Android build is generated. <br>Valid options are apk and bundle | CORDOVA_ANDROID_PACKAGE_TYPE    | apk |
 | **keystore_path**        | Path to the Keystore for Android                        | CORDOVA_ANDROID_KEYSTORE_PATH     |           |
 | **keystore_password**    | Android Keystore password                               | CORDOVA_ANDROID_KEYSTORE_PASSWORD |           |
 | **key_password**         | Android Key password (default is keystore password)     | CORDOVA_ANDROID_KEY_PASSWORD      |           |
@@ -89,6 +101,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

@@ -13,21 +13,32 @@ module Fastlane
         keystore_alias: 'alias',
         build_number: 'versionCode',
         min_sdk_version: 'gradleArg=-PcdvMinSdkVersion',
-        cordova_no_fetch: 'cordovaNoFetch'
+        cordova_no_fetch: 'cordovaNoFetch',
+        package_type: 'packageType'
       }
 
       IOS_ARGS_MAP = {
         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 +74,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 +90,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 +113,19 @@ 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/app/build/outputs/apk/release/app-#{build_type}.apk"
+        # Update the build path accordingly if Android is being 
+        # built as an Android Application Bundle.
+        android_package_type = params[:package_type] || 'apk'
+        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"
       end
 
@@ -182,6 +203,16 @@ module Fastlane
             is_string: true,
             default_value: ''
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :package_type,
+            env_name: "CORDOVA_ANDROID_PACKAGE_TYPE",
+            description: "This will determine what type of Android build is generated. Valid options are apk or bundle",
+            is_string: true,
+            default_value: 'apk',
+            verify_block: proc do |value|
+              UI.user_error!("Valid options are apk or bundle.") unless ['apk', 'bundle'].include? value
+            end
+          ),
           FastlaneCore::ConfigItem.new(
             key: :keystore_path,
             env_name: "CORDOVA_ANDROID_KEYSTORE_PATH",
@@ -227,7 +258,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,16 +272,32 @@ 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
 
       def self.output
         [
-          ['CORDOVA_ANDROID_RELEASE_BUILD_PATH', 'Path to the signed release APK if it was generated'],
+          ['CORDOVA_ANDROID_RELEASE_BUILD_PATH', 'Path to the signed release APK or AAB if it was generated'],
           ['CORDOVA_IOS_RELEASE_BUILD_PATH', 'Path to the signed release IPA if it was generated']
         ]
       end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-cordova
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Almouro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2020-10-28 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: []