pod-builder 2.0.0.beta.25 → 2.0.0.beta.30

data/lib/pod_builder/podfile.rb

@@ -7,7 +7,7 @@ module PodBuilder
     PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}"].freeze
     private_constant :PRE_INSTALL_ACTIONS
 
-    def self.from_podfile_items(items, analyzer, build_configuration)
+    def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks)
       raise "\n\nno items".red unless items.count > 0
 
       sources = analyzer.sources
@@ -17,9 +17,7 @@ module PodBuilder
 
       platform = analyzer.instance_variable_get("@result").targets.first.platform
 
-      install_using_frameworks = install_using_frameworks(analyzer)      
-
-      podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "") 
+      podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "use_modular_headers!") 
       podfile.sub!("%%%uses_frameworks%%%", install_using_frameworks ? "true" : "false") 
 
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
@@ -386,6 +384,22 @@ module PodBuilder
       resolved_names.uniq
     end
 
+    def self.install_using_frameworks(analyzer)
+      target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
+      if target_settings.count == 1
+        if target_settings.first == false && ENV['DEBUGGING'].nil?
+          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
+        end
+        return target_settings.first
+      elsif target_settings.count > 1
+        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red
+      else
+        raise "\n\nFailed detecting use_frameworks!"
+      end
+
+      return true
+    end
+
     private
 
     def self.podfile_path_transform(path)
@@ -593,7 +607,7 @@ module PodBuilder
       base = File.expand_path(File.join(PodBuilder::project_path, ".."))
       bin_js = Dir.glob("#{base}/node_modules/@react-native-community/cli/build/bin.js")
 
-      raise "\n\nReact native cli bin_js not found!".red unless bin_js.count == 1
+      raise "\n\nReact native cli bin_js not found! Did you run yarn install?".red unless bin_js.count == 1
       bin_js = bin_js.first
 
       config_dest_path = PodBuilder::basepath("rn_config.json")
@@ -678,21 +692,5 @@ module PodBuilder
 
       return podfile_content
     end
-
-    def self.install_using_frameworks(analyzer)
-      target_settings = analyzer.podfile.target_definition_list.map(&:uses_frameworks?).uniq
-      if target_settings.count == 1
-        if target_settings.first == false && ENV['DEBUGGING'].nil?
-          raise "\n\nOnly framework packaging currently supported. Please add 'use_frameworks!' at Podfile root level (not nested in targets)".red
-        end
-        return target_settings.first
-      elsif target_settings.count > 1
-        raise "\n\n'use_frameworks!' should be declared only once at Podfile root level (not nested in targets)".red
-      else
-        raise "\n\nFailed detecting use_frameworks!"
-      end
-
-      return true
-    end
   end
 end

data/lib/pod_builder/podfile_cp.rb

@@ -3,7 +3,7 @@ require 'cocoapods/podfile.rb'
 module Pod
   class Podfile
     class TargetDefinition
-      def pb_to_s(all_buildable_items, indent_level = 0)
+      def pb_to_s(all_buildable_items, indent_level = 0, parent_pods = [])
         indentation = "  " * indent_level
         target_s = "#{indentation}target '#{self.name}' do\n"
         
@@ -15,7 +15,8 @@ module Pod
         prebuild_entries = []
         self.dependencies.each do |dep|
           if podfile_item = all_buildable_items.detect { |t| t.name == dep.name } 
-            if File.exist?(podfile_item.prebuilt_podspec_path) && !podfile_item.is_prebuilt 
+            is_prebuilt = all_buildable_items.select { |t| t.root_name == dep.root_name}.all?(&:is_prebuilt)
+            if File.exist?(podfile_item.prebuilt_podspec_path) && !is_prebuilt
               prebuild_entries.push(podfile_item)
             else
               pod_entries.push(podfile_item)
@@ -34,7 +35,8 @@ module Pod
             non_explicit_dependencies.each do |dep|
               dep_item = all_buildable_items.detect { |x| x.name == dep.name }
 
-              if File.exist?(dep_item.prebuilt_podspec_path) && !dep_item.is_prebuilt 
+              is_prebuilt = all_buildable_items.select { |t| t.root_name == dep.root_name}.all?(&:is_prebuilt)
+              if File.exist?(dep_item.prebuilt_podspec_path) && !is_prebuilt
                 prebuild_entries.push(dep_item)
               else
                 pod_entries.push(dep_item)
