fastlane_hotfix 2.165.0 → 2.187.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -1
- data/README.md +106 -86
- data/cert/lib/cert/commands_generator.rb +2 -1
- data/cert/lib/cert/options.rb +6 -5
- data/cert/lib/cert/runner.rb +8 -8
- data/deliver/lib/assets/summary.html.erb +10 -10
- data/deliver/lib/deliver/app_screenshot.rb +17 -11
- data/deliver/lib/deliver/app_screenshot_validator.rb +108 -0
- data/deliver/lib/deliver/commands_generator.rb +4 -3
- data/deliver/lib/deliver/detect_values.rb +5 -3
- data/deliver/lib/deliver/download_screenshots.rb +2 -3
- data/deliver/lib/deliver/html_generator.rb +2 -2
- data/deliver/lib/deliver/languages.rb +1 -1
- data/deliver/lib/deliver/loader.rb +123 -21
- data/deliver/lib/deliver/module.rb +6 -0
- data/deliver/lib/deliver/options.rb +41 -55
- data/deliver/lib/deliver/runner.rb +19 -14
- data/deliver/lib/deliver/setup.rb +9 -5
- data/deliver/lib/deliver/submit_for_review.rb +4 -4
- data/deliver/lib/deliver/upload_metadata.rb +32 -21
- data/deliver/lib/deliver/upload_price_tier.rb +1 -1
- data/deliver/lib/deliver/upload_screenshots.rb +14 -76
- data/fastlane/lib/fastlane/actions/actions_helper.rb +3 -3
- data/fastlane/lib/fastlane/actions/adb.rb +2 -5
- data/fastlane/lib/fastlane/actions/adb_devices.rb +0 -1
- data/fastlane/lib/fastlane/actions/add_git_tag.rb +22 -6
- data/fastlane/lib/fastlane/actions/app_store_build_number.rb +17 -17
- data/fastlane/lib/fastlane/actions/app_store_connect_api_key.rb +21 -7
- data/fastlane/lib/fastlane/actions/appaloosa.rb +7 -2
- data/fastlane/lib/fastlane/actions/appetize.rb +13 -8
- data/fastlane/lib/fastlane/actions/appetize_viewing_url_generator.rb +0 -11
- data/fastlane/lib/fastlane/actions/appium.rb +40 -65
- data/fastlane/lib/fastlane/actions/appledoc.rb +46 -46
- data/fastlane/lib/fastlane/actions/apteligent.rb +3 -2
- data/fastlane/lib/fastlane/actions/artifactory.rb +41 -9
- data/fastlane/lib/fastlane/actions/automatic_code_signing.rb +7 -13
- data/fastlane/lib/fastlane/actions/backup_file.rb +1 -1
- data/fastlane/lib/fastlane/actions/backup_xcarchive.rb +3 -3
- data/fastlane/lib/fastlane/actions/badge.rb +9 -13
- data/fastlane/lib/fastlane/actions/build_and_upload_to_appetize.rb +11 -5
- data/fastlane/lib/fastlane/actions/build_app.rb +7 -1
- data/fastlane/lib/fastlane/actions/bundle_install.rb +8 -10
- data/fastlane/lib/fastlane/actions/carthage.rb +22 -14
- data/fastlane/lib/fastlane/actions/changelog_from_git_commits.rb +8 -17
- data/fastlane/lib/fastlane/actions/chatwork.rb +3 -2
- data/fastlane/lib/fastlane/actions/check_app_store_metadata.rb +9 -1
- data/fastlane/lib/fastlane/actions/clean_build_artifacts.rb +0 -1
- data/fastlane/lib/fastlane/actions/clean_cocoapods_cache.rb +0 -1
- data/fastlane/lib/fastlane/actions/clipboard.rb +3 -6
- data/fastlane/lib/fastlane/actions/cloc.rb +9 -13
- data/fastlane/lib/fastlane/actions/cocoapods.rb +23 -15
- data/fastlane/lib/fastlane/actions/commit_github_file.rb +12 -4
- data/fastlane/lib/fastlane/actions/commit_version_bump.rb +6 -7
- data/fastlane/lib/fastlane/actions/copy_artifacts.rb +3 -4
- data/fastlane/lib/fastlane/actions/crashlytics.rb +7 -11
- data/fastlane/lib/fastlane/actions/create_app_on_managed_play_store.rb +70 -76
- data/fastlane/lib/fastlane/actions/create_keychain.rb +13 -11
- data/fastlane/lib/fastlane/actions/create_pull_request.rb +15 -9
- data/fastlane/lib/fastlane/actions/create_xcframework.rb +123 -0
- data/fastlane/lib/fastlane/actions/danger.rb +13 -12
- data/fastlane/lib/fastlane/actions/deploygate.rb +1 -2
- data/fastlane/lib/fastlane/actions/docs/build_app.md +1 -1
- data/fastlane/lib/fastlane/actions/docs/capture_android_screenshots.md +27 -28
- data/fastlane/lib/fastlane/actions/docs/capture_ios_screenshots.md +7 -3
- data/fastlane/lib/fastlane/actions/docs/create_app_online.md +171 -67
- data/fastlane/lib/fastlane/actions/docs/frame_screenshots.md +20 -3
- data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md +9 -3
- data/fastlane/lib/fastlane/actions/docs/upload_to_app_store.md.erb +39 -16
- data/fastlane/lib/fastlane/actions/docs/upload_to_play_store.md +2 -1
- data/fastlane/lib/fastlane/actions/docs/upload_to_testflight.md +15 -5
- data/fastlane/lib/fastlane/actions/download_app_privacy_details_from_app_store.rb +142 -0
- data/fastlane/lib/fastlane/actions/download_dsyms.rb +8 -20
- data/fastlane/lib/fastlane/actions/dsym_zip.rb +1 -1
- data/fastlane/lib/fastlane/actions/ensure_env_vars.rb +2 -6
- data/fastlane/lib/fastlane/actions/ensure_git_branch.rb +0 -1
- data/fastlane/lib/fastlane/actions/ensure_git_status_clean.rb +3 -4
- data/fastlane/lib/fastlane/actions/ensure_no_debug_code.rb +3 -5
- data/fastlane/lib/fastlane/actions/ensure_xcode_version.rb +1 -2
- data/fastlane/lib/fastlane/actions/environment_variable.rb +13 -21
- data/fastlane/lib/fastlane/actions/erb.rb +2 -5
- data/fastlane/lib/fastlane/actions/get_build_number_repository.rb +1 -1
- data/fastlane/lib/fastlane/actions/get_certificates.rb +5 -1
- data/fastlane/lib/fastlane/actions/get_github_release.rb +11 -1
- data/fastlane/lib/fastlane/actions/get_ipa_info_plist_value.rb +0 -1
- data/fastlane/lib/fastlane/actions/get_managed_play_store_publishing_rights.rb +32 -35
- data/fastlane/lib/fastlane/actions/get_provisioning_profile.rb +9 -1
- data/fastlane/lib/fastlane/actions/get_push_certificate.rb +1 -1
- data/fastlane/lib/fastlane/actions/get_version_number.rb +17 -10
- data/fastlane/lib/fastlane/actions/git_add.rb +5 -10
- data/fastlane/lib/fastlane/actions/git_branch.rb +4 -10
- data/fastlane/lib/fastlane/actions/git_commit.rb +12 -10
- data/fastlane/lib/fastlane/actions/git_pull.rb +4 -10
- data/fastlane/lib/fastlane/actions/git_remote_branch.rb +57 -0
- data/fastlane/lib/fastlane/actions/git_submodule_update.rb +16 -8
- data/fastlane/lib/fastlane/actions/git_tag_exists.rb +4 -0
- data/fastlane/lib/fastlane/actions/github_api.rb +17 -8
- data/fastlane/lib/fastlane/actions/gradle.rb +12 -20
- data/fastlane/lib/fastlane/actions/hg_commit_version_bump.rb +1 -1
- data/fastlane/lib/fastlane/actions/hg_push.rb +1 -1
- data/fastlane/lib/fastlane/actions/hipchat.rb +6 -6
- data/fastlane/lib/fastlane/actions/hockey.rb +5 -12
- data/fastlane/lib/fastlane/actions/ifttt.rb +3 -6
- data/fastlane/lib/fastlane/actions/import_from_git.rb +7 -9
- data/fastlane/lib/fastlane/actions/increment_build_number.rb +8 -2
- data/fastlane/lib/fastlane/actions/install_on_device.rb +3 -6
- data/fastlane/lib/fastlane/actions/install_provisioning_profile.rb +4 -0
- data/fastlane/lib/fastlane/actions/installr.rb +22 -25
- data/fastlane/lib/fastlane/actions/ipa.rb +2 -2
- data/fastlane/lib/fastlane/actions/jazzy.rb +11 -8
- data/fastlane/lib/fastlane/actions/jira.rb +61 -14
- data/fastlane/lib/fastlane/actions/latest_testflight_build_number.rb +6 -6
- data/fastlane/lib/fastlane/actions/lcov.rb +0 -4
- data/fastlane/lib/fastlane/actions/mailgun.rb +21 -27
- data/fastlane/lib/fastlane/actions/make_changelog_from_jenkins.rb +1 -1
- data/fastlane/lib/fastlane/actions/match_nuke.rb +59 -0
- data/fastlane/lib/fastlane/actions/modify_services.rb +59 -24
- data/fastlane/lib/fastlane/actions/nexus_upload.rb +3 -2
- data/fastlane/lib/fastlane/actions/notarize.rb +98 -54
- data/fastlane/lib/fastlane/actions/notification.rb +1 -1
- data/fastlane/lib/fastlane/actions/number_of_commits.rb +1 -1
- data/fastlane/lib/fastlane/actions/oclint.rb +15 -14
- data/fastlane/lib/fastlane/actions/onesignal.rb +13 -3
- data/fastlane/lib/fastlane/actions/pod_push.rb +9 -2
- data/fastlane/lib/fastlane/actions/podio_item.rb +0 -7
- data/fastlane/lib/fastlane/actions/prompt.rb +3 -4
- data/fastlane/lib/fastlane/actions/push_git_tags.rb +1 -1
- data/fastlane/lib/fastlane/actions/push_to_git_remote.rb +14 -3
- data/fastlane/lib/fastlane/actions/puts.rb +1 -2
- data/fastlane/lib/fastlane/actions/register_device.rb +10 -13
- data/fastlane/lib/fastlane/actions/register_devices.rb +11 -14
- data/fastlane/lib/fastlane/actions/reset_git_repo.rb +5 -8
- data/fastlane/lib/fastlane/actions/reset_simulator_contents.rb +0 -2
- data/fastlane/lib/fastlane/actions/resign.rb +2 -9
- data/fastlane/lib/fastlane/actions/restore_file.rb +1 -1
- data/fastlane/lib/fastlane/actions/rsync.rb +3 -6
- data/fastlane/lib/fastlane/actions/run_tests.rb +1 -1
- data/fastlane/lib/fastlane/actions/s3.rb +1 -1
- data/fastlane/lib/fastlane/actions/say.rb +2 -3
- data/fastlane/lib/fastlane/actions/scp.rb +4 -10
- data/fastlane/lib/fastlane/actions/set_build_number_repository.rb +1 -1
- data/fastlane/lib/fastlane/actions/set_changelog.rb +10 -13
- data/fastlane/lib/fastlane/actions/set_github_release.rb +23 -16
- data/fastlane/lib/fastlane/actions/set_info_plist_value.rb +1 -1
- data/fastlane/lib/fastlane/actions/set_pod_key.rb +3 -4
- data/fastlane/lib/fastlane/actions/setup_ci.rb +1 -2
- data/fastlane/lib/fastlane/actions/setup_circle_ci.rb +1 -1
- data/fastlane/lib/fastlane/actions/setup_jenkins.rb +7 -12
- data/fastlane/lib/fastlane/actions/setup_travis.rb +1 -1
- data/fastlane/lib/fastlane/actions/sh.rb +2 -4
- data/fastlane/lib/fastlane/actions/slack.rb +164 -145
- data/fastlane/lib/fastlane/actions/slather.rb +5 -21
- data/fastlane/lib/fastlane/actions/sonar.rb +12 -19
- data/fastlane/lib/fastlane/actions/sourcedocs.rb +128 -0
- data/fastlane/lib/fastlane/actions/spaceship_logs.rb +1 -1
- data/fastlane/lib/fastlane/actions/splunkmint.rb +2 -2
- data/fastlane/lib/fastlane/actions/spm.rb +8 -2
- data/fastlane/lib/fastlane/actions/ssh.rb +5 -10
- data/fastlane/lib/fastlane/actions/swiftlint.rb +21 -19
- data/fastlane/lib/fastlane/actions/sync_code_signing.rb +6 -1
- data/fastlane/lib/fastlane/actions/testfairy.rb +0 -1
- data/fastlane/lib/fastlane/actions/tryouts.rb +2 -3
- data/fastlane/lib/fastlane/actions/twitter.rb +0 -5
- data/fastlane/lib/fastlane/actions/unlock_keychain.rb +3 -3
- data/fastlane/lib/fastlane/actions/update_app_group_identifiers.rb +1 -4
- data/fastlane/lib/fastlane/actions/update_code_signing_settings.rb +8 -15
- data/fastlane/lib/fastlane/actions/update_fastlane.rb +31 -10
- data/fastlane/lib/fastlane/actions/update_icloud_container_identifiers.rb +1 -4
- data/fastlane/lib/fastlane/actions/update_info_plist.rb +1 -1
- data/fastlane/lib/fastlane/actions/update_keychain_access_groups.rb +1 -4
- data/fastlane/lib/fastlane/actions/update_plist.rb +1 -1
- data/fastlane/lib/fastlane/actions/update_project_provisioning.rb +3 -4
- data/fastlane/lib/fastlane/actions/update_urban_airship_configuration.rb +0 -1
- data/fastlane/lib/fastlane/actions/update_url_schemes.rb +15 -26
- data/fastlane/lib/fastlane/actions/upload_app_privacy_details_to_app_store.rb +290 -0
- data/fastlane/lib/fastlane/actions/upload_symbols_to_crashlytics.rb +8 -7
- data/fastlane/lib/fastlane/actions/upload_symbols_to_sentry.rb +3 -10
- data/fastlane/lib/fastlane/actions/upload_to_app_store.rb +8 -4
- data/fastlane/lib/fastlane/actions/upload_to_testflight.rb +7 -2
- data/fastlane/lib/fastlane/actions/validate_play_store_json_key.rb +40 -44
- data/fastlane/lib/fastlane/actions/version_get_podspec.rb +1 -2
- data/fastlane/lib/fastlane/actions/xcode_install.rb +8 -5
- data/fastlane/lib/fastlane/actions/xcode_server_get_assets.rb +3 -3
- data/fastlane/lib/fastlane/actions/xcodebuild.rb +5 -5
- data/fastlane/lib/fastlane/cli_tools_distributor.rb +6 -3
- data/fastlane/lib/fastlane/commands_generator.rb +2 -1
- data/fastlane/lib/fastlane/documentation/actions_list.rb +2 -2
- data/fastlane/lib/fastlane/documentation/docs_generator.rb +1 -1
- data/fastlane/lib/fastlane/documentation/markdown_docs_generator.rb +1 -1
- data/fastlane/lib/fastlane/environment_printer.rb +1 -0
- data/fastlane/lib/fastlane/erb_template_helper.rb +7 -1
- data/fastlane/lib/fastlane/fast_file.rb +19 -7
- data/fastlane/lib/fastlane/fastlane_require.rb +7 -1
- data/fastlane/lib/fastlane/features.rb +1 -1
- data/fastlane/lib/fastlane/helper/adb_helper.rb +1 -1
- data/fastlane/lib/fastlane/helper/crashlytics_helper.rb +4 -4
- data/fastlane/lib/fastlane/helper/gem_helper.rb +2 -2
- data/fastlane/lib/fastlane/helper/git_helper.rb +34 -5
- data/fastlane/lib/fastlane/lane_manager.rb +3 -2
- data/fastlane/lib/fastlane/notification/slack.rb +56 -0
- data/fastlane/lib/fastlane/plugins/plugin_fetcher.rb +1 -2
- data/fastlane/lib/fastlane/plugins/plugin_info.rb +2 -2
- data/fastlane/lib/fastlane/plugins/plugin_info_collector.rb +1 -2
- data/fastlane/lib/fastlane/plugins/plugin_manager.rb +2 -3
- data/fastlane/lib/fastlane/plugins/template/%gem_name%.gemspec.erb +7 -6
- data/fastlane/lib/fastlane/plugins/template/.circleci/config.yml +1 -1
- data/fastlane/lib/fastlane/plugins/template/.github/workflows/test.yml +1 -1
- data/fastlane/lib/fastlane/plugins/template/.rubocop.yml +31 -35
- data/fastlane/lib/fastlane/plugins/template/spec/spec_helper.rb.erb +1 -1
- data/fastlane/lib/fastlane/setup/setup.rb +23 -10
- data/fastlane/lib/fastlane/setup/setup_ios.rb +3 -3
- data/fastlane/lib/fastlane/swift_fastlane_api_generator.rb +3 -0
- data/fastlane/lib/fastlane/swift_fastlane_function.rb +44 -16
- data/fastlane/lib/fastlane/swift_runner_upgrader.rb +2 -0
- data/fastlane/lib/fastlane/version.rb +2 -2
- data/fastlane/swift/Actions.swift +1 -1
- data/fastlane/swift/Appfile.swift +1 -1
- data/fastlane/swift/ArgumentProcessor.swift +1 -1
- data/fastlane/swift/ControlCommand.swift +1 -1
- data/fastlane/swift/Deliverfile.swift +2 -2
- data/fastlane/swift/DeliverfileProtocol.swift +23 -23
- data/fastlane/swift/Fastfile.swift +1 -1
- data/fastlane/swift/Fastlane.swift +7965 -4213
- data/fastlane/swift/FastlaneSwiftRunner/FastlaneSwiftRunner.xcodeproj/project.pbxproj +4 -0
- data/fastlane/swift/Gymfile.swift +2 -2
- data/fastlane/swift/GymfileProtocol.swift +15 -3
- data/fastlane/swift/LaneFileProtocol.swift +12 -6
- data/fastlane/swift/MainProcess.swift +3 -1
- data/fastlane/swift/Matchfile.swift +2 -2
- data/fastlane/swift/MatchfileProtocol.swift +4 -4
- data/fastlane/swift/OptionalConfigValue.swift +101 -0
- data/fastlane/swift/Plugins.swift +1 -1
- data/fastlane/swift/Precheckfile.swift +2 -2
- data/fastlane/swift/PrecheckfileProtocol.swift +8 -4
- data/fastlane/swift/RubyCommand.swift +2 -2
- data/fastlane/swift/RubyCommandable.swift +1 -1
- data/fastlane/swift/Runner.swift +3 -3
- data/fastlane/swift/RunnerArgument.swift +1 -1
- data/fastlane/swift/Scanfile.swift +2 -2
- data/fastlane/swift/ScanfileProtocol.swift +34 -2
- data/fastlane/swift/Screengrabfile.swift +2 -2
- data/fastlane/swift/ScreengrabfileProtocol.swift +5 -5
- data/fastlane/swift/Snapshotfile.swift +2 -2
- data/fastlane/swift/SnapshotfileProtocol.swift +19 -3
- data/fastlane/swift/SocketClient.swift +4 -3
- data/fastlane/swift/SocketClientDelegateProtocol.swift +1 -1
- data/fastlane/swift/SocketResponse.swift +5 -3
- data/fastlane/swift/formatting/Brewfile.lock.json +24 -16
- data/fastlane/swift/main.swift +1 -1
- data/fastlane/swift/upgrade_manifest.json +1 -1
- data/fastlane_core/lib/fastlane_core.rb +22 -20
- data/fastlane_core/lib/fastlane_core/build_watcher.rb +89 -12
- data/fastlane_core/lib/fastlane_core/cert_checker.rb +12 -7
- data/fastlane_core/lib/fastlane_core/clipboard.rb +20 -0
- data/fastlane_core/lib/fastlane_core/command_executor.rb +3 -9
- data/fastlane_core/lib/fastlane_core/configuration/commander_generator.rb +6 -1
- data/fastlane_core/lib/fastlane_core/configuration/config_item.rb +41 -3
- data/fastlane_core/lib/fastlane_core/configuration/configuration.rb +14 -8
- data/fastlane_core/lib/fastlane_core/device_manager.rb +1 -1
- data/fastlane_core/lib/fastlane_core/helper.rb +78 -14
- data/fastlane_core/lib/fastlane_core/ipa_file_analyser.rb +41 -16
- data/fastlane_core/lib/fastlane_core/ipa_upload_package_builder.rb +3 -2
- data/fastlane_core/lib/fastlane_core/itunes_transporter.rb +20 -15
- data/fastlane_core/lib/fastlane_core/keychain_importer.rb +1 -1
- data/fastlane_core/lib/fastlane_core/languages.rb +2 -2
- data/fastlane_core/lib/fastlane_core/pkg_upload_package_builder.rb +3 -2
- data/fastlane_core/lib/fastlane_core/print_table.rb +5 -3
- data/fastlane_core/lib/fastlane_core/project.rb +48 -28
- data/fastlane_core/lib/fastlane_core/provisioning_profile.rb +3 -1
- data/{deliver/lib/deliver → fastlane_core/lib/fastlane_core}/queue_worker.rb +4 -4
- data/fastlane_core/lib/fastlane_core/swag.rb +1 -1
- data/fastlane_core/lib/fastlane_core/ui/disable_colors.rb +8 -0
- data/fastlane_core/lib/fastlane_core/ui/help.erb +35 -0
- data/fastlane_core/lib/fastlane_core/ui/help_formatter.rb +16 -0
- data/fastlane_core/lib/fastlane_core/ui/implementations/shell.rb +16 -2
- data/fastlane_core/lib/fastlane_core/ui/interface.rb +1 -1
- data/fastlane_core/lib/fastlane_core/update_checker/update_checker.rb +2 -2
- data/frameit/lib/frameit/commands_generator.rb +2 -1
- data/frameit/lib/frameit/config_parser.rb +2 -2
- data/frameit/lib/frameit/device_types.rb +7 -1
- data/frameit/lib/frameit/frame_downloader.rb +2 -1
- data/gym/lib/gym/code_signing_mapping.rb +3 -3
- data/gym/lib/gym/commands_generator.rb +2 -1
- data/gym/lib/gym/error_handler.rb +8 -0
- data/gym/lib/gym/generators/build_command_generator.rb +3 -0
- data/gym/lib/gym/generators/package_command_generator.rb +4 -0
- data/gym/lib/gym/generators/package_command_generator_xcode7.rb +21 -15
- data/gym/lib/gym/options.rb +19 -3
- data/gym/lib/gym/runner.rb +15 -4
- data/match/lib/match/change_password.rb +3 -3
- data/match/lib/match/commands_generator.rb +2 -1
- data/match/lib/match/encryption/interface.rb +1 -1
- data/match/lib/match/encryption/openssl.rb +5 -3
- data/match/lib/match/importer.rb +9 -10
- data/match/lib/match/migrate.rb +2 -3
- data/match/lib/match/module.rb +2 -1
- data/match/lib/match/nuke.rb +19 -15
- data/match/lib/match/options.rb +4 -3
- data/match/lib/match/runner.rb +3 -4
- data/match/lib/match/spaceship_ensure.rb +3 -0
- data/match/lib/match/storage/git_storage.rb +14 -10
- data/match/lib/match/storage/google_cloud_storage.rb +2 -2
- data/match/lib/match/storage/s3_storage.rb +2 -2
- data/pem/lib/pem/commands_generator.rb +2 -1
- data/pilot/lib/pilot.rb +0 -1
- data/pilot/lib/pilot/build_manager.rb +41 -15
- data/pilot/lib/pilot/commands_generator.rb +2 -1
- data/pilot/lib/pilot/manager.rb +11 -8
- data/pilot/lib/pilot/options.rb +18 -9
- data/pilot/lib/pilot/tester_exporter.rb +0 -1
- data/pilot/lib/pilot/tester_manager.rb +0 -1
- data/precheck/lib/precheck/commands_generator.rb +2 -1
- data/precheck/lib/precheck/options.rb +9 -3
- data/precheck/lib/precheck/rule_processor.rb +1 -1
- data/precheck/lib/precheck/runner.rb +14 -9
- data/produce/lib/produce/commands_generator.rb +101 -28
- data/produce/lib/produce/developer_center.rb +42 -4
- data/produce/lib/produce/options.rb +1 -1
- data/produce/lib/produce/service.rb +270 -179
- data/scan/lib/scan/commands_generator.rb +2 -1
- data/scan/lib/scan/detect_values.rb +7 -2
- data/scan/lib/scan/module.rb +4 -0
- data/scan/lib/scan/options.rb +46 -1
- data/scan/lib/scan/runner.rb +88 -3
- data/scan/lib/scan/slack_poster.rb +4 -1
- data/scan/lib/scan/test_command_generator.rb +13 -8
- data/screengrab/lib/screengrab/android_environment.rb +5 -53
- data/screengrab/lib/screengrab/commands_generator.rb +2 -1
- data/screengrab/lib/screengrab/dependency_checker.rb +0 -20
- data/screengrab/lib/screengrab/options.rb +5 -2
- data/screengrab/lib/screengrab/runner.rb +111 -108
- data/sigh/lib/assets/resign.sh +81 -61
- data/sigh/lib/sigh/commands_generator.rb +2 -1
- data/sigh/lib/sigh/download_all.rb +4 -8
- data/sigh/lib/sigh/options.rb +3 -2
- data/sigh/lib/sigh/runner.rb +9 -9
- data/snapshot/lib/assets/SnapfileTemplate +3 -2
- data/snapshot/lib/assets/SnapfileTemplate.swift +2 -1
- data/snapshot/lib/assets/SnapshotHelper.swift +20 -12
- data/snapshot/lib/snapshot/commands_generator.rb +3 -1
- data/snapshot/lib/snapshot/options.rb +22 -2
- data/snapshot/lib/snapshot/reports_generator.rb +7 -1
- data/snapshot/lib/snapshot/simulator_launchers/launcher_configuration.rb +2 -0
- data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher.rb +1 -1
- data/snapshot/lib/snapshot/simulator_launchers/simulator_launcher_base.rb +10 -5
- data/snapshot/lib/snapshot/test_command_generator.rb +18 -4
- data/snapshot/lib/snapshot/test_command_generator_base.rb +3 -1
- data/snapshot/lib/snapshot/test_command_generator_xcode_8.rb +1 -1
- data/snapshot/lib/snapshot/update.rb +1 -1
- data/spaceship/README.md +4 -14
- data/spaceship/lib/spaceship/base.rb +2 -2
- data/spaceship/lib/spaceship/client.rb +44 -16
- data/spaceship/lib/spaceship/commands_generator.rb +4 -2
- data/spaceship/lib/spaceship/connect_api.rb +6 -0
- data/spaceship/lib/spaceship/connect_api/api_client.rb +67 -9
- data/spaceship/lib/spaceship/connect_api/model.rb +1 -1
- data/spaceship/lib/spaceship/connect_api/models/age_rating_declaration.rb +39 -6
- data/spaceship/lib/spaceship/connect_api/models/app.rb +95 -55
- data/spaceship/lib/spaceship/connect_api/models/app_data_usage.rb +59 -0
- data/spaceship/lib/spaceship/connect_api/models/app_data_usage_category.rb +65 -0
- data/spaceship/lib/spaceship/connect_api/models/app_data_usage_data_protection.rb +27 -0
- data/spaceship/lib/spaceship/connect_api/models/app_data_usage_grouping.rb +18 -0
- data/spaceship/lib/spaceship/connect_api/models/app_data_usage_purposes.rb +37 -0
- data/spaceship/lib/spaceship/connect_api/models/app_data_usages_publish_state.rb +36 -0
- data/spaceship/lib/spaceship/connect_api/models/app_info.rb +26 -10
- data/spaceship/lib/spaceship/connect_api/models/app_info_localization.rb +8 -4
- data/spaceship/lib/spaceship/connect_api/models/app_preview.rb +15 -11
- data/spaceship/lib/spaceship/connect_api/models/app_preview_set.rb +18 -9
- data/spaceship/lib/spaceship/connect_api/models/app_screenshot.rb +10 -8
- data/spaceship/lib/spaceship/connect_api/models/app_screenshot_set.rb +20 -11
- data/spaceship/lib/spaceship/connect_api/models/app_store_review_attachment.rb +7 -5
- data/spaceship/lib/spaceship/connect_api/models/app_store_review_detail.rb +6 -4
- data/spaceship/lib/spaceship/connect_api/models/app_store_version.rb +62 -38
- data/spaceship/lib/spaceship/connect_api/models/app_store_version_localization.rb +27 -14
- data/spaceship/lib/spaceship/connect_api/models/app_store_version_submission.rb +3 -2
- data/spaceship/lib/spaceship/connect_api/models/beta_app_review_submission.rb +3 -2
- data/spaceship/lib/spaceship/connect_api/models/beta_feedback.rb +6 -4
- data/spaceship/lib/spaceship/connect_api/models/beta_group.rb +29 -3
- data/spaceship/lib/spaceship/connect_api/models/beta_tester.rb +15 -9
- data/spaceship/lib/spaceship/connect_api/models/build.rb +34 -17
- data/spaceship/lib/spaceship/connect_api/models/build_beta_detail.rb +4 -0
- data/spaceship/lib/spaceship/connect_api/models/build_delivery.rb +3 -2
- data/spaceship/lib/spaceship/connect_api/models/bundle_id.rb +41 -6
- data/spaceship/lib/spaceship/connect_api/models/bundle_id_capability.rb +86 -21
- data/spaceship/lib/spaceship/connect_api/models/certificate.rb +12 -8
- data/spaceship/lib/spaceship/connect_api/models/device.rb +36 -4
- data/spaceship/lib/spaceship/connect_api/models/idfa_declaration.rb +6 -4
- data/spaceship/lib/spaceship/connect_api/models/profile.rb +18 -8
- data/spaceship/lib/spaceship/connect_api/models/reset_ratings_request.rb +3 -2
- data/spaceship/lib/spaceship/connect_api/models/sandbox_tester.rb +9 -6
- data/spaceship/lib/spaceship/connect_api/models/territory.rb +3 -2
- data/spaceship/lib/spaceship/connect_api/models/user.rb +6 -4
- data/spaceship/lib/spaceship/connect_api/models/user_invitation.rb +22 -6
- data/spaceship/lib/spaceship/connect_api/provisioning/provisioning.rb +99 -2
- data/spaceship/lib/spaceship/connect_api/response.rb +3 -1
- data/spaceship/lib/spaceship/connect_api/testflight/testflight.rb +50 -0
- data/spaceship/lib/spaceship/connect_api/token.rb +15 -3
- data/spaceship/lib/spaceship/connect_api/tunes/tunes.rb +122 -2
- data/spaceship/lib/spaceship/errors.rb +19 -0
- data/spaceship/lib/spaceship/playground.rb +2 -2
- data/spaceship/lib/spaceship/spaceauth_runner.rb +38 -15
- data/spaceship/lib/spaceship/tunes/iap_detail.rb +1 -1
- data/spaceship/lib/spaceship/tunes/members.rb +1 -1
- data/spaceship/lib/spaceship/tunes/tunes_client.rb +4 -4
- data/spaceship/lib/spaceship/two_step_or_factor_client.rb +59 -33
- data/spaceship/lib/spaceship/ui.rb +2 -2
- data/spaceship/lib/spaceship/upgrade_2fa_later_client.rb +91 -0
- data/supply/lib/supply.rb +1 -1
- data/supply/lib/supply/client.rb +5 -3
- data/supply/lib/supply/commands_generator.rb +2 -1
- data/supply/lib/supply/options.rb +3 -3
- data/supply/lib/supply/uploader.rb +6 -4
- metadata +124 -92
- data/pilot/lib/pilot/features.rb +0 -0
- data/pilot/lib/pilot/tester_util.rb +0 -0
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'commander'
|
2
2
|
|
3
3
|
require 'fastlane_core/configuration/configuration'
|
4
|
+
require 'fastlane_core/ui/help_formatter'
|
4
5
|
require_relative 'module'
|
5
6
|
require_relative 'manager'
|
6
7
|
require_relative 'options'
|
@@ -28,7 +29,7 @@ module Scan
|
|
28
29
|
program :help, "Author", "Felix Krause <scan@krausefx.com>"
|
29
30
|
program :help, "Website", "https://fastlane.tools"
|
30
31
|
program :help, "Documentation", "https://docs.fastlane.tools/actions/scan/"
|
31
|
-
program :help_formatter,
|
32
|
+
program :help_formatter, FastlaneCore::HelpFormatter
|
32
33
|
|
33
34
|
global_option("--verbose") { FastlaneCore::Globals.verbose = true }
|
34
35
|
|
@@ -162,7 +162,10 @@ module Scan
|
|
162
162
|
filter_simulators(simulators, :equal, version).tap(&potential_emptiness_error).select(&selector)
|
163
163
|
end
|
164
164
|
).tap do |array|
|
165
|
-
|
165
|
+
if array.empty?
|
166
|
+
UI.test_failure!("No device found with name '#{device_string}'") if Scan.config[:ensure_devices_found]
|
167
|
+
UI.error("Ignoring '#{device_string}', couldn’t find matching simulator")
|
168
|
+
end
|
166
169
|
end
|
167
170
|
end
|
168
171
|
|
@@ -209,7 +212,9 @@ module Scan
|
|
209
212
|
end
|
210
213
|
|
211
214
|
# building up the destination now
|
212
|
-
if Scan.
|
215
|
+
if Scan.building_mac_catalyst_for_mac?
|
216
|
+
Scan.config[:destination] = ["platform=macOS,variant=Mac Catalyst"]
|
217
|
+
elsif Scan.devices && Scan.devices.count > 0
|
213
218
|
Scan.config[:destination] = Scan.devices.map { |d| "platform=#{d.os_type} Simulator,id=#{d.udid}" }
|
214
219
|
elsif Scan.project.mac_app?
|
215
220
|
Scan.config[:destination] = min_xcode8? ? ["platform=macOS"] : ["platform=OS X"]
|
data/scan/lib/scan/module.rb
CHANGED
@@ -21,6 +21,10 @@ module Scan
|
|
21
21
|
def scanfile_name
|
22
22
|
"Scanfile"
|
23
23
|
end
|
24
|
+
|
25
|
+
def building_mac_catalyst_for_mac?
|
26
|
+
Scan.project.supports_mac_catalyst? && Scan.config[:catalyst_platform] == "macos"
|
27
|
+
end
|
24
28
|
end
|
25
29
|
|
26
30
|
Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
|
data/scan/lib/scan/options.rb
CHANGED
@@ -69,6 +69,11 @@ module Scan
|
|
69
69
|
default_value: false,
|
70
70
|
type: Boolean,
|
71
71
|
optional: true),
|
72
|
+
FastlaneCore::ConfigItem.new(key: :ensure_devices_found,
|
73
|
+
description: "Should fail if devices not found",
|
74
|
+
default_value: false,
|
75
|
+
type: Boolean,
|
76
|
+
optional: true),
|
72
77
|
|
73
78
|
# simulator management
|
74
79
|
FastlaneCore::ConfigItem.new(key: :force_quit_simulator,
|
@@ -269,6 +274,11 @@ module Scan
|
|
269
274
|
optional: true,
|
270
275
|
is_string: false,
|
271
276
|
default_value: false),
|
277
|
+
FastlaneCore::ConfigItem.new(key: :output_xctestrun,
|
278
|
+
type: Boolean,
|
279
|
+
env_name: "SCAN_OUTPUT_XCTESTRUN",
|
280
|
+
description: "Should provide additional copy of .xctestrun file (settings.xctestrun) and place in output path?",
|
281
|
+
default_value: false),
|
272
282
|
FastlaneCore::ConfigItem.new(key: :result_bundle,
|
273
283
|
short_option: "-z",
|
274
284
|
env_name: "SCAN_RESULT_BUNDLE",
|
@@ -411,6 +421,11 @@ module Scan
|
|
411
421
|
description: "Only post on Slack if the tests fail",
|
412
422
|
is_string: false,
|
413
423
|
default_value: false),
|
424
|
+
FastlaneCore::ConfigItem.new(key: :slack_default_payloads,
|
425
|
+
env_name: "SCAN_SLACK_DEFAULT_PAYLOADS",
|
426
|
+
description: "Specifies default payloads to include in Slack messages. For more info visit https://docs.fastlane.tools/actions/slack",
|
427
|
+
optional: true,
|
428
|
+
type: Array),
|
414
429
|
|
415
430
|
# misc
|
416
431
|
FastlaneCore::ConfigItem.new(key: :destination,
|
@@ -419,6 +434,15 @@ module Scan
|
|
419
434
|
description: "Use only if you're a pro, use the other options instead",
|
420
435
|
is_string: false,
|
421
436
|
optional: true),
|
437
|
+
FastlaneCore::ConfigItem.new(key: :catalyst_platform,
|
438
|
+
env_name: "SCAN_CATALYST_PLATFORM",
|
439
|
+
description: "Platform to build when using a Catalyst enabled app. Valid values are: ios, macos",
|
440
|
+
type: String,
|
441
|
+
optional: true,
|
442
|
+
verify_block: proc do |value|
|
443
|
+
av = %w(ios macos)
|
444
|
+
UI.user_error!("Unsupported export_method '#{value}', must be: #{av}") unless av.include?(value)
|
445
|
+
end),
|
422
446
|
FastlaneCore::ConfigItem.new(key: :custom_report_file_name,
|
423
447
|
env_name: "SCAN_CUSTOM_REPORT_FILE_NAME",
|
424
448
|
description: "Sets custom full report file name when generating a single report",
|
@@ -436,7 +460,28 @@ module Scan
|
|
436
460
|
env_name: "SCAN_CLONED_SOURCE_PACKAGES_PATH",
|
437
461
|
description: "Sets a custom path for Swift Package Manager dependencies",
|
438
462
|
type: String,
|
439
|
-
optional: true)
|
463
|
+
optional: true),
|
464
|
+
FastlaneCore::ConfigItem.new(key: :skip_package_dependencies_resolution,
|
465
|
+
env_name: "SCAN_SKIP_PACKAGE_DEPENDENCIES_RESOLUTION",
|
466
|
+
description: "Skips resolution of Swift Package Manager dependencies",
|
467
|
+
type: Boolean,
|
468
|
+
default_value: false),
|
469
|
+
FastlaneCore::ConfigItem.new(key: :disable_package_automatic_updates,
|
470
|
+
env_name: "SCAN_DISABLE_PACKAGE_AUTOMATIC_UPDATES",
|
471
|
+
description: "Prevents packages from automatically being resolved to versions other than those recorded in the `Package.resolved` file",
|
472
|
+
type: Boolean,
|
473
|
+
default_value: false),
|
474
|
+
FastlaneCore::ConfigItem.new(key: :use_system_scm,
|
475
|
+
env_name: "SCAN_USE_SYSTEM_SCM",
|
476
|
+
description: "Lets xcodebuild use system's scm configuration",
|
477
|
+
optional: true,
|
478
|
+
type: Boolean,
|
479
|
+
default_value: false),
|
480
|
+
FastlaneCore::ConfigItem.new(key: :number_of_retries,
|
481
|
+
env_name: 'SCAN_NUMBER_OF_RETRIES',
|
482
|
+
description: "The number of times a test can fail before scan should stop retrying",
|
483
|
+
type: Integer,
|
484
|
+
default_value: 0)
|
440
485
|
|
441
486
|
]
|
442
487
|
end
|
data/scan/lib/scan/runner.rb
CHANGED
@@ -51,7 +51,14 @@ module Scan
|
|
51
51
|
end
|
52
52
|
end
|
53
53
|
|
54
|
+
execute(retries: Scan.config[:number_of_retries])
|
55
|
+
end
|
56
|
+
|
57
|
+
def execute(retries: 0)
|
58
|
+
Scan.cache[:retry_attempt] = Scan.config[:number_of_retries] - retries
|
59
|
+
|
54
60
|
command = @test_command_generator.generate
|
61
|
+
|
55
62
|
prefix_hash = [
|
56
63
|
{
|
57
64
|
prefix: "Running Tests: ",
|
@@ -71,7 +78,12 @@ module Scan
|
|
71
78
|
error: proc do |error_output|
|
72
79
|
begin
|
73
80
|
exit_status = $?.exitstatus
|
74
|
-
|
81
|
+
if retries > 0
|
82
|
+
# If there are retries remaining, run the tests again
|
83
|
+
return retry_execute(retries: retries, error_output: error_output)
|
84
|
+
else
|
85
|
+
ErrorHandler.handle_build_error(error_output, @test_command_generator.xcodebuild_log_path)
|
86
|
+
end
|
75
87
|
rescue => ex
|
76
88
|
SlackPoster.new.run({
|
77
89
|
build_errors: 1
|
@@ -79,10 +91,58 @@ module Scan
|
|
79
91
|
raise ex
|
80
92
|
end
|
81
93
|
end)
|
94
|
+
|
82
95
|
exit_status
|
83
96
|
end
|
84
97
|
|
98
|
+
def retry_execute(retries:, error_output: "")
|
99
|
+
tests = retryable_tests(error_output)
|
100
|
+
|
101
|
+
if tests.empty?
|
102
|
+
UI.crash!("Failed to find failed tests to retry (could not parse error output)")
|
103
|
+
end
|
104
|
+
|
105
|
+
Scan.config[:only_testing] = tests
|
106
|
+
UI.important("Retrying tests: #{Scan.config[:only_testing].join(', ')}")
|
107
|
+
|
108
|
+
retries -= 1
|
109
|
+
UI.important("Number of retries remaining: #{retries}")
|
110
|
+
|
111
|
+
return execute(retries: retries)
|
112
|
+
end
|
113
|
+
|
114
|
+
def retryable_tests(input)
|
115
|
+
input = Helper.strip_ansi_colors(input)
|
116
|
+
|
117
|
+
retryable_tests = []
|
118
|
+
|
119
|
+
failing_tests = input.split("Failing tests:\n").fetch(1, [])
|
120
|
+
.split("\n\n").first
|
121
|
+
|
122
|
+
suites = failing_tests.split(/(?=\n\s+[\w\s]+:\n)/)
|
123
|
+
|
124
|
+
suites.each do |suite|
|
125
|
+
suite_name = suite.match(/\s*([\w\s\S]+):/).captures.first
|
126
|
+
|
127
|
+
test_cases = suite.split(":\n").fetch(1, []).split("\n").each
|
128
|
+
.select { |line| line.match?(/^\s+/) }
|
129
|
+
.map { |line| line.strip.gsub(".", "/").gsub("()", "") }
|
130
|
+
.map { |line| suite_name + "/" + line }
|
131
|
+
|
132
|
+
retryable_tests += test_cases
|
133
|
+
end
|
134
|
+
|
135
|
+
return retryable_tests.uniq
|
136
|
+
end
|
137
|
+
|
85
138
|
def handle_results(tests_exit_status)
|
139
|
+
if Scan.config[:disable_xcpretty]
|
140
|
+
unless tests_exit_status == 0
|
141
|
+
UI.test_failure!("Test execution failed. Exit status: #{tests_exit_status}")
|
142
|
+
end
|
143
|
+
return
|
144
|
+
end
|
145
|
+
|
86
146
|
result = TestResultParser.new.parse_result(test_results)
|
87
147
|
SlackPoster.new.run(result)
|
88
148
|
|
@@ -103,6 +163,7 @@ module Scan
|
|
103
163
|
|
104
164
|
copy_simulator_logs
|
105
165
|
zip_build_products
|
166
|
+
copy_xctestrun
|
106
167
|
|
107
168
|
if result[:failures] > 0
|
108
169
|
open_report
|
@@ -143,9 +204,33 @@ module Scan
|
|
143
204
|
UI.message("Successfully zipped build products: #{output_path}")
|
144
205
|
end
|
145
206
|
|
146
|
-
def
|
147
|
-
return
|
207
|
+
def copy_xctestrun
|
208
|
+
return unless Scan.config[:output_xctestrun]
|
209
|
+
|
210
|
+
# Gets :derived_data_path/Build/Products directory for coping .xctestrun file
|
211
|
+
derived_data_path = Scan.config[:derived_data_path]
|
212
|
+
path = File.join(derived_data_path, "Build", "Products")
|
148
213
|
|
214
|
+
# Gets absolute path of output directory
|
215
|
+
output_directory = File.absolute_path(Scan.config[:output_directory])
|
216
|
+
output_path = File.join(output_directory, "settings.xctestrun")
|
217
|
+
|
218
|
+
# Caching path for action to put into lane_context
|
219
|
+
Scan.cache[:output_xctestrun] = output_path
|
220
|
+
|
221
|
+
# Copy .xctestrun file and moves it to output directory
|
222
|
+
UI.message("Copying .xctestrun file")
|
223
|
+
xctestrun_file = Dir.glob("#{path}/*.xctestrun").first
|
224
|
+
|
225
|
+
if xctestrun_file
|
226
|
+
FileUtils.cp(xctestrun_file, output_path)
|
227
|
+
UI.message("Successfully copied xctestrun file: #{output_path}")
|
228
|
+
else
|
229
|
+
UI.user_error!("Could not find .xctextrun file to copy")
|
230
|
+
end
|
231
|
+
end
|
232
|
+
|
233
|
+
def test_results
|
149
234
|
temp_junit_report = Scan.cache[:temp_junit_report]
|
150
235
|
return File.read(temp_junit_report) if temp_junit_report && File.file?(temp_junit_report)
|
151
236
|
|
@@ -1,5 +1,6 @@
|
|
1
1
|
require 'fastlane/action'
|
2
2
|
require 'fastlane/actions/slack'
|
3
|
+
require 'fastlane_core/configuration/configuration'
|
3
4
|
|
4
5
|
require_relative 'module'
|
5
6
|
|
@@ -43,7 +44,7 @@ module Scan
|
|
43
44
|
}
|
44
45
|
end
|
45
46
|
|
46
|
-
Fastlane::Actions::SlackAction.
|
47
|
+
options = FastlaneCore::Configuration.create(Fastlane::Actions::SlackAction.available_options, {
|
47
48
|
message: "#{Scan.config[:app_name] || Scan.project.app_name} Tests:\n#{Scan.config[:slack_message]}",
|
48
49
|
channel: channel,
|
49
50
|
slack_url: Scan.config[:slack_url].to_s,
|
@@ -51,10 +52,12 @@ module Scan
|
|
51
52
|
username: username,
|
52
53
|
icon_url: icon_url,
|
53
54
|
payload: {},
|
55
|
+
default_payloads: Scan.config[:slack_default_payloads],
|
54
56
|
attachment_properties: {
|
55
57
|
fields: fields
|
56
58
|
}
|
57
59
|
})
|
60
|
+
Fastlane::Actions::SlackAction.run(options)
|
58
61
|
end
|
59
62
|
end
|
60
63
|
end
|
@@ -38,6 +38,9 @@ module Scan
|
|
38
38
|
if config[:derived_data_path] && !options.include?("-derivedDataPath #{config[:derived_data_path].shellescape}")
|
39
39
|
options << "-derivedDataPath #{config[:derived_data_path].shellescape}"
|
40
40
|
end
|
41
|
+
if config[:use_system_scm] && !options.include?("-scmProvider system")
|
42
|
+
options << "-scmProvider system"
|
43
|
+
end
|
41
44
|
options << "-resultBundlePath '#{result_bundle_path}'" if config[:result_bundle]
|
42
45
|
if FastlaneCore::Helper.xcode_at_least?(10)
|
43
46
|
options << "-parallel-testing-worker-count #{config[:concurrent_workers]}" if config[:concurrent_workers]
|
@@ -159,16 +162,18 @@ module Scan
|
|
159
162
|
Scan.cache[:build_path]
|
160
163
|
end
|
161
164
|
|
165
|
+
# The path to the result bundle
|
162
166
|
def result_bundle_path
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
Scan.cache[:result_bundle_path] = path
|
167
|
+
retry_count = Scan.cache[:retry_attempt] || 0
|
168
|
+
attempt = retry_count > 0 ? "-#{retry_count}" : ""
|
169
|
+
ext = FastlaneCore::Helper.xcode_version.to_i >= 11 ? '.xcresult' : '.test_result'
|
170
|
+
path = File.join(Scan.config[:output_directory], Scan.config[:scheme]) + attempt + ext
|
171
|
+
if File.directory?(path)
|
172
|
+
FileUtils.remove_dir(path)
|
170
173
|
end
|
171
|
-
|
174
|
+
Scan.cache[:result_bundle_path] = path
|
175
|
+
|
176
|
+
return path
|
172
177
|
end
|
173
178
|
end
|
174
179
|
end
|
@@ -4,86 +4,38 @@ require 'fastlane_core/command_executor'
|
|
4
4
|
module Screengrab
|
5
5
|
class AndroidEnvironment
|
6
6
|
attr_reader :android_home
|
7
|
-
attr_reader :build_tools_version
|
8
7
|
|
9
8
|
# android_home - the String path to the install location of the Android SDK
|
10
|
-
# build_tools_version - the String version of the Android build tools that should be used
|
11
|
-
def initialize(android_home, build_tools_version)
|
9
|
+
# build_tools_version - the String version of the Android build tools that should be used, ignored
|
10
|
+
def initialize(android_home, build_tools_version = nil)
|
12
11
|
@android_home = android_home
|
13
|
-
@build_tools_version = build_tools_version
|
14
12
|
end
|
15
13
|
|
16
14
|
def platform_tools_path
|
17
15
|
@platform_tools_path ||= find_platform_tools(android_home)
|
18
16
|
end
|
19
17
|
|
20
|
-
def build_tools_path
|
21
|
-
@build_tools_path ||= find_build_tools(android_home, build_tools_version)
|
22
|
-
end
|
23
|
-
|
24
18
|
def adb_path
|
25
19
|
@adb_path ||= find_adb(platform_tools_path)
|
26
20
|
end
|
27
21
|
|
28
|
-
def aapt_path
|
29
|
-
@aapt_path ||= find_aapt(build_tools_path)
|
30
|
-
end
|
31
|
-
|
32
22
|
private
|
33
23
|
|
34
24
|
def find_platform_tools(android_home)
|
35
25
|
return nil unless android_home
|
36
26
|
|
37
|
-
platform_tools_path = File.join(android_home, 'platform-tools')
|
27
|
+
platform_tools_path = Helper.localize_file_path(File.join(android_home, 'platform-tools'))
|
38
28
|
File.directory?(platform_tools_path) ? platform_tools_path : nil
|
39
29
|
end
|
40
30
|
|
41
|
-
def find_build_tools(android_home, build_tools_version)
|
42
|
-
return nil unless android_home
|
43
|
-
|
44
|
-
build_tools_dir = File.join(android_home, 'build-tools')
|
45
|
-
|
46
|
-
return nil unless build_tools_dir && File.directory?(build_tools_dir)
|
47
|
-
|
48
|
-
return File.join(build_tools_dir, build_tools_version) if build_tools_version
|
49
|
-
|
50
|
-
version = select_build_tools_version(build_tools_dir)
|
51
|
-
|
52
|
-
return version ? File.join(build_tools_dir, version) : nil
|
53
|
-
end
|
54
|
-
|
55
|
-
def select_build_tools_version(build_tools_dir)
|
56
|
-
# Collect the sub-directories of the build_tools_dir, rejecting any that start with '.' to remove . and ..
|
57
|
-
dir_names = Dir.entries(build_tools_dir).select { |e| !e.start_with?('.') && File.directory?(File.join(build_tools_dir, e)) }
|
58
|
-
|
59
|
-
# Collect a sorted array of Version objects from the directory names, handling the possibility that some
|
60
|
-
# entries may not be valid version names
|
61
|
-
versions = dir_names.map do |d|
|
62
|
-
begin
|
63
|
-
Gem::Version.new(d)
|
64
|
-
rescue
|
65
|
-
nil
|
66
|
-
end
|
67
|
-
end.reject(&:nil?).sort
|
68
|
-
|
69
|
-
# We'll take the last entry (highest version number) as the directory name we want
|
70
|
-
versions.last.to_s
|
71
|
-
end
|
72
|
-
|
73
31
|
def find_adb(platform_tools_path)
|
74
32
|
return FastlaneCore::CommandExecutor.which('adb') unless platform_tools_path
|
75
33
|
|
76
|
-
adb_path = File.join(platform_tools_path, 'adb')
|
34
|
+
adb_path = Helper.get_executable_path(File.join(platform_tools_path, 'adb'))
|
35
|
+
adb_path = Helper.localize_file_path(adb_path)
|
77
36
|
return executable_command?(adb_path) ? adb_path : nil
|
78
37
|
end
|
79
38
|
|
80
|
-
def find_aapt(build_tools_path)
|
81
|
-
return FastlaneCore::CommandExecutor.which('aapt') unless build_tools_path
|
82
|
-
|
83
|
-
aapt_path = File.join(build_tools_path, 'aapt')
|
84
|
-
return executable_command?(aapt_path) ? aapt_path : nil
|
85
|
-
end
|
86
|
-
|
87
39
|
def executable_command?(cmd_path)
|
88
40
|
Helper.executable?(cmd_path)
|
89
41
|
end
|
@@ -1,6 +1,7 @@
|
|
1
1
|
require 'commander'
|
2
2
|
|
3
3
|
require 'fastlane/version'
|
4
|
+
require 'fastlane_core/ui/help_formatter'
|
4
5
|
require 'fastlane_core/fastlane_folder'
|
5
6
|
require 'fastlane_core/configuration/configuration'
|
6
7
|
require_relative 'android_environment'
|
@@ -26,7 +27,7 @@ module Screengrab
|
|
26
27
|
program :help, 'Authors', 'Andrea Falcone <asfalcone@google.com>, Michael Furtak <mfurtak@google.com>'
|
27
28
|
program :help, 'Website', 'https://fastlane.tools'
|
28
29
|
program :help, 'Documentation', 'https://docs.fastlane.tools/actions/screengrab/'
|
29
|
-
program :help_formatter,
|
30
|
+
program :help_formatter, FastlaneCore::HelpFormatter
|
30
31
|
|
31
32
|
global_option('--verbose', 'Shows a more verbose output') { FastlaneCore::Globals.verbose = true }
|
32
33
|
|
@@ -6,7 +6,6 @@ module Screengrab
|
|
6
6
|
return if Helper.test?
|
7
7
|
|
8
8
|
check_adb(android_env)
|
9
|
-
check_aapt(android_env)
|
10
9
|
end
|
11
10
|
|
12
11
|
def self.check_adb(android_env)
|
@@ -30,25 +29,6 @@ module Screengrab
|
|
30
29
|
UI.user_error!('adb command not found')
|
31
30
|
end
|
32
31
|
|
33
|
-
def self.check_aapt(android_env)
|
34
|
-
android_home = android_env.android_home
|
35
|
-
aapt_path = android_env.aapt_path
|
36
|
-
|
37
|
-
warn_if_command_path_not_relative_to_android_home('aapt', android_home, aapt_path)
|
38
|
-
# aapt is not required in order to function, so we'll only warn if we can't find it.
|
39
|
-
warn_missing_aapt(android_home) unless aapt_path
|
40
|
-
end
|
41
|
-
|
42
|
-
def self.warn_missing_aapt(android_home)
|
43
|
-
if android_home
|
44
|
-
UI.important("The `aapt` command could not be found relative to your provided ANDROID_HOME at #{android_home}")
|
45
|
-
UI.important("Please ensure that the Android SDK is installed and you have the build tools downloaded")
|
46
|
-
else
|
47
|
-
UI.important("The `aapt` command could not be found on your PATH")
|
48
|
-
UI.important("Please ensure that the Android SDK is installed and you have the build tools downloaded and present on your PATH")
|
49
|
-
end
|
50
|
-
end
|
51
|
-
|
52
32
|
def self.warn_if_command_path_not_relative_to_android_home(cmd_name, android_home, cmd_path)
|
53
33
|
if android_home && cmd_path && !cmd_path.start_with?(android_home)
|
54
34
|
UI.important("Using `#{cmd_name}` found at #{cmd_path} which is not within the specified ANDROID_HOME at #{android_home}")
|