bitrise.yml.tt in fwtoolkit-2.6.0

- old
+ new

@@ -71,11 +71,11 @@
     - _build
     - _deploy_bitrise
     - _deploy_google
   _build:
     steps:
-    - git::https://github.com/FutureWorkshops/bitrise-step-s3-download.git@master:
+    - s3-download@1:
         title: Download keystore
         inputs:
         - aws_access_key: "$AWS_ACCESS_KEY_ID"
         - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY"
         - s3_bucket: fw.ci.certificates
@@ -83,29 +83,36 @@
         - s3_filepath: "$KEYSTORE_NAME"
     - gradle-runner@1.9:
         inputs:
         - gradle_file: "$GRADLE_BUILD_FILE_PATH"
         - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION
-            -Pproject.bundleId=$PACKAGE_NAME assemble$BUILD_FLAVOUR$BUILD_TASK"
+            -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK"
         - app_file_include_filter: |
             *-universal-*.apk
             *.aab
         - gradlew_path: "$GRADLEW_PATH"
+    - bitrise-step-export-universal-apk@0:
+        inputs:
+        - keystore_alias: "$KEYSTORE_ALIAS"
+        - private_key_password: "$KEYALIAS_PASSWORD"
+        - keystore_url: file://$S3_DOWNLOAD_OUTPUT_PATH
+        - keystore_password: "$KEYSTORE_PASSWORD"
     envs:
     - KEYSTORE_PATH: "$KEYSTORE_OUTPUT_PATH/$KEYSTORE_NAME"
   _deploy_bitrise:
     steps:
-    - deploy-to-bitrise-io@1.12: {}
+    - deploy-to-bitrise-io@1.12:
+      inputs:
+        - generate_universal_apk_if_none: 'false'
   _deploy_google:
     steps:
-    - google-play-deploy@3.1:
+    - google-play-deploy@3.3:
         inputs:
         - service_account_json_key_path: "$BITRISEIO_GOOGLE_PLAY_JSON_AUTH_PATH_URL"
         - package_name: "$PACKAGE_NAME"
         - mapping_file: ''
         - track: internal
-        - app_path: "$BITRISE_APK_PATH"
-        - apk_path: "$BITRISE_SIGNED_APK_PATH"
+        - app_path: "$BITRISE_AAB_PATH"
   _preflight:
     steps:
     - build-number-adjust@1.0.0:
         inputs:
         - change: ''