@@ -47,6 +49,10 @@ module Pod
 
         prebuild_entries = prebuild_entries.uniq.sort_by { |t| t.name }
         pod_entries = pod_entries.uniq.sort_by { |t| t.name }
+        
+        # Don't include inherited pods
+        prebuild_entries.reject! { |t| parent_pods.include?(t) }
+        pod_entries.reject! { |t| parent_pods.include?(t) }
 
         prebuild_entries.each do |pod|
           target_s += "#{child_indentation}#{pod.prebuilt_entry(false, false)}\n"
@@ -57,7 +63,7 @@ module Pod
 
         if self.children.count > 0
           target_s += "\n"
-          target_s += @children.map { |t| t.pb_to_s(all_buildable_items, indent_level + 1) }.join("\n\n")
+          target_s += @children.map { |t| t.pb_to_s(all_buildable_items, indent_level + 1, parent_pods + pod_entries + prebuild_entries) }.join("\n\n")
         end
 
         target_s += "#{indentation}end\n"

data/lib/pod_builder/podfile_item.rb

@@ -79,6 +79,10 @@ module PodBuilder
     #
     attr_accessor :build_configuration
 
+    # @return [Array<String>] When building static frameworks we sometimes have to remove module maps from Other C flags to make compilation succeed
+    #
+    attr_accessor :remove_module_maps
+
     # @return [String] The pod's vendored frameworks
     #
     attr_accessor :vendored_frameworks
@@ -180,7 +184,11 @@ module PodBuilder
 
       @default_subspecs = extract_array(spec, "default_subspecs")
       if default_subspec = spec.attributes_hash["default_subspec"]
-        @default_subspecs.push(default_subspec)
+        @default_subspecs.push(default_subspec)        
+      end
+
+      if @name == @root_name && @default_subspecs.empty?
+        @default_subspecs += all_specs.select { |t| t.name.include?("/") && t.name.split("/").first == @root_name }.map { |t| t.name.split("/").last }
       end
 
       @dependency_names = spec.attributes_hash.fetch("dependencies", {}).keys + default_subspecs.map { |t| "#{@root_name}/#{t}" } 
@@ -194,11 +202,18 @@ module PodBuilder
       @is_static = spec.root.attributes_hash["static_framework"] || false
       @xcconfig = spec.root.attributes_hash["xcconfig"] || {}
 
-      @source_files = source_files_from(spec)
+      default_subspecs_specs ||= begin
+        subspecs = all_specs.select { |t| t.name.split("/").first == @root_name }
+        subspecs.select { |t| @default_subspecs.include?(t.name.split("/").last) }
+      end
+      root_spec = all_specs.detect { |t| t.name == @root_name } || spec
+      @source_files = source_files_from([spec, root_spec] + default_subspecs_specs)
       
       @build_configuration = spec.root.attributes_hash.dig("pod_target_xcconfig", "prebuild_configuration") || "release"
       @build_configuration.downcase!
 
+      @remove_module_maps = spec.root.attributes_hash["remove_module_maps"] || []
+
       default_license = "MIT"
       @license = spec.root.attributes_hash.fetch("license", {"type"=>"#{default_license}"})["type"] || default_license
       @summary = spec.root.attributes_hash.fetch("summary", "A summary for #{@name}")
@@ -287,7 +302,7 @@ module PodBuilder
       #
       # When building PodA we need to build both DepA subspecs because they might 
       # contain different code
-      deps += available_pods.select { |t| root_names.include?(t.root_name) }
+      deps += available_pods.select { |t| root_names.include?(t.root_name) && t.root_name != t.name }
 
       deps.uniq!
 
@@ -389,11 +404,7 @@ module PodBuilder
     end
 
     def prebuilt_rel_path
-      if is_subspec && Configuration.subspecs_to_split.include?(name)
-        return "#{name}/#{module_name}.framework"
-      else
-        return "#{module_name}.framework"
-      end
+      return "#{module_name}.framework"
     end
 
     def prebuilt_podspec_path(absolute_path = true)
@@ -408,11 +419,7 @@ module PodBuilder
     def prebuilt_entry(include_pb_entry = true, absolute_path = false)
       podspec_dirname = File.dirname(prebuilt_podspec_path(absolute_path = absolute_path))
 
