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

data/lib/pod_builder/podfile/post_actions.rb

@@ -3,26 +3,21 @@ require 'pod_builder/core'
 
 module PodBuilder
   class Podfile
-    def self.remove_target_support_duplicate_entries
-      puts "[PodBuilder] Removing target support duplicated entries".yellow
-      
+    def self.pod_builder_post_process
       Configuration.load
-      
+
+      targets = find_xcodeproj_targets
+      target_names = targets.map(&:name)
+
+      puts "[PodBuilder] Removing target support duplicated entries".yellow
       # Frameworks and resources
-      find_xcodeproj_targets.map(&:name).each do |target|
+      target_names.each do |target|
         remove_duplicate_entries("Pods/Target Support Files/Pods-#{target}/Pods-#{target}-frameworks.sh")
         remove_duplicate_entries("Pods/Target Support Files/Pods-#{target}/Pods-#{target}-resources.sh")
       end
-    end
 
-    def self.check_target_support_resource_collisions
       puts "[PodBuilder] Checking target support resource collisions".yellow
-
-      Configuration.load
-
-      targets = find_xcodeproj_targets
-
-      targets.map(&:name).each do |target|
+      target_names.each do |target|
         check_for_colliding_resources("Pods/Target Support Files/Pods-#{target}/Pods-#{target}-resources.sh", target, targets)
       end
     end
@@ -74,7 +69,7 @@ module PodBuilder
         resource_files = resource_files.map { |i| File.basename(i) }
         resource_files = resource_files.map { |i| i.gsub(".xib", ".nib") }
       else
-        raise "#{target} not found!".red
+        raise "\n\n#{target} not found!".red
       end
       
       # Check that Pods-TARGET-resources.sh doesn't contain colliding entries (Cocoapods 1.4.0)

data/lib/pod_builder/podfile_cp.rb

@@ -0,0 +1,93 @@
+require 'cocoapods/podfile.rb'
+
+module Pod
+  class Podfile
+    class TargetDefinition
+      def pb_to_s(all_buildable_items, indent_level = 0)
+        indentation = "  " * indent_level
+        target_s = "#{indentation}target '#{self.name}' do\n"
+        
+        child_indentation = "  " * (indent_level + 1)
+
+        explicit_deps = self.dependencies.map { |t| all_buildable_items.detect { |u| u.name == t.name } }.compact
+        
+        pod_entries = []
+        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 
+              prebuild_entries.push(podfile_item)
+            else
+              pod_entries.push(podfile_item)
+            end
+
+            non_explicit_dependencies = podfile_item.recursive_dependencies(all_buildable_items) - explicit_deps
+            non_explicit_dependencies_root_names = non_explicit_dependencies.map(&:root_name).uniq.filter { |t| t != podfile_item.root_name }
+            non_explicit_dependencies = non_explicit_dependencies_root_names.map { |x| 
+              if item = all_buildable_items.detect { |t| x == t.name }
+                item                    
+              else
+                item = all_buildable_items.detect { |t| x == t.root_name }
+              end
+            }.compact
+            
+            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 
+                prebuild_entries.push(dep_item)
+              else
+                pod_entries.push(dep_item)
+              end
+
+              explicit_deps.push(dep)
+            end       
+          end
+        end
+
+        prebuild_entries = prebuild_entries.uniq.sort_by { |t| t.name }
+        pod_entries = pod_entries.uniq.sort_by { |t| t.name }
+
+        prebuild_entries.each do |pod|
+          target_s += "#{child_indentation}#{pod.prebuilt_entry(false, false)}\n"
+        end
+        pod_entries.each do |pod|
+          target_s += "#{child_indentation}#{pod.entry(true, false)}\n"
+        end
+
+        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")
+        end
+
+        target_s += "#{indentation}end\n"
+      end
+    end
+  end
+end
+
+module Pod
+  class Podfile
+    def pb_to_s(all_buildable_items)
+      initial_targets = root_target_definitions.first.children
+      
+      platform = @current_target_definition.platform
+      
+      podfile_s = "platform :#{platform.to_sym}, '#{platform.deployment_target.to_s}'\n\n"
+      podfile_s += initial_targets.map { |t| t.pb_to_s(all_buildable_items) }.join("\n\n")
+
+      return podfile_s
+    end
+  end
+end
+
+class PodfileCP
+  def self.podfile_path_transform(path)
+    prebuilt_prefix = PodBuilder::prebuiltpath.gsub(PodBuilder::project_path, "")[1..] + "/"
+    if path.start_with?(prebuilt_prefix)
+      return path
+    else
+      return PodBuilder::Podfile.podfile_path_transform(path)
+    end
+  end
+end

