fastlane-plugin-amazon_appstore 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc301533c2007325736e250da85e0efa77f6c24dc9e96575b660252dfe1fdfc1
-  data.tar.gz: cc8fb420eefe04b69812b2cfa6b0a24b158f90713de4521183d24670022d6b8c
+  metadata.gz: 42700d0bc41d91c1a7cebc2f4d5583f703b2532ab72581f6a96e3c2e1a9508e8
+  data.tar.gz: 0b180a4dafa671749b7f3b95cac6c6991e602230d0aab9f0ce979fa281ecdd92
 SHA512:
-  metadata.gz: f317b197eef47b6d805949fb5cb89d8e41dd4d10da35d5bd30cbb28d19f766320ad85ce594312b136832761ff83e16615b60ce436fda7b3820aa0c3f04b6ba2a
-  data.tar.gz: 1ba515e18f5f67027b1843aa5c571bb90d3c9b24db1027d1d8627cbdc9ba5b78cc0650d79d2c5fd70218baa10fc7e7a15a99d8c0bfb16ee291bd41f783aadb05
+  metadata.gz: 2157e233420340003117f553e20187bff0ab2a66eda203188dd292529e0667f3c77e4ba80a62e3f30e7ba85684ddf787385d2fd92a9d7412f4ba7456d0b9616e
+  data.tar.gz: 2973cac2d292082f30358107c7017ea7e9efda6d477a320f16d4797022503b98c01acbb2b9b9a5f8d28abc7d07834bfffa1f03d333b5e7945571de05a07e8d4d

data/README.md