-      if Configuration.subspecs_to_split.include?(name)
-        entry = "pod '#{podspec_name}', :path => '#{podspec_dirname}'"
-      else
-        entry = "pod '#{name}', :path => '#{podspec_dirname}'"
-      end
+      entry = "pod '#{name}', :path => '#{podspec_dirname}'"
 
       if include_pb_entry && !is_prebuilt
         entry += prebuilt_marker()
@@ -518,28 +525,9 @@ module PodBuilder
       end
     end
 
-    def source_files_from(spec)
-      files = spec.root.attributes_hash.fetch("source_files", [])
-      root_source_files = source_files_from_string(files)
-
-      files = spec.attributes_hash.fetch("source_files", [])
-      source_files = source_files_from_string(files)
-
-      subspec_source_files = []
-      if spec.name == spec.root.name
-        default_podspecs = spec.attributes_hash.fetch("default_subspecs", [])
-        if default_podspecs.is_a? String 
-          default_podspecs = [default_podspecs]
-        end
-        default_podspecs.each do |subspec_name|
-          if subspec = spec.subspecs.detect { |x| x.name == "#{spec.root.name}/#{subspec_name}" }
-            files = subspec.attributes_hash.fetch("source_files", [])
-            subspec_source_files += source_files_from_string(files)
-          end
-        end
-      end
-
-      return source_files + root_source_files + subspec_source_files
+    def source_files_from(specs)
+      files = specs.map { |t| t.attributes_hash.fetch("source_files", []) }.flatten
+      return source_files_from_string(files).uniq
     end
   end
 end

data/lib/pod_builder/podspec.rb

@@ -3,7 +3,7 @@
 
 module PodBuilder
   class Podspec
-    def self.generate(all_buildable_items, analyzer)  
+    def self.generate(all_buildable_items, analyzer, install_using_frameworks)  
       unless all_buildable_items.count > 0
         return
       end
@@ -11,12 +11,12 @@ module PodBuilder
       puts "Generating PodBuilder's local podspec".yellow
                   
       platform = analyzer.instance_variable_get("@result").targets.first.platform
-      generate_podspec_from(all_buildable_items, platform)
+      generate_podspec_from(all_buildable_items, platform, install_using_frameworks)
     end
     
     private
 
-    def self.generate_spec_keys_for(item, name, all_buildable_items)
+    def self.generate_spec_keys_for(item, name, all_buildable_items, install_using_frameworks)
       podspec = ""
       valid = false
 
@@ -24,46 +24,80 @@ module PodBuilder
       indentation = "    " * slash_count
       spec_var = "p#{slash_count}"
 
+      if spec_var == "p1" && item.default_subspecs.count > 0
+        podspec += "#{indentation}#{spec_var}.default_subspecs = '#{item.default_subspecs.join("', '")}'\n"
+      end
+
       if item.name == name
         if_exists = lambda { |t| File.exist?(PodBuilder::prebuiltpath("#{item.root_name}/#{t}") || "") }
 
-        vendored_frameworks = item.vendored_frameworks + ["#{item.module_name}.framework"]
+        vendored_frameworks = item.vendored_frameworks 
+        if item.default_subspecs.count == 0 && install_using_frameworks
+          vendored_frameworks += ["#{item.module_name}.framework"]
+        end
+
         existing_vendored_frameworks = vendored_frameworks.select(&if_exists)
         existing_vendored_frameworks_basename = vendored_frameworks.map { |t| File.basename(t) }.select(&if_exists)
         vendored_frameworks = (existing_vendored_frameworks + existing_vendored_frameworks_basename).uniq
         
         vendored_libraries = item.vendored_libraries