data/lib/pod_builder/podfile_item.rb

@@ -1,3 +1,6 @@
+# This class is the model that PodBuilder uses for every pod spec. The model is instantiated
+# from Pod::Specification
+
 module PodBuilder
   class PodfileItem
     # @return [String] The git repo
@@ -36,6 +39,10 @@ module PodBuilder
     #
     attr_accessor :path
 
+    # @return [String] Local podspec path, if any
+    #
+    attr_accessor :podspec_path
+
     # @return [String] The pinned commit of the pod, if any
     #
     attr_reader :commit
@@ -56,7 +63,7 @@ module PodBuilder
     #
     attr_reader :external_dependency_names
     
-    # @return [Bool] True if the pod is shipped as a static framework
+    # @return [Bool] True if the pod is shipped as a static binary
     #
     attr_reader :is_static
     
@@ -139,6 +146,7 @@ module PodBuilder
         @tag = checkout_options[opts_key][:tag]
         @commit = checkout_options[opts_key][:commit]
         @path = checkout_options[opts_key][:path]
+        @podspec_path = checkout_options[opts_key][:podspec]
         @branch = checkout_options[opts_key][:branch]
         @is_external = true
       else
@@ -272,7 +280,7 @@ module PodBuilder
 
       root_names = deps.map(&:root_name).uniq
 
-      # We need to build all other common subspecs to properly build the framework
+      # We need to build all other common subspecs to properly build the item
       # Ex. 
       # PodA depends on DepA/subspec1
       # PodB depends on DepA/subspec2
@@ -309,7 +317,7 @@ module PodBuilder
       if !no_sources && !only_headers
         return false
       else
-        return embedded_as_static_lib || embedded_as_vendored
+        return (no_sources || only_headers || embedded_as_static_lib || embedded_as_vendored)
       end
     end
 
@@ -337,6 +345,8 @@ module PodBuilder
       if is_external
         if @path
           e += ", :path => '#{@path}'"  
+        elsif @podspec_path
+          e += ", :podspec => '#{@podspec_path}'"  
         else
           if @repo
             e += ", :git => '#{@repo}'"  
@@ -356,10 +366,9 @@ module PodBuilder
       end
 
       if include_pb_entry && !is_prebuilt
-        plists = Dir.glob(PodBuilder::prebuiltpath("**/#{module_name}.framework/#{Configuration::framework_plist_filename}"))
-        if plists.count > 0
-          plist = CFPropertyList::List.new(:file => plists.first)
-          data = CFPropertyList.native_types(plist.value)
+        prebuilt_info_path = PodBuilder::prebuiltpath("#{root_name}/#{Configuration::prebuilt_info_filename}")
+        if File.exist?(prebuilt_info_path)
+          data = JSON.parse(File.read(prebuilt_info_path))
           swift_version = data["swift_version"]
           is_static = data["is_static"] || false
         
@@ -387,18 +396,22 @@ module PodBuilder
       end
     end
 
-    def prebuilt_entry(include_pb_entry = true, absolute_path = false)
+    def prebuilt_podspec_path(absolute_path = true)
+      podspec_path = PodBuilder::prebuiltpath("#{@root_name}/#{@root_name}.podspec")
       if absolute_path 
-        pod_path = PodBuilder::prebuiltpath
+        return podspec_path
       else
