Improve the implementation for on demand resources

CocoaPods · Apr 26, 2020 · 81403b6 · 81403b6
1 parent b29c07a
commit 81403b6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ## Master
 
 ##### Enhancements
+* Support On-Demand Resource   
+  [JunyiXie](https://github.com/JunyiXie)
+  [#issue_number](https://github.com/CocoaPods/Xcodeproj/pull/742)
 
 * Add new APIs to set testables or entries in schemes.  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)

diff --git a/lib/xcodeproj/project/object/native_target.rb b/lib/xcodeproj/project/object/native_target.rb
@@ -552,33 +552,37 @@ def add_resources(resource_file_references)
           end
         end
 
-        # remove on demand resource files to the resources build phase of the target.
+        # Remove on demand resource to the resources build phase of the target.
         #
-        # @param  [Array<PBXFileReference>] on_demand_resource_file_references
+        # @param  {String => [Array<PBXFileReference>]} on_demand_resource_tag_files
         #         the files references of the on demand resources to the target.
         #
         # @return [void]
         #
-        def remove_on_demand_resources(on_demand_resource_file_references)
-          on_demand_resource_file_references.each do |file|
-            resources_build_phase.remove_file_reference(file)
+        def remove_on_demand_resources(on_demand_resource_tag_files)
+          on_demand_resource_tag_files.each do |_, files|
+            files.each do |file|
+              resources_build_phase.remove_file_reference(file)
+            end
           end
         end
 
-        # Adds on demand resource files to the resources build phase of the target.
+        # Adds on demand resource to the resources build phase of the target.
         #
-        # @param  [Array<PBXFileReference>] on_demand_resource_file_references
-        #         the files references of the on demand resources to the target.
+        # @param  {String => [Array<PBXFileReference>]} on_demand_resource_tag_files
+        #         the files references of the on demand resource to the target.
         #
         # @return [void]
         #
-        def add_on_demand_resources(on_demand_resource_file_references)
-          on_demand_resource_file_references.each do |file|
-            next if resources_build_phase.include?(file)
-            build_file = project.new(PBXBuildFile)
-            build_file.file_ref = file
-            build_file.settings = (build_file.settings ||= {}).merge({"ASSET_TAGS" => ["OnDemand"]})
-            resources_build_phase.files << build_file
+        def add_on_demand_resources(on_demand_resource_tag_files)
+          on_demand_resource_tag_files.each do |tag_name, files|
+            files.each do |file|
+              next if resources_build_phase.include?(file)
+              build_file = project.new(PBXBuildFile)
+              build_file.file_ref = file
+              build_file.settings = (build_file.settings ||= {}).merge('ASSET_TAGS' => [tag_name])
+              resources_build_phase.files << build_file
+            end
           end
         end