-        existing_vendored_libraries = vendored_libraries.map { |t| "#{item.module_name}/#{t}" }.select(&if_exists)
-        existing_vendored_libraries_basename = vendored_libraries.map { |t| File.basename(t) }.select(&if_exists)
-        vendored_libraries = (existing_vendored_libraries + existing_vendored_libraries_basename).uniq        
-  
-        # .a are static libraries and should not be included again in the podspec to prevent duplicated symbols (in the app and in the prebuilt framework)
-        vendored_libraries.reject! { |t| t.end_with?(".a") }
-  
-        frameworks = all_buildable_items.select { |t| vendored_frameworks.include?("#{t.module_name}.framework") }.uniq
-        static_frameworks = frameworks.select { |x| x.is_static }
-  
-        resources = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }.compact.flatten.uniq
-        exclude_files = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/Info.plist" }.compact.flatten.uniq
+        if install_using_frameworks
+          existing_vendored_libraries = vendored_libraries.map { |t| "#{item.module_name}/#{t}" }.select(&if_exists)
+          existing_vendored_libraries_basename = vendored_libraries.map { |t| File.basename(t) }.select(&if_exists)
+          vendored_libraries = (existing_vendored_libraries + existing_vendored_libraries_basename).uniq        
+
+          # .a are static libraries and should not be included again in the podspec to prevent duplicated symbols (in the app and in the prebuilt framework)
+          vendored_libraries.reject! { |t| t.end_with?(".a") }
+
+          frameworks = all_buildable_items.select { |t| vendored_frameworks.include?("#{t.module_name}.framework") }.uniq
+          static_frameworks = frameworks.select { |x| x.is_static }  
+
+          resources = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}" }.compact.flatten.uniq
+
+          exclude_files = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/Info.plist" }.compact.flatten.uniq
+          public_headers = []
+        else
+          public_headers = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/Headers/**/*.h"))
+          vendored_libraries +=  ["#{item.root_name}/lib#{item.root_name}.a"]
+          vendored_libraries.map! { |t| "#{item.root_name}/#{t}" }.select(&if_exists)
+           
+          resources = ["#{item.root_name}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}"]
+
+          exclude_files = ["*.modulemap"]
+          unless item.swift_version.nil?
+            exclude_files += ["Swift Compatibility Header/*", "*.swiftmodule"]
+          end
+          exclude_files.map! { |t| "#{item.root_name}/#{t}" }
+        end
+
+        entries = lambda { |spec_key, spec_value| 
+          key = "#{indentation}#{spec_var}.#{spec_key}"
+          joined_values = spec_value.map { |t| "#{t}" }.uniq.sort.join("', '")
+          "#{key} = '#{joined_values}'\n" 
+        }
           
         if vendored_frameworks.count > 0
-          podspec += "#{indentation}#{spec_var}.vendored_frameworks = '#{vendored_frameworks.uniq.sort.join("','")}'\n"
+          podspec += entries.call("vendored_frameworks", vendored_frameworks)
         end      
         if vendored_libraries.count > 0
-          podspec += "#{indentation}#{spec_var}.vendored_libraries = '#{vendored_libraries.uniq.sort.join("','")}'\n"
+          podspec += entries.call("vendored_libraries", vendored_libraries)
         end
         if item.frameworks.count > 0
-          podspec += "#{indentation}#{spec_var}.frameworks = '#{item.frameworks.uniq.sort.join("', '")}'\n"
+          podspec += entries.call("frameworks", item.frameworks)
         end
         if item.libraries.count > 0
-          podspec += "#{indentation}#{spec_var}.libraries = '#{item.libraries.uniq.sort.join("', '")}'\n"
+          podspec += entries.call("libraries", item.libraries)
         end
         if resources.count > 0
-          podspec += "#{indentation}#{spec_var}.resources = '#{resources.uniq.sort.join("', '")}'\n"
+          podspec += entries.call("resources", resources)
         end
         if exclude_files.count > 0
-          podspec += "#{indentation}#{spec_var}.exclude_files = '#{exclude_files.uniq.sort.join("', '")}'\n"
+          podspec += entries.call("exclude_files", exclude_files)
+        end
+        if public_headers.count > 0
+          podspec += "#{indentation}#{spec_var}.public_header_files = '#{item.root_name}/Headers/**/*.h'\n"
         end
+
         if item.xcconfig.keys.count > 0
           xcconfig = Hash.new
           item.xcconfig.each do |k, v|
@@ -88,6 +122,21 @@ module PodBuilder
             podspec += "#{indentation}#{spec_var}.xcconfig = #{xcconfig.to_s}\n"
           end
         end