-        pod_path = Pathname.new(Configuration.base_path).relative_path_from(Pathname.new(PodBuilder::project_path)).to_s
-        pod_path += "/Rome"
+        pod_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::basepath)).to_s
       end
+    end
+
+    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 => '#{pod_path}'"
+        entry = "pod '#{podspec_name}', :path => '#{podspec_dirname}'"
       else
-        entry = "pod '#{name}', :path => '#{pod_path}'"
+        entry = "pod '#{name}', :path => '#{podspec_dirname}'"
       end
 
       if include_pb_entry && !is_prebuilt
@@ -425,9 +438,9 @@ module PodBuilder
     end
 
     def vendored_framework_path
-      if File.exist?(PodBuilder::prebuiltpath(vendored_subspec_framework_name))
+      if File.exist?(PodBuilder::prebuiltpath("#{root_name}/#{vendored_subspec_framework_name}"))
         return vendored_subspec_framework_name
-      elsif File.exist?(PodBuilder::prebuiltpath(vendored_spec_framework_name))
+      elsif File.exist?(PodBuilder::prebuiltpath("#{root_name}/#{vendored_spec_framework_name}"))
         return vendored_spec_framework_name
       end
       
@@ -481,18 +494,26 @@ module PodBuilder
     end
 
     def source_files_from_string(source)
+      # Transform source file entries 
+      # "Networking{Response,Request}*.{h,m}" -> ["NetworkingResponse*.h", "NetworkingResponse*.m", "NetworkingRequest*.h", "NetworkingRequest*.m"]
       files = []
       if source.is_a? String 
-        matches = source.match(/(.*)({(.),?(.)?})/)
-        if matches&.size == 5
-          source = matches[1] + matches[3]
-          if matches[4].length > 0
-            source += "," + matches[1] + matches[4]
+        matches = source.match(/(.*){(.*)}(.*)/)
+        if matches&.size == 4
+          res = matches[2].split(",").map { |t| "#{matches[1]}#{t}#{matches[3]}" }
+          if res.any? { |t| t.include?("{") }
+            return res.map { |t| source_files_from_string(t) }.flatten
           end
+  
+          return res
         end
 
         return source.split(",")
       else
+        if source.any? { |t| t.include?("{") }
+          return source.map { |t| source_files_from_string(t) }.flatten
+        end
+
         return source
       end
     end

data/lib/pod_builder/podspec.rb

@@ -1,3 +1,6 @@
+# This file contains the logic that generates the .podspec files that are placed
+# along to the prebuild frameworks under PodBuilder/Prebuilt
+
 module PodBuilder
   class Podspec
     def self.generate(all_buildable_items, analyzer)  
@@ -10,10 +13,6 @@ module PodBuilder
       platform = analyzer.instance_variable_get("@result").targets.first.platform
       generate_podspec_from(all_buildable_items, platform)
     end
-
-    def self.include?(pod_name)
-      return File.exist?(PodBuilder::prebuiltpath("#{pod_name}.podspec"))
-    end
     
     private
 
@@ -26,25 +25,26 @@ module PodBuilder
       spec_var = "p#{slash_count}"
 
       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"]
-        existing_vendored_frameworks = vendored_frameworks.select { |t| File.exist?(PodBuilder::prebuiltpath(t) || "") }
-        existing_vendored_frameworks_basename = vendored_frameworks.map { |t| File.basename(t) }.select { |t| File.exist?(PodBuilder::prebuiltpath(t) || "") }
+        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 { |t| File.exist?(PodBuilder::prebuiltpath(t) || "") }
-        existing_vendored_libraries_basename = vendored_libraries.map { |t| File.basename("#{item.module_name}/#{t}") }.select { |t| File.exist?(PodBuilder::prebuiltpath(t) || "") }
-        vendored_libraries = (existing_vendored_libraries + existing_vendored_libraries_basename).uniq
+        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.select! { |t| !t.end_with?(".a") }
+        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
-        exclude_files += frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/#{Configuration.framework_plist_filename}" }.compact.flatten.uniq.sort
           
         if vendored_frameworks.count > 0
           podspec += "#{indentation}#{spec_var}.vendored_frameworks = '#{vendored_frameworks.uniq.sort.join("','")}'\n"
