cocoapods-mapfile 0.2.7.0 → 0.2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e976ef653409840f3071bf38d444adde2bf7fd3c3c3b4b5cf3306749e481e204
-  data.tar.gz: 76a41c0215836e6865cb3b8f4de6ac455a4698c1d86e3cc864dc52288c1a1581
+  metadata.gz: aaaa78e71fbc30aa040f8a0ad7d14ad0af6691a406e40a1002119c8b39a06f7c
+  data.tar.gz: 790ac93ec756eb422472df923f99d4d706638b69141ccd43e84a515cac42cdad
 SHA512:
-  metadata.gz: f778fbad37bf41df0f26bd337c54babc8af7adb887cc64947aa90a00b3cb998c9fcae367c2ae3b3ab852e2213e08c15d0afe1c07dcccbd6d6808b1a2b4fe7979
-  data.tar.gz: 49a92092bdd8ea77ca0c22a8d251bf168b36eb17f0b10f1b6609e7d7cf914f124c3d25016f8b392dd4b1e4370821fe1c9a9f2ecb0eb0abe476d1056ad0114d8a
+  metadata.gz: 4bca57920f0d2ef6bc29aa611c221c1e1b1f86e95abf4ac2225fa160dd44a51456a3ba4044202dde4088994d663bb30c2ed02f640947e8e825cc7e7264de63d7
+  data.tar.gz: eb3623e1250bbf2d1ae177aaf819735cd410fb43eba476727350fc0ed6d662bd8e6bc03b51e38b4377f45c665d953622fc6bf04aff9d091b92274bbf1ebe309d

data/lib/hmap/command/hmap_writer.rb

@@ -40,7 +40,7 @@ module HMap
 
       def run
         UserInterface.puts "\n[hmapfile-from-json] start"
-        if File.exist?(@json_path) && File.exist?(@output_path)
+        if File.exist?(@json_path)
           require 'json'
           json_file = File.read(@json_path)
           json = JSON.parse(json_file)

data/lib/hmap/gem_version.rb

@@ -1,5 +1,5 @@
 module HMap
   # The version of the hmapfile command line tool.
   #
-  VERSION = '0.2.7.0'.freeze unless defined? HMap::VERSION
+  VERSION = '0.2.7.1'.freeze unless defined? HMap::VERSION
 end

data/lib/hmap/xc/target/target.rb

@@ -9,11 +9,13 @@ module HMap
     include HMap::Target::Helper
 
     attr_reader :entrys, :target, :project
+    attr_accessor :xcconfig_paths
 
     def initialize(entrys, target, project)
       @entrys = entrys || []
       @target = target
       @project = project
+      @xcconfig_paths = []
     end
 
     def platforms
@@ -27,53 +29,63 @@ module HMap
     end
 
     def save_hmap_settings!
-      xcconfig_paths.each do |path|
+      build_setting_paths.each do |path|
         settings = Constants.instance.hmap_build_settings
         XcodeprojHelper.new(path).add_build_settings_and_save(settings, use_origin: Resolver.instance.use_origin)
       end
     end
 
     def remove_hmap_settings!
-      xcconfig_paths.each { |path| HMap::XcodeprojHelper.new(path).remove_build_settings_and_save }
+      build_setting_paths.each { |path| HMap::XcodeprojHelper.new(path).remove_build_settings_and_save }
     end
 
     private
 
-    def xcconfig_paths
-      return @xcconfig_paths if defined?(@xcconfig_paths)
+    def build_setting_paths
+      return @build_setting_paths if defined?(@build_setting_paths)
 
-      @xcconfig_paths = target.build_configurations.flat_map do |configuration|
-        if configuration.is_a?(Constants::XCBuildConfiguration)
-          bcr = configuration.base_configuration_reference
-          unless bcr.nil?
-            s_path = PBXHelper.group_paths(bcr)
-            x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
-            path = File.expand_path(File.join(project.project_dir, s_path, x))
-            xc = XCConfig.new(path)
-            inc = xc.includes_paths
-            path if inc.empty? || project.workspace.xcconfig_paths.none? { |pa| inc.include?(pa) }
-          end
-        end
+      @build_setting_paths = xcconfig_paths.map do |path|
+        xc = XCConfig.new(path)
+        inc = xc.includes_paths
+        path if inc.empty? || project.workspace.xcconfig_paths.none? { |pa| inc.include?(pa) }
       end.compact
-
-      # @xcconfig_paths = target.build_configuration_list.build_configurations.flat_map do |configuration|
-      #   if configuration.is_a?(Constants::XCBuildConfiguration)
-      #     bcr = configuration.base_configuration_reference
-      #     # if bcr.nil?
-      #     #   ab_path = Pathname(project.project_dir + "hmap-#{target_name}.#{configuration.name}.xcconfig")
-      #     #   File.new(ab_path, 'w') unless ab_path.exist?
-      #     #   xc_ref = target.project.new_file(ab_path)
-      #     #   configuration.base_configuration_reference = xc_ref
-      #     #   target.project.save
-      #     #   ab_path
-      #     # else
-      #     unless bcr.nil?
-      #       s_path = PBXHelper.group_paths(bcr)
-      #       x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
-      #       File.expand_path File.join(project.project_dir, s_path, x)
-      #     end
-      #   end
-      # end.compact
     end