+        if !install_using_frameworks && spec_var == "p1"
+          module_path_files = Dir.glob(PodBuilder.prebuiltpath("#{item.root_name}/**/#{item.root_name}.modulemap"))
+          raise "\n\nToo many module maps found for #{item.root_name}".red if module_path_files.count > 1
+          if module_path_file = module_path_files.first
+            rel_path = Pathname.new(PodBuilder::prebuiltpath).relative_path_from(Pathname.new(PodBuilder::project_path("Pods"))).to_s
+            prebuilt_root_var = "#{item.root_name.upcase.gsub("-", "_")}_PREBUILT_ROOT"
+            module_map_rel = module_path_file.gsub(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/"), "")
+            static_cfg = { prebuilt_root_var => "$(PODS_ROOT)/#{rel_path}",
+                          "SWIFT_INCLUDE_PATHS" => "$(inherited) \"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\"",
+                          "OTHER_CFLAGS" => "$(inherited) -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\"",
+                          "OTHER_SWIFT_FLAGS" => "$(inherited) -Xcc -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\""
+                          }
+            podspec += "#{indentation}#{spec_var}.xcconfig = #{static_cfg.to_s}\n"
+                        end
+        end
   
         deps = item.dependency_names.sort
         if name == item.root_name
@@ -103,7 +152,7 @@ module PodBuilder
           end
         end
 
-        valid = valid || vendored_frameworks.count > 0
+        valid = valid || (install_using_frameworks ? vendored_frameworks.count > 0 : vendored_libraries.count > 0)
       end
       
       subspec_names = all_buildable_items.map(&:name).select { |t| t.start_with?("#{name}/") }
@@ -117,7 +166,7 @@ module PodBuilder
           podspec += "\n"
         end
           
-        subspec_keys, subspec_valid = generate_spec_keys_for(subspec_item, subspec, all_buildable_items) 
+        subspec_keys, subspec_valid = generate_spec_keys_for(subspec_item, subspec, all_buildable_items, install_using_frameworks) 
         valid = valid || subspec_valid
 
         if subspec_keys.length > 0
@@ -130,7 +179,7 @@ module PodBuilder
       return podspec, valid
     end
 
-    def self.generate_podspec_from(all_buildable_items, platform)
+    def self.generate_podspec_from(all_buildable_items, platform, install_using_frameworks)
       prebuilt_podspec_path = all_buildable_items.map(&:prebuilt_podspec_path)
       prebuilt_podspec_path.each do |path|
         if File.exist?(path)
@@ -165,7 +214,7 @@ module PodBuilder
         podspec += "    p1.#{platform.safe_string_name.downcase}.deployment_target  = '#{platform.deployment_target.version}'\n"
         podspec += "\n"
 
-        main_keys, valid = generate_spec_keys_for(item, item.root_name, all_buildable_items)
+        main_keys, valid = generate_spec_keys_for(item, item.root_name, all_buildable_items, install_using_frameworks)
         if !valid
           next
         end

data/lib/pod_builder/rome/post_install.rb

@@ -2,6 +2,7 @@
 
 require 'fourflusher'
 require 'colored'
+require 'pathname'
 
 module PodBuilder
   def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
@@ -15,9 +16,9 @@ module PodBuilder
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
     
-    xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [])
+    xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], {})
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
-    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
+    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, {})
 
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
     spec_names.each do |root_name, module_name|
@@ -47,29 +48,17 @@ module PodBuilder
       
       raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
       
-      # Merge swift headers as per Xcode 10.2 release notes
-      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
-        device_content = File.read(device_swift_header_path)
-        simulator_content = File.read(simulator_swift_header_path)
-        merged_content = %{
-          #if TARGET_OS_SIMULATOR
-          #{simulator_content}
-          #else
-          #{device_content}
-          #endif
-        }        
-        File.write(device_swift_header_path, merged_content)
-      end
+      merge_header_into(device_swift_header_path, simulator_swift_header_path)
       
       # Merge device framework into simulator framework (so that e.g swift Module folder is merged) 
       # letting device framework files overwrite simulator ones
       FileUtils.cp_r(File.join(device_framework_lib, "."), simulator_framework_lib) 
       source_lib = File.dirname(simulator_framework_lib)
       
-      FileUtils.cp_r(source_lib, build_dir)
+      FileUtils.mv(device_dsym, dsym_device_folder) if File.exist?(device_dsym)
+      FileUtils.mv(simulator_dsym, dsym_simulator_folder) if File.exist?(simulator_dsym)
       
-      FileUtils.cp_r(device_dsym, dsym_device_folder) if File.exist?(device_dsym)
-      FileUtils.cp_r(simulator_dsym, dsym_simulator_folder) if File.exist?(simulator_dsym)
+      FileUtils.mv(source_lib, build_dir)
       
       # Remove frameworks leaving dSYMs
       FileUtils.rm_rf(device_framework_lib) 
@@ -77,165 +66,130 @@ module PodBuilder
     end
   end
 
-  def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
+  def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon, prebuilt_root_paths)
     raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