@@ -15,8 +15,6 @@ fastlane add_plugin amazon_appstore
 
 Upload the apk to the Amazon Appstore using the [App Submission API](https://developer.amazon.com/docs/app-submission-api/overview.html).
 
-In the future, it would be nice to be able to use it to update store information like `upload_to_play_store`, but for now, it only supports replacing apk and submitting it for review.
-
 ## Usage
 
 Following the [guide](https://developer.amazon.com/docs/app-submission-api/auth.html), you will need to generate `client_id` and `client_secret` to access the console in advance.
@@ -35,20 +33,24 @@ upload_to_amazon_appstore(
 | Key                         | Description                                                                                                                                | Default                     | 
 | --------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ | --------------------------- | 
 | package_name                | The package name of the application to use                                                                                                 | *                           | 
-| apk                         | Path to the APK file to upload                                                                                                             |                             | 
+| apk                         | Path to the APK file to upload (optional if apk_paths is provided)                                                                         |                             |
+| apk_paths                   | An array of paths to APK files to upload (optional if apk is provided)                                                                     |                             |
 | client_id                   | The client ID you saved                                                                                                                    |                             | 
 | client_secret               | The client secret you saved                                                                                                                |                             | 
 | skip_upload_changelogs      | Whether to skip uploading changelogs                                                                                                       | false                       | 
 | metadata_path               | Path to the directory containing the metadata files                                                                                        | ./fastlane/metadata/android | 
 | changes_not_sent_for_review | Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Amazon Appstore Console UI | false                       | 
 | overwrite_upload            | Whether to allow overwriting an existing upload                                                                                            | false                       |
+| overwrite_upload_mode       | Upload strategy when overwrite_upload is true. Can be 'new' (delete existing edit and create new) or 'reuse' (reuse existing edit)         | new                         |
 | timeout                     | Timeout for read, open (in seconds)                                                                                                        | 300                         | 
 * = default value is dependent on the user's system
 
 ### Changelogs
 
 You can update the release notes by adding a file under `changelogs/` in the same way as [supply](https://docs.fastlane.tools/actions/upload_to_play_store/).
-The filename should exactly match the version code of the APK that it represents. You can also provide default notes that will be used if no files match the version code by adding a default.txt file. 
+The filename should exactly match the version code of the APK that it represents. You can also provide default notes that will be used if no files match the version code by adding a default.txt file.
+
+When uploading multiple APKs with different version codes, the plugin will use the changelog from the highest version code, following the same approach as Fastlane's `upload_to_play_store` action.
 
 ```
 └── fastlane

data/lib/fastlane/plugin/amazon_appstore/actions/upload_to_amazon_appstore_action.rb

@@ -22,51 +22,79 @@ module Fastlane
         UI.abort_with_message!("Failed to get token") if token.nil?
 
         if params[:overwrite_upload]
-          UI.message("Deleting existing edits if needed (overwrite_upload: true)...")
+          if params[:overwrite_upload_mode] == "new"
+            UI.message("Deleting existing edits if needed (overwrite_upload: true, overwrite_upload_mode: new)...")
+            begin
+              Helper::AmazonAppstoreHelper.delete_edits_if_exists(
+                app_id: params[:package_name],
+                token: token
+              )
+            rescue StandardError => e
+              UI.error(e.message)
+              UI.abort_with_message!("Failed to delete edits (overwrite_upload: true, overwrite_upload_mode: new)")
+            end
+          elsif params[:overwrite_upload_mode] == "reuse"
+            UI.message("Retrieving active edit (overwrite_upload: true, overwrite_upload_mode: reuse)...")
+            begin
+              edit_id, = Helper::AmazonAppstoreHelper.get_edits(
+                app_id: params[:package_name],
+                token: token
+              )
+            rescue StandardError => e
+              UI.error(e.message)
+              UI.abort_with_message!("Failed to get edit_id (overwrite_upload: true, overwrite_upload_mode: reuse)")
+            end
+            UI.message("No active edit") if edit_id.nil?
+          end
+        end
+
+        if edit_id.nil?
+          UI.message("Creating new edits...")
           begin
-            Helper::AmazonAppstoreHelper.delete_edits_if_exists(
+            edit_id = Helper::AmazonAppstoreHelper.create_edits(
               app_id: params[:package_name],
               token: token
             )
           rescue StandardError => e
             UI.error(e.message)
-            UI.abort_with_message!("Failed to delete edits (overwrite_upload: true)")
+            UI.abort_with_message!("Failed to create edits")
           end
+          UI.abort_with_message!("Failed to get edit_id") if edit_id.nil?
         end
 
-        UI.message("Creating new edits...")
-        begin
-          edit_id = Helper::AmazonAppstoreHelper.create_edits(
-            app_id: params[:package_name],
-            token: token
-          )
-        rescue StandardError => e
-          UI.error(e.message)
-          UI.abort_with_message!("Failed to create edits")
+        apks = []
+        apks << params[:apk] if params[:apk]
+        apks += params[:apk_paths] if params[:apk_paths]
+
+        if apks.empty?
+          UI.abort_with_message!("No APK files provided. Please provide either 'apk' or 'apk_paths' parameter")
         end
-        UI.abort_with_message!("Failed to get edit_id") if edit_id.nil?
 
-        UI.message("Replacing apk...")
+        UI.message("Replacing APKs with #{apks.length} file(s)...")
         begin
-          version_code = Helper::AmazonAppstoreHelper.replace_apk(
-            local_apk_path: params[:apk],
+          apk_results = Helper::AmazonAppstoreHelper.replace_apks(
+            apk_paths: apks,
             app_id: params[:package_name],
             edit_id: edit_id,
             token: token
           )
         rescue StandardError => e
           UI.error(e.message)
-          UI.abort_with_message!("Failed to replace apk")
+          UI.abort_with_message!("Failed to replace APKs")
+        end
+        # Extract version codes and display results
+        version_codes = apk_results.map { |result| result[:version_code] }
+        apk_results.each_with_index do |result, index|
+          UI.message("Successfully processed APK #{index + 1} with version code: #{result[:version_code]}")
         end
-        UI.abort_with_message!("Failed to get version_code") if version_code.nil?
 
         UI.message("Updating release notes...")
         begin
-          Helper::AmazonAppstoreHelper.update_listings(
+          Helper::AmazonAppstoreHelper.update_listings_for_multiple_apks(
             app_id: params[:package_name],
             edit_id: edit_id,
             token: token,
-            version_code: version_code,
+            version_codes: version_codes,
             skip_upload_changelogs: params[:skip_upload_changelogs],
             metadata_path: params[:metadata_path]
           )
@@ -132,8 +160,13 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :apk,
                                        env_name: "AMAZON_APPSTORE_APK",
                                        description: "The path of the apk file",
-                                       optional: false,
+                                       optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :apk_paths,
+                                       env_name: "AMAZON_APPSTORE_APK_PATHS",
+                                       description: "An array of paths to APK files to upload",
+                                       optional: true,
+                                       type: Array),
           FastlaneCore::ConfigItem.new(key: :skip_upload_changelogs,
                                        env_name: "AMAZON_APPSTORE_SKIP_UPLOAD_CHANGELOGS",
                                        description: "Whether to skip uploading changelogs",
@@ -158,6 +191,13 @@ module Fastlane
                                        default_value: false,
                                        optional: true,
                                        type: Boolean),
+          FastlaneCore::ConfigItem.new(key: :overwrite_upload_mode,
+                                       env_name: "AMAZON_APPSTORE_OVERWRITE_UPLOAD_MODE",
+                                       description: "Upload strategy. Can be 'new' or 'reuse'",
+                                       default_value: 'new',
+                                       verify_block: proc do |value|
+                                         UI.user_error!("overwrite_upload can only be 'new' or 'reuse'") unless %w(new reuse).include?(value)
+                                       end),
           FastlaneCore::ConfigItem.new(key: :timeout,
                                        env_name: "AMAZON_APPSTORE_TIMEOUT",
                                        description: "Timeout for read, open (in seconds)",

data/lib/fastlane/plugin/amazon_appstore/helper/amazon_appstore_helper.rb

@@ -47,6 +47,19 @@ module Fastlane
       end
 
       def self.delete_edits_if_exists(app_id:, token:)
+        edits_id, etag = self.get_edits(app_id: app_id, token: token)
+        return nil if edits_id.nil? || etag.nil? # Do nothing if edits do not exist
+
+        edits_path = "api/appstore/v1/applications/#{app_id}/edits"
+        delete_edits_response = api_client.delete("#{edits_path}/#{edits_id}") do |request|
+          request.headers['Authorization'] = "Bearer #{token}"
+          request.headers['If-Match'] = etag
+        end
+
+        raise StandardError, delete_edits_response.body unless delete_edits_response.success?
+      end
+
+      def self.get_edits(app_id:, token:)
         edits_path = "api/appstore/v1/applications/#{app_id}/edits"
         edits_response = api_client.get(edits_path) do |request|
           request.headers['Authorization'] = "Bearer #{token}"
@@ -55,27 +68,103 @@ module Fastlane
 
         edits_id = edits_response.body[:id]
         etag = edits_response.headers['Etag']
-        return nil if edits_id.nil? || etag.nil? # Do nothing if edits do not exist
 
-        delete_edits_response = api_client.delete("#{edits_path}/#{edits_id}") do |request|
+        return edits_id, etag
+      end
+
+      def self.upload_apk(local_apk_path:, app_id:, edit_id:, token:)
+        upload_apk_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/upload"
+        upload_apk_response = api_client.post(upload_apk_path) do |request|
+          request.body = Faraday::UploadIO.new(local_apk_path, 'application/vnd.android.package-archive')
+          request.headers['Content-Length'] = request.body.stat.size.to_s
+          request.headers['Content-Type'] = 'application/vnd.android.package-archive'
           request.headers['Authorization'] = "Bearer #{token}"
-          request.headers['If-Match'] = etag
         end
+        raise StandardError, upload_apk_response.body unless upload_apk_response.success?
 
-        raise StandardError, delete_edits_response.body unless delete_edits_response.success?
+        {
+          version_code: upload_apk_response.body[:versionCode],
+          apk_id: upload_apk_response.body[:id]
+        }
       end
 
-      def self.replace_apk(local_apk_path:, app_id:, edit_id:, token:)
+      def self.replace_apks(apk_paths:, app_id:, edit_id:, token:)
+        # Get existing APKs in the edit
         get_apks_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks"
         get_apks_response = api_client.get(get_apks_path) do |request|
           request.headers['Authorization'] = "Bearer #{token}"
         end
         raise StandardError, get_apks_response.body unless get_apks_response.success?
 
-        first_apk = get_apks_response.body[0]
-        apk_id = first_apk[:id]
-        raise StandardError, 'apk_id is nil' if apk_id.nil?
+        existing_apks = get_apks_response.body
+        raise StandardError, 'No existing APKs found in edit' if existing_apks.empty?
+
+        version_codes = []
+        apk_results = []
+
+        apk_paths.each_with_index do |apk_path, index|
+          if index < existing_apks.length
+            # Replace existing APK at the specified index
+            apk_id = existing_apks[index][:id]
+            raise StandardError, "apk_id is nil for index #{index}" if apk_id.nil?
+
+            # Get ETag for the specific APK
+            get_etag_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}"
+            etag_response = api_client.get(get_etag_path) do |request|
+              request.headers['Authorization'] = "Bearer #{token}"
+            end
+            raise StandardError, etag_response.body unless etag_response.success?
+
+            etag = etag_response.headers['Etag']
+
+            # Replace the APK
+            replace_apk_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}/replace"
+            replace_apk_response = api_client.put(replace_apk_path) do |request|
+              request.body = Faraday::UploadIO.new(apk_path, 'application/vnd.android.package-archive')
+              request.headers['Content-Length'] = request.body.stat.size.to_s
+              request.headers['Content-Type'] = 'application/vnd.android.package-archive'
+              request.headers['Authorization'] = "Bearer #{token}"
+              request.headers['If-Match'] = etag
+            end
+            raise StandardError, replace_apk_response.body unless replace_apk_response.success?
+
+            version_code = replace_apk_response.body[:versionCode]
+            version_codes << version_code
+            apk_results << { version_code: version_code, apk_id: apk_id }
+          else
+            # Upload new APK if there are more APK paths than existing APKs
+            result = upload_apk(
+              local_apk_path: apk_path,
+              app_id: app_id,
+              edit_id: edit_id,
+              token: token
+            )
+            version_codes << result[:version_code]
+            apk_results << result
+          end
+        end
+
+        # Delete remaining APKs if there are more existing APKs than specified APK paths
+        if existing_apks.length > apk_paths.length
+          remaining_apks = existing_apks[apk_paths.length..]
+          UI.message("Deleting #{remaining_apks.length} remaining APK(s)...")
 
+          remaining_apks.each_with_index do |apk, index|
+            delete_apk(
+              app_id: app_id,
+              edit_id: edit_id,
+              apk_id: apk[:id],
+              token: token
+            )
+            UI.message("Deleted APK ID: #{apk[:id]} (position #{apk_paths.length + index + 1})")
+          end
+        end
+
+        apk_results
+      end
+
+      def self.delete_apk(app_id:, edit_id:, apk_id:, token:)
+        # Get ETag for the APK to be deleted
         get_etag_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}"
         etag_response = api_client.get(get_etag_path) do |request|
           request.headers['Authorization'] = "Bearer #{token}"
@@ -84,17 +173,57 @@ module Fastlane
 
         etag = etag_response.headers['Etag']
 
-        replace_apk_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}/replace"
-        replace_apk_response = api_client.put(replace_apk_path) do |request|
-          request.body = Faraday::UploadIO.new(local_apk_path, 'application/vnd.android.package-archive')
-          request.headers['Content-Length'] = request.body.stat.size.to_s
-          request.headers['Content-Type'] = 'application/vnd.android.package-archive'
+        # Delete the APK
+        delete_apk_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/apks/#{apk_id}"
+        delete_apk_response = api_client.delete(delete_apk_path) do |request|
           request.headers['Authorization'] = "Bearer #{token}"
           request.headers['If-Match'] = etag
         end
-        raise StandardError, replace_apk_response.body unless replace_apk_response.success?
+        raise StandardError, delete_apk_response.body unless delete_apk_response.success?
+
+        UI.message("Successfully deleted APK #{apk_id}")
+      end
+
+      def self.update_listings_for_multiple_apks(app_id:, edit_id:, token:, version_codes:, skip_upload_changelogs:, metadata_path:)
+        return if skip_upload_changelogs
+
+        UI.message("Updating listings for #{version_codes.length} version codes: #{version_codes.join(', ')}")
+
+        # Get listings once with ETag
+        listings_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/listings"
+        listings_response = api_client.get(listings_path) do |request|
+          request.headers['Authorization'] = "Bearer #{token}"
+        end
+        raise StandardError, listings_response.body unless listings_response.success?
+
+        # Process each language once
+        listings_response.body[:listings].each do |lang, listing|
+          # Get fresh ETag for each language update to avoid conflicts
+          etag_response = api_client.get(listings_path) do |request|
+            request.headers['Authorization'] = "Bearer #{token}"
+          end
+          raise StandardError, etag_response.body unless etag_response.success?
 
-        replace_apk_response.body[:versionCode]
+          etag = etag_response.headers['Etag']
+
+          # Find the best changelog for multiple version codes
+          recent_changes = find_changelog_for_multiple_version_codes(
+            language: listing[:language],
+            version_codes: version_codes,
+            metadata_path: metadata_path
+          )
+          listing[:recentChanges] = recent_changes
+
+          # Update listings once per language
+          update_listings_path = "api/appstore/v1/applications/#{app_id}/edits/#{edit_id}/listings/#{lang}"
+          update_listings_response = api_client.put(update_listings_path) do |request|
+            request.body = listing.to_json
+            request.headers['Authorization'] = "Bearer #{token}"
+            request.headers['If-Match'] = etag
+          end
+          raise StandardError, update_listings_response.body unless update_listings_response.success?
+        end
+        nil
       end
 
       def self.update_listings(app_id:, edit_id:, token:, version_code:, skip_upload_changelogs:, metadata_path:)
@@ -173,6 +302,18 @@ module Fastlane
       end
       private_class_method :auth_client
 
+      def self.find_changelog_for_multiple_version_codes(language:, version_codes:, metadata_path:)
+        # Use the highest version code's changelog (same as Fastlane's approach)
+        max_version_code = version_codes.max
+        UI.message("Using changelog for highest version code: #{max_version_code}")
+        find_changelog(
+          language: language,
+          version_code: max_version_code,
+          skip_upload_changelogs: false,
+          metadata_path: metadata_path
+        )
+      end
+
       def self.find_changelog(language:, version_code:, skip_upload_changelogs:, metadata_path:)
         # The Amazon appstore requires you to enter changelogs before reviewing.
         # Therefore, if there is no metadata, hyphen text is returned.

data/lib/fastlane/plugin/amazon_appstore/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module AmazonAppstore
-    VERSION = "1.2.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-amazon_appstore
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - ntsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-19 00:00:00.000000000 Z
+date: 2025-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Upload apps to Amazon Appstore