diff --git a/static/fastlane-ios/Fastfile b/static/fastlane-ios/Fastfile index a5ea4e53..201b6af0 100644 --- a/static/fastlane-ios/Fastfile +++ b/static/fastlane-ios/Fastfile @@ -13,37 +13,38 @@ # Uncomment the line if you want fastlane to automatically update itself # update_fastlane -require 'json' - -default_platform(:ios) - -current_build_number = 1 -package_json = JSON.parse(File.read('../../../package.json')) - -api_key = app_store_connect_api_key( - key_id: ENV['APPLE_API_KEY_ID'], - issuer_id: ENV['APPLE_API_KEY_ISSUER_ID'], - key_content: ENV['APPLE_API_KEY_CONTENT'], - is_key_content_base64: true, - duration: 1000, - in_house: false -) - -platform :ios do - - lane :fetch_highest_build_number do - build_number_candidates = [1] - build_number_candidates += latest_testflight_build_number( - version: package_json['version'], - initial_build_number: 1, - api_key: api_key - ) - build_number_candidates += app_store_build_number( - version: package_json['version'], - initial_build_number: 1, - api_key: api_key - ) - current_build_number = build_number_candidates.compact.max +require 'json' +require 'base64' + +default_platform(:ios) + +current_build_number = 1 +package_json = JSON.parse(File.read('../../../package.json')) + +api_key = app_store_connect_api_key( + key_id: ENV['APPLE_API_KEY_ID'], + issuer_id: ENV['APPLE_API_KEY_ISSUER_ID'], + key_content: "#{Base64.decode64(ENV['APPLE_API_KEY_CONTENT'])}".gsub('\n', '\\n'), + in_house: false +) + +platform :ios do + + lane :fetch_highest_build_number do + build_number_candidates = [1] + build_number_candidates << latest_testflight_build_number( + version: package_json['version'], + initial_build_number: 1, + app_identifier: ENV['IOS_BUNDLE_IDENTIFIER'], + api_key: api_key + ) + build_number_candidates << app_store_build_number( + version: package_json['version'], + initial_build_number: 1, + app_identifier: ENV['IOS_BUNDLE_IDENTIFIER'], + api_key: api_key + ) + current_build_number = build_number_candidates.max end lane :configure do @@ -92,7 +93,11 @@ platform :ios do lane :release do configure build - #upload_to_app_store(skip_metadata: true, skip_screenshots: true, api_key: api_key) + upload_to_app_store( + skip_metadata: true, + skip_screenshots: true, + api_key: api_key + ) end desc "Submit a new version to Testflight"