-
-    device_headers_folder = File.join(build_dir, "Headers", device)
-    simulator_headers_folder = File.join(build_dir, "Headers", simulator)
-    FileUtils.mkdir_p(device_headers_folder)
-    FileUtils.mkdir_p(simulator_headers_folder)
         
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
 
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
 
-    xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [])
-    spec_names.each do |root_name, module_name|
-      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
-      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
-  
-      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
-      device_lib = "#{device_base}/lib#{module_name}.a"
-
-      FileUtils.cp headers_private, device_headers_folder
-      FileUtils.cp headers_public, device_headers_folder
-    end
-
+    xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], prebuilt_root_paths)
     excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
-    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
+    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, prebuilt_root_paths)
+
     spec_names.each do |root_name, module_name|
-      headers_private = "#{sandbox.headers_root.to_s}/Private/#{root_name}/#{module_name}"
-      headers_public = "#{sandbox.headers_root.to_s}/Public/#{root_name}/#{module_name}"
-  
       simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
       simulator_lib = "#{simulator_base}/lib#{module_name}.a"
 
-      FileUtils.cp headers_private, simulator_headers_folder
-      FileUtils.cp headers_public, simulator_headers_folder
-    end
-
-    spec_names.each do |root_name, module_name|
-      device_headers_private = ""
-      device_headers_public = ""
-      simulator_headers_private = ""
-      simulator_headers_public = ""
-
       device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
-      device_lib = "#{device_base}/lib#{module_name}.a"
-      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
-      simulator_lib = "#{simulator_base}/lib#{module_name}.a"
+      device_lib = "#{device_base}/lib#{root_name}.a"
   
-      next unless File.file?(device_lib) && File.file?(simulator_lib)
-
-            # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
-      # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
-      # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
-      # compile time directives (e.g #if targetEnvironment(simulator))
-      #
-      # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
-      if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
-        `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
-      end
-      
-      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
-      
-      # Merge swift headers as per Xcode 10.2 release notes
-      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
-        device_content = File.read(device_swift_header_path)
-        simulator_content = File.read(simulator_swift_header_path)
-        merged_content = %{
-          #if TARGET_OS_SIMULATOR
-          #{simulator_content}
-          #else
-          #{device_content}
-          #endif
-        }        
-        File.write(device_swift_header_path, merged_content)
+      if File.file?(device_lib) && File.file?(simulator_lib)
+        # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
+        # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
+        # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
+        # compile time directives (e.g #if targetEnvironment(simulator))
+        #
+        # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
+        if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
+          `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
+        end
+        
+        raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
       end
 
+      device_headers = Dir.glob("#{device_base}/**/*.h")
+      simulator_headers = Dir.glob("#{simulator_base}/**/*.h")
+      device_headers.each do |device_path|
+        simulator_path = device_path.gsub(device_base, simulator_base)
+
+        merge_header_into(device_path, simulator_path)
+      end 
+      simulator_only_headers = simulator_headers - device_headers.map { |t| t.gsub(device_base, simulator_base) }
+      simulator_only_headers.each do |path|
+        add_simulator_conditional(path)
+        dir_name = File.dirname(path)
+        destination_folder = dir_name.gsub(simulator_base, device_base)
+        FileUtils.mkdir_p(destination_folder)
+        FileUtils.cp(path, destination_folder)
+      end
 
-    end
-
-
+      swiftmodule_path = "#{simulator_base}/#{root_name}.swiftmodule"
+      if File.directory?(swiftmodule_path)
+        FileUtils.cp_r("#{swiftmodule_path}/.", "#{device_base}/#{root_name}.swiftmodule")
+      end
 
