fastlane-plugin-amazon_appstore 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda405ecfd4552721a5fad15738d20f2923b56007d2bf902f0777675bf407e66
-  data.tar.gz: e14898796f4aa0effa8e460adeaebb85bb3a2987db1695110ab505d9cd7ad60a
+  metadata.gz: 21d358d66c528f38a3ad99d3b980b4c8e2d57b83e57bfcd5a459384e458f6822
+  data.tar.gz: 49e5ad56a1c3757f61cc8c8db28904e46ee463eee4d6baf2a18369da56edc1fd
 SHA512:
-  metadata.gz: fe5a72a6bd0931931f8c7d3a0e2e25a80d487d7a370489fbf8f370c358882c4a225d48c38bdb8130c4bb62b2ebdbf4c299bb08b6b7b90c3086a1e132ee1a7c63
-  data.tar.gz: f3768bf3ffe9364a0f922b7756452c547b365ab8a2e5d57a78980ecc628cf4afb5cf6ec3cf620a25b0d09db34277a4d13996c624282d092d7a3539afdd08d4bc
+  metadata.gz: 5c7ed8b749f7e73584a502de0603bcf8d11038ea3d20319af5d548f0af753d9438ac8ad3d4c3a0814826469e4bc1a1b068501b837fb58c70e6936f1215e1cf22
+  data.tar.gz: f2d7560dec9330c9cc110f00efe6b4db5d0a41b4cdf986567a2cee0c3932e2b5edb9ed19bd578e12ff72e68942dd6b649e39ef80318aef3efd35a4f9420c18e7

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,7 +33,8 @@ 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                       | 
@@ -48,7 +47,9 @@ upload_to_amazon_appstore(
 ### 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

@@ -46,27 +46,40 @@ module Fastlane
         end
         UI.abort_with_message!("Failed to get edit_id") if edit_id.nil?
 
-        UI.message("Replacing apk...")
+        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.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 +145,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",
@@ -148,7 +166,7 @@ module Fastlane
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :changes_not_sent_for_review,
                                        env_name: "AMAZON_APPSTORE_CHANGES_NOT_SENT_FOR_REVIEW",
-                                       description: "Indices that the changes in this edit will not be reviewed until they are explicitly sent for review from the Amazon Appstore Console UI",
+                                       description: "Indicates that the changes in this edit will not be reviewed until they are explicitly sent for review from the Amazon Appstore Console UI",
                                        default_value: false,
                                        optional: true,
                                        type: Boolean),

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

@@ -65,17 +65,99 @@ module Fastlane
         raise StandardError, delete_edits_response.body unless delete_edits_response.success?
       end
 
-      def self.replace_apk(local_apk_path:, app_id:, edit_id:, token:)
+      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}"
+        end
+        raise StandardError, upload_apk_response.body unless upload_apk_response.success?
+
+        {
+          version_code: upload_apk_response.body[:versionCode],
+          apk_id: upload_apk_response.body[:id]
+        }
+      end
+
+      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 +166,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?
 
-        replace_apk_response.body[:versionCode]
+        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?
+
+          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 +295,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.
@@ -180,14 +314,14 @@ module Fastlane
         return changelog_text if skip_upload_changelogs
 
         path = File.join(metadata_path, language, 'changelogs', "#{version_code}.txt")
-        if File.exist?(path) && !File.zero?(path)
+        if File.exist?(path) && !File.empty?(path)
           UI.message("Updating changelog for '#{version_code}' and language '#{language}'...")
           changelog_text = File.read(path, encoding: 'UTF-8')
         else
-          defalut_changelog_path = File.join(metadata_path, language, 'changelogs', 'default.txt')
-          if File.exist?(defalut_changelog_path) && !File.zero?(defalut_changelog_path)
+          default_changelog_path = File.join(metadata_path, language, 'changelogs', 'default.txt')
+          if File.exist?(default_changelog_path) && !File.empty?(default_changelog_path)
             UI.message("Updating changelog for '#{version_code}' and language '#{language}' to default changelog...")
-            changelog_text = File.read(defalut_changelog_path, encoding: 'UTF-8')
+            changelog_text = File.read(default_changelog_path, encoding: 'UTF-8')
           else
             UI.message("Could not find changelog for '#{version_code}' and language '#{language}' at path #{path}...")
           end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module AmazonAppstore
-    VERSION = "1.1.0"
+    VERSION = "1.3.0"
   end
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-amazon_appstore
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - ntsk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-23 00:00:00.000000000 Z
+date: 2025-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.12.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
@@ -70,114 +76,120 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: '1.50'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.25.0
+        version: '1.51'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rubocop-require_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
 description:
 email: contact@ntsk.jp
 executables: []
@@ -203,14 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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