@@ -131,17 +131,25 @@ module PodBuilder
     end
 
     def self.generate_podspec_from(all_buildable_items, platform)
-      specs = Dir.glob(PodBuilder::prebuiltpath("*.podspec"))
-      specs.each do |s| 
-        FileUtils.rm(s)
+      prebuilt_podspec_path = all_buildable_items.map(&:prebuilt_podspec_path)
+      prebuilt_podspec_path.each do |path|
+        if File.exist?(path)
+          FileUtils.rm(path)
+        end
       end
 
       all_buildable_items.each do |item|  
+        if item.is_prebuilt
+          next
+        end
         if item.name != item.root_name
           if all_buildable_items.map(&:name).include?(item.root_name)
             next # will process root spec, skip subspecs
           end
         end
+        if File.exist?(item.prebuilt_podspec_path)
+          next # skip if podspec was already generated
+        end
 
         podspec = "Pod::Spec.new do |p1|\n"
 
@@ -165,8 +173,17 @@ module PodBuilder
         podspec += main_keys
         podspec += "end"
 
-        spec_path = PodBuilder::prebuiltpath("#{item.root_name}.podspec")
-        File.write(spec_path, podspec)
+        spec_path = item.prebuilt_podspec_path
+        if File.directory?(File.dirname(spec_path))
+          File.write(spec_path, podspec)
+        else
+          message = "Prebuilt podspec destination not found for #{File.basename(spec_path)}".red
+          if ENV['DEBUGGING']
+            puts message
+          else
+            raise message
+          end
+        end
       end
     end
   end

data/lib/pod_builder/rome/post_install.rb

@@ -1,28 +1,38 @@
+# TODO: Add support when building without use_frameworks!
+
 require 'fourflusher'
 require 'colored'
 
 module PodBuilder
-  def self.build_for_iosish_platform(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
-    raise "Apple silicon hardware still unsupported since it requires to migrate to xcframeworks" if build_for_apple_silicon
-
+  def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
+    raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
+    
+    dsym_device_folder = File.join(build_dir, "dSYM", device)
+    dsym_simulator_folder = File.join(build_dir, "dSYM", simulator)
+    FileUtils.mkdir_p(dsym_device_folder)
+    FileUtils.mkdir_p(dsym_simulator_folder)
+    
     deployment_target = target.platform_deployment_target
     target_label = target.cocoapods_target_label
-
+    
     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)
 
     spec_names = target.specs.map { |spec| [spec.root.name, spec.root.module_name] }.uniq
     spec_names.each do |root_name, module_name|
-      executable_path = "#{build_dir}/#{root_name}"
-      device_lib = "#{build_dir}/#{configuration}-#{device}/#{root_name}/#{module_name}.framework/#{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_lib = "#{build_dir}/#{configuration}-#{simulator}/#{root_name}/#{module_name}.framework/#{module_name}"
+      
+      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
@@ -32,63 +42,229 @@ module PodBuilder
       #
       # 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}`
+        `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)
+      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.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, build_for_apple_silicon)
+    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
+
+    excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
+    xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs)
+    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
 
-      lipo_log = `xcrun lipo -create -output #{executable_path} #{device_lib} #{simulator_lib}`
-      puts lipo_log unless File.exist?(executable_path)
+    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"
+  
+      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
-}        
+          #if TARGET_OS_SIMULATOR
+          #{simulator_content}
+          #else
+          #{device_content}
+          #endif
+        }        
         File.write(device_swift_header_path, merged_content)
       end
 
