From f1ef3af242d8021c9fae5d98d862c75dea75ef0b Mon Sep 17 00:00:00 2001
From: Carles Roig <carlesroiggarcia@gmail.com>
Date: Tue, 3 Mar 2020 15:39:30 +0100
Subject: [PATCH 1/2] Copy Asset Pack into output directory

---
 .../gym/generators/package_command_generator.rb   |  4 ++++
 .../package_command_generator_xcode7.rb           |  5 +++++
 gym/lib/gym/runner.rb                             | 15 +++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/gym/lib/gym/generators/package_command_generator.rb b/gym/lib/gym/generators/package_command_generator.rb
index 25139cb51f2..f780df13f1b 100644
--- a/gym/lib/gym/generators/package_command_generator.rb
+++ b/gym/lib/gym/generators/package_command_generator.rb
@@ -49,6 +49,10 @@ def apps_path
         generator.apps_path
       end
 
+      def asset_packs_path
+        generator.asset_packs_path
+      end
+
       # The generator we need to use for the currently used Xcode version
       # Since we dropped Xcode 6 support, it's just this class, but maybe we'll have
       # new classes in the future
diff --git a/gym/lib/gym/generators/package_command_generator_xcode7.rb b/gym/lib/gym/generators/package_command_generator_xcode7.rb
index 8a9340e326c..4ccdb3b8dc5 100644
--- a/gym/lib/gym/generators/package_command_generator_xcode7.rb
+++ b/gym/lib/gym/generators/package_command_generator_xcode7.rb
@@ -136,6 +136,11 @@ def apps_path
         Gym.cache[:apps_path] ||= File.join(temporary_output_path, "Apps")
       end
 
+      # The path to the Apps folder
+      def asset_packs_path
+        Gym.cache[:asset_packs_path] ||= File.join(temporary_output_path, "OnDemandResources")
+      end
+
       private
 
       def normalize_export_options(hash)
diff --git a/gym/lib/gym/runner.rb b/gym/lib/gym/runner.rb
index c21ac8ef3de..b4d121dfe94 100644
--- a/gym/lib/gym/runner.rb
+++ b/gym/lib/gym/runner.rb
@@ -39,6 +39,7 @@ def run
         move_app_thinning
         move_app_thinning_size_report
         move_apps_folder
+        move_asset_packs
       elsif is_mac
         path = File.expand_path(Gym.config[:output_directory])
         compress_and_move_dsym
@@ -325,6 +326,20 @@ def move_apps_folder
       end
     end
 
+
+    # Move Asset Packs folder to the output directory
+    # @return (String) The path to the resulting Asset Packs (aka OnDemandResources) folder
+    def move_asset_packs
+      if Dir.exist?(PackageCommandGenerator.asset_packs_path)
+        FileUtils.mv(PackageCommandGenerator.asset_packs_path, File.expand_path(Gym.config[:output_directory]), force: true)
+        asset_packs_path = File.join(File.expand_path(Gym.config[:output_directory]), File.basename(PackageCommandGenerator.asset_packs_path))
+
+        UI.success("Successfully exported Asset Pack folder:")
+        UI.message(asset_packs_path)
+        asset_packs_path
+      end
+    end
+
     def find_archive_path
       Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
     end

From 45a4318dedb8412ff8d5348d5cd899aa2bc352cf Mon Sep 17 00:00:00 2001
From: Carles Roig <carlesroiggarcia@gmail.com>
Date: Wed, 4 Mar 2020 13:01:15 +0100
Subject: [PATCH 2/2] Fix code style offenses

---
 gym/lib/gym/runner.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gym/lib/gym/runner.rb b/gym/lib/gym/runner.rb
index b4d121dfe94..d9a60409b3d 100644
--- a/gym/lib/gym/runner.rb
+++ b/gym/lib/gym/runner.rb
@@ -326,7 +326,6 @@ def move_apps_folder
       end
     end
 
-
     # Move Asset Packs folder to the output directory
     # @return (String) The path to the resulting Asset Packs (aka OnDemandResources) folder
     def move_asset_packs