-    spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
-    spec_names.each do |root_name, module_name|
-      device_base = "#{build_dir}/#{configuration}-#{device}/#{root_name}" 
-      device_lib = "#{device_base}/#{module_name}.framework/#{module_name}"
-      device_dsym = "#{device_base}/#{module_name}.framework.dSYM"
-      device_framework_lib = File.dirname(device_lib)
-      device_swift_header_path = "#{device_framework_lib}/Headers/#{module_name}-Swift.h"
-      
-      simulator_base = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}"
-      simulator_lib = "#{simulator_base}/#{module_name}.framework/#{module_name}"
-      simulator_dsym = "#{simulator_base}/#{module_name}.framework.dSYM"
-      simulator_framework_lib = File.dirname(simulator_lib)
-      simulator_swift_header_path = "#{simulator_framework_lib}/Headers/#{module_name}-Swift.h"
-      
-      next unless File.file?(device_lib) && File.file?(simulator_lib)
-      
-      # Starting with Xcode 12b3 the simulator binary contains an arm64 slice as well which conflict with the one in the device_lib
-      # when creating the fat library. A naive workaround is to remove the arm64 from the simulator_lib however this is wrong because 
-      # we might actually need to have 2 separated arm64 slices, one for simulator and one for device each built with different
-      # compile time directives (e.g #if targetEnvironment(simulator))
-      #
-      # For the time being we remove the arm64 slice bacause otherwise the `xcrun lipo -create -output ...` would fail.
-      if `xcrun lipo -info #{simulator_lib}`.include?("arm64")
-        `xcrun lipo -remove arm64 #{simulator_lib} -o #{simulator_lib}`
+      if File.exist?("#{device_base}/#{root_name}.swiftmodule")
+        # This is a swift pod with a swiftmodule in the root of the prebuilt folder
+      else
+        # Objective-C pods have the swiftmodule generated under Pods/Headers/Public
+        public_headers_path = "#{Configuration.build_path}/Pods/Headers/Public/#{root_name}"
+        module_public_headers_path = "#{Configuration.build_path}/Pods/Headers/Public/#{module_name}"  
+        if public_headers_path.downcase != module_public_headers_path.downcase && File.directory?(public_headers_path) && File.directory?(module_public_headers_path)
+          # For pods with module_name != name we have to move the modulemap files to the root_name one
+          module_public_headers_path = "#{Configuration.build_path}/Pods/Headers/Public/#{module_name}"  
+          FileUtils.cp_r("#{module_public_headers_path}/.", public_headers_path)
+        end
+        Dir.glob("#{public_headers_path}/**/*.*").each do |path|
+          destination_folder = "#{device_base}/Headers" + path.gsub(public_headers_path, "")
+          destination_folder = File.dirname(destination_folder)
+          FileUtils.mkdir_p(destination_folder)
+          FileUtils.cp(path, destination_folder)
+        end          
       end
-      
-      raise "Lipo failed on #{device_lib}" unless system("xcrun lipo -create -output #{device_lib} #{device_lib} #{simulator_lib}")
-      
-      # Merge swift headers as per Xcode 10.2 release notes
-      if File.exist?(device_swift_header_path) && File.exist?(simulator_swift_header_path)
-        device_content = File.read(device_swift_header_path)
-        simulator_content = File.read(simulator_swift_header_path)
-        merged_content = %{
-          #if TARGET_OS_SIMULATOR
-          #{simulator_content}
-          #else
-          #{device_content}
-          #endif
-        }        
-        File.write(device_swift_header_path, merged_content)
+
+      destination_path = "#{build_dir}/#{root_name}"
+      if Dir.glob("#{device_base}/**/*.{a,framework,h}").count > 0
+        FileUtils.mv(device_base, destination_path)
+
+        module_maps = Dir.glob("#{destination_path}/**/*.modulemap")
+        module_map_device_base = device_base.gsub(/^\/private/, "") + "/"
+        module_maps.each do |module_map|
+          content = File.read(module_map)
+          content.gsub!(module_map_device_base, "")
+          File.write(module_map, content)
+        end      
       end
-      
-      # # Merge device framework into simulator framework (so that e.g swift Module folder is merged) 
-      # # letting device framework files overwrite simulator ones
-      # FileUtils.cp_r(File.join(device_framework_lib, "."), simulator_framework_lib) 
-      # source_lib = File.dirname(simulator_framework_lib)
-      
-      # FileUtils.cp_r(source_lib, build_dir)
-      
-      # FileUtils.cp_r(device_dsym, dsym_device_folder) if File.exist?(device_dsym)
-      # FileUtils.cp_r(simulator_dsym, dsym_simulator_folder) if File.exist?(simulator_dsym)
-      
-      # # Remove frameworks leaving dSYMs
-      # FileUtils.rm_rf(device_framework_lib) 
-      # FileUtils.rm_rf(simulator_framework_lib)
     end
   end
 
