diff --git a/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/actions/build_and_deploy_action.rb b/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/actions/build_and_deploy_action.rb index ebe40c7..423a537 100644 --- a/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/actions/build_and_deploy_action.rb +++ b/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/actions/build_and_deploy_action.rb @@ -15,6 +15,8 @@ module Fastlane # Decrypt the keys archive and Extract the keys archive Helper::AndroidCdHelper.decrypt_android_keys('.') + UI.message("👉🏼 Credentials decrypted") + # Clean the project before building other_action.gradle(task: "clean") @@ -26,11 +28,14 @@ module Fastlane task: "bundle", build_type: "Release", print_command: true, + project_dir: 'android/', properties: { "android.injected.version.code" => build_number } ) + UI.message("👉🏼 App built") + # Upload the Android App Bundle to the Play Store other_action.upload_to_play_store( track: params[:beta_type], diff --git a/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/helper/android_cd_helper.rb b/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/helper/android_cd_helper.rb index 9921246..43f38cd 100644 --- a/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/helper/android_cd_helper.rb +++ b/plugins/fastlane-plugin-android_cd/lib/fastlane/plugin/android_cd/helper/android_cd_helper.rb @@ -15,7 +15,7 @@ module Fastlane if $?.success? # Move the extracted files to the current directory - `jar xvf #{android_directory} && mv #{android_directory}/android_keys/* #{android_directory}` + `jar xvf #{android_directory}/android_keys.zip && mv #{android_directory}/android_keys/* #{android_directory}` else UI.user_error!("❌ Erreur lors de la décompression du fichier GPG") end diff --git a/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/helper/ios_cd_helper.rb b/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/helper/ios_cd_helper.rb index 3d771dc..939f5cf 100644 --- a/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/helper/ios_cd_helper.rb +++ b/plugins/fastlane-plugin-ios_cd/lib/fastlane/plugin/ios_cd/helper/ios_cd_helper.rb @@ -15,8 +15,6 @@ module Fastlane # Decrypts ios credentials def self.decrypt_ios_keys(ios_directory) # Define the GPG command with options - system('echo test') - system("echo #{ENV['IOS_KEYS_SECRET_PASSPHRASE']}") gpg_command = "gpg --quiet --batch --yes --decrypt --passphrase=#{ENV['IOS_KEYS_SECRET_PASSPHRASE']} \ --output #{ios_directory}/ios_keys.zip #{ios_directory}/ios_keys.zip.gpg"