-      FileUtils.mv executable_path, device_lib, :force => true
-      FileUtils.mv device_framework_lib, build_dir, :force => true
-      FileUtils.rm simulator_lib if File.file?(simulator_lib)
-      FileUtils.rm device_lib if File.file?(device_lib)
+
+    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}`
+      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)
+      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.xcodebuild(sandbox, target, sdk='macosx', deployment_target=nil, configuration, deterministic_build, exclude_archs)
     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]
       args += Fourflusher::SimControl.new.destination(:oldest, platform, deployment_target) unless platform.nil?
     end
-
+    
     xcodebuild_version = `xcodebuild -version | head -n1 | awk '{print $2}'`.strip().to_f
     if exclude_archs.count > 0 && xcodebuild_version >= 12.0
       args += ["EXCLUDED_ARCHS=#{exclude_archs.join(" ")}"]
     end
-
+    
     environmental_variables = {}
     if deterministic_build
       environmental_variables["ZERO_AR_DATE"] = "1"
     end
-
+    
     execute_command 'xcodebuild', args, true, environmental_variables
   end
-
+  
   # Copy paste implementation from CocoaPods internals to be able to call poopen3 passing environmental variables
   def self.execute_command(executable, command, raise_on_failure = true, environmental_variables = {})
     bin = Pod::Executable.which!(executable)
-
+    
     command = command.map(&:to_s)
     full_command = "#{bin} #{command.join(' ')}"
-
+    
     stdout = Pod::Executable::Indenter.new
     stderr = Pod::Executable::Indenter.new
-
+    
     status = popen3(bin, command, stdout, stderr, environmental_variables)
     stdout = stdout.join
     stderr = stderr.join
@@ -100,27 +276,27 @@ module PodBuilder
         UI.message("[!] Failed: #{full_command}".red)
       end
     end
-
+    
     output
   end
-
+  
   def self.popen3(bin, command, stdout, stderr, environmental_variables)
     require 'open3'
     Open3.popen3(environmental_variables, bin, *command) do |i, o, e, t|
       Pod::Executable::reader(o, stdout)
       Pod::Executable::reader(e, stderr)
       i.close
-
+      
       status = t.value
-
+      
       o.flush
       e.flush
       sleep(0.01)
-
+      
       status
     end
   end
-
+  
   def self.enable_debug_information(project_path, configuration)
     project = Xcodeproj::Project.open(project_path)
     project.targets.each do |target|
@@ -131,118 +307,97 @@ module PodBuilder
     project.save
   end
 
-  def self.copy_dsym_files(dsym_destination, configuration)
-    dsym_destination.rmtree if dsym_destination.directory?
-
-    platforms = Configuration.supported_platforms
-    platforms.each do |platform|
-      dsym = Pathname.glob("build/#{configuration}-#{platform}/**/*.dSYM")
-      dsym.each do |dsym|
-        destination = dsym_destination + platform
-        FileUtils.mkdir_p destination
-        FileUtils.cp_r dsym, destination, :remove_destination => true
-      end
-    end
-  end
+  
 end
 
 Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_context, user_options|
   enable_dsym = user_options.fetch('dsym', true)
   configuration = user_options.fetch('configuration', 'Debug')
+  uses_frameworks = user_options.fetch('uses_frameworks', true)
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
-
+  
   sandbox_root = Pathname(installer_context.sandbox_root)
   sandbox = Pod::Sandbox.new(sandbox_root)
-
+  
   PodBuilder::enable_debug_information(sandbox.project_path, configuration)
-
+  
   build_dir = sandbox_root.parent + 'build'
-  destination = sandbox_root.parent + 'Rome'
-
+  base_destination = sandbox_root.parent + 'Prebuilt'
+  
   build_dir.rmtree if build_dir.directory?
   targets = installer_context.umbrella_targets.select { |t| t.specs.any? }
   targets.each do |target|
-    case target.platform_name
-    when :ios then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :osx then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :tvos then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    when :watchos then PodBuilder::build_for_iosish_platform(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, PodBuilder::Configuration.build_for_apple_silicon)
-    else raise "Unknown platform '#{target.platform_name}'" end
-  end
-
-  raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
-
-  # 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/*/*/*.framework").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
-  frameworks += Pathname.glob("build/*.framework").reject { |f| f.to_s =~ /Pods[^.]+\.framework/ }
-
-  resources = []
-  
-  Pod::UI.puts "Built #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)}"
-
-  destination.rmtree if destination.directory?
-
-  installer_context.umbrella_targets.each do |umbrella|
-    umbrella.specs.each do |spec|
-      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
+    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 [: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)
+    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
+    Pod::UI.puts "Built #{built_count} #{'items'.pluralize(built_count)}, copying..."
+    
+    base_destination.rmtree if base_destination.directory?
+    
+    installer_context.umbrella_targets.each do |umbrella|
+      umbrella.specs.each do |spec|
+        root_name = spec.name.split("/").first
+        # 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/ }
+        
+        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.each do |file|
+          FileUtils.cp_r(file, destination)
+        end    
+      end
     end
-  end
-  frameworks.uniq!
-  resources.uniq!
-
-  Pod::UI.puts "Copying #{frameworks.count} #{'frameworks'.pluralize(frameworks.count)} " \
-    "to `#{destination.relative_path_from Pathname.pwd}`"
-
-  FileUtils.mkdir_p destination
-  (frameworks + resources).each do |file|
-    FileUtils.cp_r file, destination, :remove_destination => true
-  end
-
-  if enable_dsym
-    PodBuilder::copy_dsym_files(sandbox_root.parent + 'dSYM', configuration)
-  else
-    frameworks = Dir.glob(File.join(destination, "*.framework"))
-
-    dsym_base_path = sandbox_root.parent + 'dSYM'
-
-    # manually generate dSYMs
-    frameworks.each do |framework|
-      module_name = File.basename(framework, ".*")
-      is_static = `file #{File.join(framework, module_name)} | grep 'ar archive' | wc -l`.strip() != "0"
-
-      if !is_static
-        destination_dSYM = File.join(dsym_base_path, "#{module_name}.dSYM")
-        FileUtils.mkdir_p(dsym_base_path)
-
-        module_path = "#{File.join(framework, module_name)}"
-        system("xcrun dsymutil '#{module_path}' -no-swiftmodule-timestamp -o '#{destination_dSYM}' 2>/dev/null")
-        if `xcrun codesign -v #{module_path} 2>&1 | grep 'code object is not signed at all' | wc -l`.strip() == "1"
-          system("xcrun strip -x -S '#{module_path}'")
-        else
-          # Running strip on codesigned binaries triggers the following warning:
-          # 'strip: changes being made to the file will invalidate the code signature in: path to binary'          
-          puts "#{module_name} appears to be codesigned, skipping stripping.".blue
+    
+    # Depending on the resource it may happen that it is present twice, both in the .framework and in the parent folder
+    Dir.glob("#{base_destination}/*") do |path|
+      unless File.directory?(path)
+        return
+      end
+      
+      files = Dir.glob("#{path}/*")
+      framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
+      
+      files.each do |file|
+        filename = File.basename(file.gsub(/\.xib$/, ".nib"))
+        if framework_files.include?(filename)
+          FileUtils.rm_rf(file)
         end
-
-        # Sanity check
-        binary_uuid = `xcrun dwarfdump --uuid '#{module_path}' | cut -d" " -f2`
-        dsym_uuid = `xcrun dwarfdump --uuid '#{File.join(destination_dSYM, "Contents", "Resources", "DWARF", module_name)}' | cut -d" " -f2`
-
-        raise "dSYM sanity check failed for '#{framework}', UUID do not match!" unless binary_uuid == dsym_uuid
       end
     end
+    
+    if enable_dsym
+      FileUtils.mv("#{build_dir}/dSYM", sandbox_root.parent)
+    else
+      raise "Not implemented"
+    end
+    
+    build_dir.rmtree if build_dir.directory?
+    
+    if user_options["post_compile"]
+      user_options["post_compile"].call(installer_context)
+    end
   end
-
-  build_dir.rmtree if build_dir.directory?
-
-  if user_options["post_compile"]
-    user_options["post_compile"].call(installer_context)
-  end
-end
+