+  def self.merge_header_into(device_file, simulator_file)
+    unless File.exist?(device_file) || File.exist?(simulator_file)
+      return
+    end
+    
+    device_content = File.file?(device_file) ? File.read(device_file) : ""
+    simulator_content = File.file?(simulator_file) ? File.read(simulator_file) : ""
+    merged_content = %{
+#if TARGET_OS_SIMULATOR
+// ->
+
+#{simulator_content}
+
+// ->
+#else
+// ->
+
+#{device_content}
+
+// ->
+#endif
+    }        
+    File.write(device_file, merged_content)
+  end 
+
+  def self.add_simulator_conditional(path)
+    file_content = File.read(path)
+    content = %{
+#if TARGET_OS_SIMULATOR
+#{file_content}
+#endif
+    }        
+    File.write(path, content)
+  end
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  def self.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs)
+  def self.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs, prebuilt_root_paths)
     args = %W(-project #{sandbox.project_path.realdirpath} -scheme #{target} -configuration #{configuration} -sdk #{sdk})
     supported_platforms = { 'iphonesimulator' => 'iOS', 'appletvsimulator' => 'tvOS', 'watchsimulator' => 'watchOS' }
     if platform = supported_platforms[sdk]
@@ -246,6 +200,9 @@ module PodBuilder
     if exclude_archs.count > 0 && xcodebuild_version >= 12.0
       args += ["EXCLUDED_ARCHS=#{exclude_archs.join(" ")}"]
     end
+    prebuilt_root_paths.each do |k, v|
+      args += ["#{k.upcase.gsub("-", "_")}_PREBUILT_ROOT=#{v.gsub(/ /, '\ ')}"]
+    end
     
     environmental_variables = {}
     if deterministic_build
@@ -306,8 +263,6 @@ module PodBuilder
     end
     project.save
   end
-
-  
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
@@ -317,6 +272,8 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
+
+  prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub('=>', ':'))
   
   sandbox_root = Pathname(installer_context.sandbox_root)
   sandbox = Pod::Sandbox.new(sandbox_root)
@@ -331,19 +288,20 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   targets.each do |target|
     case [target.platform_name, uses_frameworks]
     when [:ios, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when [:osx, true] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:osx, true] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, {})
     when [:tvos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
     when [:watchos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when [:ios, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when [:osx, false] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
+    when [:ios, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
+    when [:osx, false] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
+    when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
+    when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon, prebuilt_root_paths)
     else raise "\n\nUnknown platform '#{target.platform_name}'".red end
     end  
 
     raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
     
-    built_count = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq.count
+    specs = installer_context.umbrella_targets.map { |t| t.specs.map(&:name) }.flatten.map { |t| t.split("/").first }.uniq
+    built_count = Dir["#{build_dir}/*"].select { |t| specs.include?(File.basename(t)) }.count
     Pod::UI.puts "Built #{built_count} #{'items'.pluralize(built_count)}, copying..."
     
     base_destination.rmtree if base_destination.directory?
@@ -351,20 +309,23 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     installer_context.umbrella_targets.each do |umbrella|
       umbrella.specs.each do |spec|
         root_name = spec.name.split("/").first
+
+        if uses_frameworks
+          destination = File.join(base_destination, root_name)        
+        else
+          destination = File.join(base_destination, root_name, root_name)        
+        end
         # Make sure the device target overwrites anything in the simulator build, otherwise iTunesConnect
         # can get upset about Info.plist containing references to the simulator SDK
-        frameworks = Pathname.glob("build/#{root_name}/*.framework").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
-        
+        files = Pathname.glob("build/#{root_name}/*").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
+
         consumer = spec.consumer(umbrella.platform_name)
         file_accessor = Pod::Sandbox::FileAccessor.new(sandbox.pod_dir(spec.root.name), consumer)
-        frameworks += file_accessor.vendored_libraries
-        frameworks += file_accessor.vendored_frameworks
-        resources = file_accessor.resources
-        
-        destination = File.join(base_destination, root_name)
-        FileUtils.mkdir_p(destination)
-        
-        files = frameworks + resources
+        files += file_accessor.vendored_libraries
+        files += file_accessor.vendored_frameworks
+        files += file_accessor.resources
+
+        FileUtils.mkdir_p(destination)        
         files.each do |file|
           FileUtils.cp_r(file, destination)
         end    
@@ -389,7 +350,10 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
     end
     
     if enable_dsym
-      FileUtils.mv("#{build_dir}/dSYM", sandbox_root.parent)
+      dsym_source = "#{build_dir}/dSYM"
+      if File.directory?(dsym_source)
+        FileUtils.mv(dsym_source, sandbox_root.parent)
+      end
     else
       raise "Not implemented"
     end