fastlane-plugin-cordova 2.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 74c0ead2545b310f8626b27d51d0a4c88885261b
-  data.tar.gz: e493fdb86bd7063b0bf70333eaf2dfe9dc82fca9
+SHA256:
+  metadata.gz: a311aa07c88c18c9d77615dfada62ad35ff1062d523d7d44c848e4397926b2e9
+  data.tar.gz: fafa72d094004a5e162c91d063e02b5dbc0c3a08d2ffc1980e95b4c56916c348
 SHA512:
-  metadata.gz: bd74bc4682c6d7a1eb0538e8a8c971ac766656e9a05c5742129b3c4ad2cbb422cba5d287180b715250142dde119d1dcd25547f454601e3bd15f959fa38cf4351
-  data.tar.gz: bcfc63a31f86e64ad648bb1701b781b292fb105b0a5631b151d4405af8d3d451a571ac90430a551311892fb429bf4dd666ceab3b9385a0526f7857da4819d69c
+  metadata.gz: a4b03580c3d6e272f207f32a8bdefa771858adbe724dc7573b0424ab91bc6d8c43006b7c406cc8b183cc9211759e2cafdc997bb762d8638d9342978503af5ce6
+  data.tar.gz: d2f6761bf1c57cc2b514beed26ba88649963836c98979a4d39860c50eff390a1980da0cd9c5d060d467daa4db2c965393a64421d037bca2989469a921b9d7469

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
 ```
@@ -81,6 +91,7 @@ Which will produce:
 | **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      |           |
@@ -90,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,7 +13,8 @@ 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 = {
@@ -73,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
@@ -89,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?
@@ -107,21 +113,26 @@ 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)
+      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.
+        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/apk/release/app-#{build_type}.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
 
       def self.run(params)
         self.check_platform(params)
         self.build(params)
-        self.set_build_paths(params[:release])
+        self.set_build_paths(params)
       end
 
       #####################################################
@@ -192,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",
@@ -237,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
           ),
@@ -251,7 +272,7 @@ 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
           ),
@@ -262,13 +283,21 @@ module Fastlane
             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.1.0"
+    VERSION = "3.1.1"
   end
 end

metadata

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