+
+    # def xcconfig_paths
+    #   return @xcconfig_paths if defined?(@xcconfig_paths)
+
+    #   @xcconfig_paths = target.build_configurations.flat_map do |configuration|
+    #     if configuration.is_a?(Constants::XCBuildConfiguration)
+    #       bcr = configuration.base_configuration_reference
+    #       unless bcr.nil?
+    #         s_path = PBXHelper.group_paths(bcr)
+    #         x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
+    #         path = File.expand_path(File.join(project.project_dir, s_path, x))
+    #         xc = XCConfig.new(path)
+    #         inc = xc.includes_paths
+    #         path if inc.empty? || project.workspace.xcconfig_paths.none? { |pa| inc.include?(pa) }
+    #       end
+    #     end
+    #   end.compact
+
+    #   @xcconfig_paths = target.build_configuration_list.build_configurations.flat_map do |configuration|
+    #     if configuration.is_a?(Constants::XCBuildConfiguration)
+    #       bcr = configuration.base_configuration_reference
+    #       # if bcr.nil?
+    #       #   ab_path = Pathname(project.project_dir + "hmap-#{target_name}.#{configuration.name}.xcconfig")
+    #       #   File.new(ab_path, 'w') unless ab_path.exist?
+    #       #   xc_ref = target.project.new_file(ab_path)
+    #       #   configuration.base_configuration_reference = xc_ref
+    #       #   target.project.save
+    #       #   ab_path
+    #       # else
+    #       unless bcr.nil?
+    #         s_path = PBXHelper.group_paths(bcr)
+    #         x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
+    #         File.expand_path File.join(project.project_dir, s_path, x)
+    #       end
+    #     end
+    #   end.compact
+    # end
   end
 end

data/lib/hmap/xc/target/target_helper.rb

@@ -94,7 +94,7 @@ module HMap
       def build_dir
         return @build_dir if defined?(@build_dir)
 
-        b_d = xcconfig_paths.none? { |path| XCConfig.new(path).attributes[Constants::CONFIGURATION_BUILD_DIR].nil? }
+        b_d = build_setting_paths.none? { |path| XCConfig.new(path).attributes[Constants::CONFIGURATION_BUILD_DIR].nil? }
         @build_dir = target_name if b_d
       end
 

data/lib/hmap/xc/target/target_vfs.rb

@@ -10,6 +10,10 @@ module HMap
       @real_path = file
       @virtual_path = File.join(build_dir, File.basename(file))
     end
+
+    def eql?(other)
+      other.real_path == real_path && other.virtual_path == virtual_path
+    end
   end
 
   class TargetPlatformVFS

data/lib/hmap/xc/workspace/project_helper.rb

@@ -9,11 +9,20 @@ module HMap
       define_method(:all_product_headers) do
         return @all_product_headers if defined? @all_product_headers
 
-        @all_product_headers = targets.each_with_object({}) do |target, sum|
+        hs = targets.each_with_object({}) do |target, sum|
           next if target.all_product_headers.nil?
 
           sum.merge!(target.all_product_headers) { |_, oldval, newval| newval + oldval }
         end
+
+        if targets.any?(&:app_target?)
+          workspace.projects.each do |pr|
+            next if pr == self
+
+            hs.merge!(pr.all_product_headers) { |_, v1, v2| v1 + v2 }
+          end
+        end
+        @all_product_headers = hs
       end
 
       define_method(:all_non_framework_target_headers) do
@@ -37,13 +46,13 @@ module HMap
         hs = targets.inject({}) do |sum, entry|
           sum.merge!(entry.project_headers) { |_, v1, _| v1 }
         end
-        # if targets.any?(&:app_target?)
-        #   workspace.projects.each do |pr|
-        #     next if pr == self
+        if targets.any?(&:app_target?)
+          workspace.projects.each do |pr|
+            next if pr == self
 
-        #     hs.merge!(pr.project_headers) { |_, v1, _| v1 }
-        #   end
-        # end
+            hs.merge!(pr.project_headers) { |_, v1, _| v1 }
+          end
+        end
         @project_headers = project_entrys.inject(hs) do |sum, entry|
           sum.merge!(entry.project_buckets_extra) { |_, v1, _| v1 }
         end

data/lib/hmap/xc/workspace/workspace.rb

@@ -96,7 +96,9 @@ module HMap
 
             s_path = PBXHelper.group_paths(bcr)
             x = bcr.instance_variable_get('@simple_attributes_hash')['path'] || ''
-            File.expand_path(File.join(project.project_dir, s_path, x))
+            path = File.expand_path(File.join(project.project_dir, s_path, x))
+            target.xcconfig_paths << path
+            path
           end.compact
         end
       end.uniq

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mapfile
 version: !ruby/object:Gem::Version
-  version: 0.2.7.0
+  version: 0.2.7.1
 platform: ruby
 authors:
 - Cat1237
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler