templates/bitrise/android/bitrise.yml.tt in fwtoolkit-2.6.3 vs templates/bitrise/android/bitrise.yml.tt in fwtoolkit-2.6.4

- old
+ new

@@ -1,7 +1,7 @@ --- -format_version: '8' +format_version: "11" default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git project_type: android trigger_map: - push_branch: dev workflow: staging @@ -21,11 +21,10 @@ opts: is_expand: true after_run: - _preflight - _test - - _commit_status staging: envs: - KEYSTORE_NAME: fw_internal.keystore opts: is_expand: true @@ -79,75 +78,68 @@ - aws_access_key: "$AWS_ACCESS_KEY_ID" - aws_secret_access_key: "$AWS_SECRET_ACCESS_KEY" - s3_bucket: fw.ci.certificates - output_location: "$KEYSTORE_OUTPUT_PATH" - s3_filepath: "$KEYSTORE_NAME" - - gradle-runner@1.9: + - gradle-runner@2: inputs: - - gradle_file: "$GRADLE_BUILD_FILE_PATH" - - gradle_task: "-Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION - -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK" + - gradle_file: $GRADLE_BUILD_FILE_PATH + - gradle_task: -Pproject.buildnumber=$BITRISE_BUILD_NUMBER -Pproject.buildversion=$BUILD_VERSION + -Pproject.bundleId=$PACKAGE_NAME bundle$BUILD_FLAVOUR$BUILD_TASK - app_file_include_filter: | *-universal-*.apk *.aab - - gradlew_path: "$GRADLEW_PATH" + - 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: - inputs: - - generate_universal_apk_if_none: 'false' + - deploy-to-bitrise-io@2: {} _deploy_google: steps: - - google-play-deploy@3.3: + - google-play-deploy@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_AAB_PATH" _preflight: steps: - - build-number-adjust@1.0.0: + - build-number-adjust@1: inputs: - change: '' - increase: "$FW_BUILD_NUMBER_OFFSET" - decrease: '' - - activate-ssh-key@4.0.5: + - activate-ssh-key@4: run_if: '{{getenv "SSH_RSA_PRIVATE_KEY" | ne ""}}' - - git-clone@4.0: + - git-clone@7: inputs: - manual_merge: 'no' - - install-missing-android-tools@2.3.8: + - install-missing-android-tools@3: inputs: - - ndk_revision: $ANDROID_NDK_VERSION + - ndk_version: $ANDROID_NDK_VERSION _test: steps: - - gradle-unit-test@1.0: + - gradle-unit-test@1: inputs: - unit_test_task: "$TEST_COMMAND" - unit_test_flags: - - deploy-to-bitrise-io@1.12: + - deploy-to-bitrise-io@2: inputs: - deploy_path: "$TEST_REPORTS_PATH" - notify_user_groups: none - is_compress: 'true' envs: - TEST_REPORTS_PATH: "$BITRISE_SOURCE_DIR/app/build/reports/" - TEST_COMMAND: check test - _commit_status: - steps: - - github-status@2.3: - inputs: - - auth_token: "$FW_GITHUB_STATUS_AUTH_TOKEN" app: envs: - BUILD_FLAVOUR: opts: is_expand: true @@ -170,6 +162,6 @@ opts: is_expand: true - KEYSTORE_OUTPUT_PATH: "$BITRISE_SOURCE_DIR" meta: bitrise.io: - machine_type: performance + stack: linux-docker-android-20.04