Merge branch feature/0.0.4 into main

Author: chenxGen

lib/cocoapods-project-hmap/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsProjectHmap
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

lib/cocoapods-project-hmap/hmap_generator.rb

@@ -9,7 +9,7 @@ def initialize
       @hmap = Hash.new
     end
     # header_mapping : [Hash{FileAccessor => Hash}] Hash of file accessors by header mappings.
-    def add_hmap_with_header_mapping(header_mapping, type, target_name=nil)
+    def add_hmap_with_header_mapping(header_mapping, type, target_name=nil, module_name=nil)
       header_mapping.each do |facc, headers|
         headers.each do |key, value|
           value.each do |path|
@@ -22,9 +22,14 @@ def add_hmap_with_header_mapping(header_mapping, type, target_name=nil)
               # import with quote
               @hmap[name] = path_info
             end
-            if type & ANGLE_BRACKET > 0 && target_name != nil
-              # import with angle bracket
-              @hmap["#{target_name}/#{name}"] = path_info
+            if type & ANGLE_BRACKET > 0
+              if target_name != nil
+                # import with angle bracket
+                @hmap["#{target_name}/#{name}"] = path_info
+              end
+              if module_name != nil && module_name != target_name
+                @hmap["#{module_name}/#{name}"] = path_info
+              end
             end
           end
         end

lib/cocoapods-project-hmap/pod_target.rb

@@ -1,5 +1,6 @@
 # !/usr/bin/env ruby
 require 'cocoapods-project-hmap/xcconfig'
+require 'cocoapods-project-hmap/hmap_generator'
 
 module Pod
   class PodTarget
@@ -26,6 +27,13 @@ def reset_header_search_with_relative_hmap_path(hmap_path)
         puts 'Unknown build settings'.red
       end
     end
+    def recursively_add_dependent_headers_to_hmap(hmap, generate_type)
+      dependent_targets.each do |depend_target|
+        # set public header for dependent target
+        hmap.add_hmap_with_header_mapping(depend_target.public_header_mappings_by_file_accessor, generate_type, depend_target.name, depend_target.product_module_name)
+        depend_target.recursively_add_dependent_headers_to_hmap(hmap, generate_type)
+      end
+    end
   end
   class AggregateTarget
     def reset_header_search_with_relative_hmap_path(hmap_path)

lib/cocoapods-project-hmap/post_install_hook_context.rb

@@ -28,7 +28,7 @@ def generate(sandbox, pods_project, aggregate_targets)
           end
         end
       else
-        # PostInstallHooksContext inherit BaseContext, just override `generate`
+        # PostInstallHooksContext inherited from BaseContext, just override `generate`
         def self.generate(sandbox, pods_project, aggregate_targets)
           context = super
           UI.info "- generate method of post install hook context override"

lib/cocoapods_plugin.rb

@@ -3,7 +3,6 @@
 require 'cocoapods-project-hmap/podfile_dsl'
 require 'cocoapods-project-hmap/pod_target'
 require 'cocoapods-project-hmap/post_install_hook_context'
-require 'cocoapods-project-hmap/hmap_generator'
 
 module ProjectHeaderMap
   Pod::HooksManager.register('cocoapods-project-hmap', :post_install) do |post_context|
@@ -18,14 +17,19 @@ module ProjectHeaderMap
       Pod::UI.message "- hanlding headers of aggregate target :#{one.name}".green
       one.pod_targets.each do |target|
         Pod::UI.message "- hanlding headers of target :#{target.name}"
-        pods_hmap.add_hmap_with_header_mapping(target.public_header_mappings_by_file_accessor, generate_type, target.name)
+        # There is no need to add headers of dynamic framework to hmap.
+        unless target.defines_module? && target.requires_frameworks?
+          pods_hmap.add_hmap_with_header_mapping(target.public_header_mappings_by_file_accessor, generate_type, target.name, target.product_module_name)
+        else
+          Pod::UI.message "- skip dynamic framework: #{target.name}"
+        end
+
         unless $hmap_black_pod_list.include?(target.name) || $prebuilt_hmap_for_pod_targets == false
           target_hmap = HmapGenerator.new
           # set project header for current target
-          target_hmap.add_hmap_with_header_mapping(target.header_mappings_by_file_accessor, HmapGenerator::BOTH, target.name)
-          target.dependent_targets.each do |depend_target|
-            # set public header for dependent target
-            target_hmap.add_hmap_with_header_mapping(depend_target.public_header_mappings_by_file_accessor, generate_type, depend_target.name)
+          target_hmap.add_hmap_with_header_mapping(target.header_mappings_by_file_accessor, HmapGenerator::BOTH, target.name, target.product_module_name)
+          if target.respond_to?(:recursively_add_dependent_headers_to_hmap)
+            target.recursively_add_dependent_headers_to_hmap(target_hmap, generate_type)
           end
 
           target_hmap_name="#{target.name}.hmap"