pod-builder 2.0.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ae604ccd8e9725dda21d10a5ef0c590ae862e4a099474dfe4c799c92ccba47
-  data.tar.gz: a040c4aca25a30495d6f20f35c2de28c7d95cde27c85403f9ab64bab6e30419b
+  metadata.gz: 9bb2a7642ff281371f45e15c62966fd461fc47d79c573d553926e8ac37327b34
+  data.tar.gz: b4ea4ef42a12bdeb1b23a4824c07ecdf7f24d459e2c4ed00a39e3ab664961214
 SHA512:
-  metadata.gz: 45207cae794c65336e5c67654b5a1fcc787b9a2c6cb861e67d5645f00769c53bc2d0d8e7ae930e53ae00e0fa3558dc95969e080a61341a5101d737dc93749ba3
-  data.tar.gz: 3ea8460b857509577001fb25bf1e8721f28de773988c8dbbbd445e72c9006c430e20f4476fc25e6a1a712f27eaf16b4d5625c9271530684a96678b122ef8a554
+  metadata.gz: 2b686f329d928e794cf6809eb6c51078692e6e9fdf8f522e345c6bedfc8a1f68fa883613c0e86f7faf202246eb278478a194c60155916996edf24c2b5d3619e2
+  data.tar.gz: 0df40657505a0d8fc5af1319d695929a883ba304acb79ece94caeaaebe454a7285f183f9a2fa9284915a315e1756f077b35f689d73f7b09aa1843b5c602594f8

data/README.md

@@ -280,9 +280,13 @@ Like `build_settings` but per pod. Pod name can also refer to subspec.
 
 Specify which build system to use to compile frameworks. Either `Legacy` (standard build system) or `Latest` (new build system). Default value: `Latest`.
 
+#### `build_xcframeworks`
+
+Specify if PodBuilder will build .xcframeworks. Will enable `library_evolution_support`. Default value: false
+
 #### `library_evolution_support`
 
-Specify if Swift frameworks should be compiled with library evolution support (BUILD_LIBRARY_FOR_DISTRIBUTION).
+Specify if Swift frameworks should be compiled with library evolution support (BUILD_LIBRARY_FOR_DISTRIBUTION). Default value: false
 
 #### `license_filename`
 
@@ -310,10 +314,6 @@ PodBuilder writes a plist and markdown license files of pods specified in the Po
 
 If you use bundler to pin the version of CocoaPods in your project set this to true. Default false.
 
-#### `build_for_apple_silicon`
-
-If set to true built frameworks will include iPhone simulator slices for Apple silicon based hardware. Default false.
-
 
 # Behind the scenes
 

data/lib/pod_builder/analyze.rb

@@ -52,28 +52,8 @@ module PodBuilder
       all_specs = analysis_result.specifications
       
       supported_platforms = analyzer.instance_variable_get("@result").targets.map { |t| t.platform.safe_string_name.downcase }
-      all_podfile_items = all_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options, supported_platforms) }
-
-      names = analyzer.explicit_pods().map(&:name)
-
-      podfile_pods = []
-      last_count = -1 
-      while podfile_pods.count != last_count do
-        last_count = podfile_pods.count
-
-        updated_names = []
-        names.each do |name|
-          if pod = all_podfile_items.detect { |t| t.name == name }
-            podfile_pods.push(pod)
-            updated_names += pod.dependency_names
-          end
-        end
-        
-        names = updated_names.uniq
-        podfile_pods.uniq!
-      end
-
-      return podfile_pods.sort_by(&:name)
+      
+      return all_specs.map { |spec| PodfileItem.new(spec, all_specs, checkout_options, supported_platforms) }.sort_by(&:name)
     end
   end
 end

data/lib/pod_builder/command/build.rb

@@ -60,10 +60,6 @@ module PodBuilder
 
         check_not_building_development_pods(pods_to_build)
 
-        # Remove dependencies from pods to build
-        all_dependencies_name = pods_to_build.map(&:dependency_names).flatten.uniq
-        pods_to_build.select! { |x| !all_dependencies_name.include?(x.name) }
-
         pods_to_build_debug = pods_to_build.select { |x| x.build_configuration == "debug" }
         pods_to_build_release = pods_to_build - pods_to_build_debug
 
@@ -83,16 +79,17 @@ module PodBuilder
           end  
         end
         
+        build_catalyst = should_build_catalyst(installer)
+
         install_result = InstallResult.new
         podfiles_items.reject { |x| x.empty? }.each do |podfile_items|
           build_configuration = podfile_items.map(&:build_configuration).uniq.first
           
           podfile_items = podfile_items.map { |t| t.recursive_dependencies(all_buildable_items) }.flatten.uniq
-          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks)
+          podfile_content = Podfile.from_podfile_items(podfile_items, analyzer, build_configuration, install_using_frameworks, build_catalyst, Configuration.build_xcframeworks)
           
           install_result += Install.podfile(podfile_content, podfile_items, podfile_items.first.build_configuration)          
           
-          # remove lockfile which gets unexplicably created
           FileUtils.rm_f(PodBuilder::basepath("Podfile.lock"))
         end
 
@@ -128,6 +125,15 @@ module PodBuilder
 
       private
 
+      def self.should_build_catalyst(installer)
+        build_settings = installer.analysis_result.targets.map { |t| t.user_project.root_object.targets.map { |u| u.build_configuration_list.build_configurations.map { |v| v.build_settings } } }.flatten
+        build_catalyst = build_settings.detect { |t| t["SUPPORTS_MACCATALYST"] == "YES" } != nil 
+        
+        puts "\nTo support Catalyst you should enable 'build_xcframeworks' in PodBuilder.json\n".red if build_catalyst && !Configuration.build_xcframeworks
+
+        return build_catalyst
+      end
+
       def self.prepare_defines_modules_override(all_buildable_items)
         all_buildable_items.each do |item|
           unless item.defines_module.nil?
@@ -187,10 +193,10 @@ module PodBuilder
         lines = File.read(PodBuilder::project_path("Podfile")).split("\n")
         stripped_lines = lines.map { |x| Podfile.strip_line(x) }.select { |x| !x.start_with?("#")}
 
-        expected_stripped = Podfile::POST_INSTALL_ACTIONS.map { |x| Podfile.strip_line(x) }
+        expected_stripped = Podfile::PRE_INSTALL_ACTIONS.map { |x| Podfile.strip_line(x) }
 
         if !expected_stripped.all? { |x| stripped_lines.include?(x) }
-          warn_message = "PodBuilder's post install actions missing from application Podfile!\n"
+          warn_message = "PodBuilder's pre install actions missing from application Podfile!\n"
           if OPTIONS[:allow_warnings]
             puts "\n\n#{warn_message}".yellow
           else

data/lib/pod_builder/command/generate_lldbinit.rb

@@ -9,142 +9,119 @@ module PodBuilder
         if Configuration.build_using_repo_paths
           raise "\n\nlldb shenanigans not supported when 'build_using_repo_paths' is enabled".red
         end
-
+        
         arguments = ARGV.dup
-
+        
         if arguments.count > 0
           source_path = arguments[0]
           if !is_absolute_path(source_path)
             source_path = PodBuilder::basepath(source_path)
           end
           source_path = File.expand_path(source_path)  
-
+          
           raise "\n\nSpecified path does not exists" unless File.directory?(source_path)
         end
-
+        
         base_path = PodBuilder::basepath
-            
         app_podfile_content = File.read(PodBuilder::project_path("Podfile"))
-        podfile_hash = Digest::MD5.hexdigest(app_podfile_content)
-
+        
         lldbinit_path = File.expand_path(PodBuilder::basepath(Configuration.lldbinit_name))
-        lldbinit_content = File.exist?(lldbinit_path) ? File.read(lldbinit_path) : ""
-
-        if lldbinit_content.include?("# <pb_md5:#{base_path}:#{podfile_hash}")
-          puts "\n\n🎉 already in sync!\n".green
-          return 0
-        end
-
+        
         puts "Extracting debug information".yellow
 
-        unless source_path.nil?
-          podspec_paths = Dir.glob("#{source_path}/**/*.podspec") + Dir.glob("#{source_path}/**/*.podspec.json")
-          podspec_contents = podspec_paths.map { |t| File.read(t).gsub(/\s+/, "").gsub("\"", "'") }
-        end
-
-        source_map_lines = []
-        Dir.glob("#{PodBuilder::prebuiltpath}/**/#{Configuration.prebuilt_info_filename}").each do |path|
-          data = JSON.parse(File.read(path))
-          next if data.fetch("is_prebuilt", true)
+        FileUtils.mkdir_p(Configuration.build_path)
+        compilation_base_path = Pathname.new(Configuration.build_path).realpath.to_s
+                
+        pods_mappings = Hash.new
 
-          # It would be much nicer if PodBuilder.json already contained this info in a custom key
-          pod_name_matches = data["entry"].match(/pod '(.*?)'/)
-          next unless pod_name_matches&.size == 2
+        app_podfile_content.each_line do |line|
+          unless (name_match = line.match(/^\s*pod ['|"](.*?)['|"](.*)/)) && name_match.size == 3
+            next
+          end
           
-          podspec_name = pod_name_matches[1]
-          podspec_path = "#{File.dirname(path)}/#{podspec_name}.podspec"
+          pod_name = name_match[1].split("/").first
           
-          next unless File.exist?(podspec_path)
+          source = nil
+          destination = PodBuilder::basepath # puts some existing path, see lldbinit_content.reverse! comment
+          if (path_match = line.match(/:path\s?=>\s?['|"](.*?)['|"]/)) && path_match.size == 2
+            pod_path = path_match[1]
+            if !is_absolute_path(pod_path)
+              pod_path = File.expand_path("#{base_path}/#{pod_path}")              
+            end
 
-          build_source_path_matches = data["entry"].match(/:path => '(.*?)'/)
-          if build_source_path_matches&.size == 2
-            build_source_path = build_source_path_matches[1]
-            
-            if !is_absolute_path(build_source_path[0])
-              build_source_path = PodBuilder::basepath(build_source_path)
+            is_prebuilt = pod_path.start_with?(PodBuilder::prebuiltpath(pod_name))
+            if is_prebuilt
+              source = "#{compilation_base_path}/Pods/#{pod_name}"
+              destination = PodBuilder::prebuiltpath(pod_name)
+
+              info_path = "#{pod_path}/#{Configuration.prebuilt_info_filename}"
+              next unless File.exists?(info_path)
+              data = JSON.parse(File.read(info_path))
+
+              build_source_path_matches = data["entry"].match(/:path => '(.*?)'/)
+              if build_source_path_matches&.size == 2
+                build_source_path = build_source_path_matches[1]
+                if !is_absolute_path(build_source_path)
+                  build_source_path = PodBuilder::basepath(build_source_path)
+                end
+                destination = File.expand_path(build_source_path)  
+              end
+            elsif File.directory?(pod_path)
+              source = pod_path
+              destination = pod_path
             end
-            build_source_path = File.expand_path(build_source_path)  
-          elsif source_path.nil?
-            next
           else
-            # Find source code for podspec_name
-            podspec_path = find_podspec_path_for(podspec_name, podspec_paths, podspec_contents)
-            next if podspec_path.nil?
+            pod_path = PodBuilder::project_path("Pods/#{pod_name}")
+            if File.directory?(pod_path)
+              source = pod_path
+              destination = pod_path
+            end            
           end
-          
-          original_compile_path = data["original_compile_path"] + "/Pods/#{podspec_name}"
-          if is_prebuilt_pod(podspec_path, app_podfile_content)
-            unless source_map_lines.include?("settings append target.source-map '#{original_compile_path}'")
-              source_map_lines.push("# <pb:#{base_path}>\n", "settings append target.source-map '#{original_compile_path}' '#{build_source_path}'\n")
-            end
+
+          if !source.nil? && File.directory?(destination)
+            pods_mappings[source] = destination
           end
         end
 
-        rewrite_lldinit(lldbinit_path, source_map_lines, base_path, podfile_hash)
+        prebuilt_source_map_entries = []
+        other_source_map_entries = []
+        pods_mappings.each do |source, destination| 
+          if source.include?(compilation_base_path)         
+            prebuilt_source_map_entries.push("settings append target.source-map '#{source}/' '#{destination}/'")
+          else
+            other_source_map_entries.push("settings append target.source-map '#{source}/' '#{destination}/'")
+          end
+        end
+
+        # There is a bug/unexpected behavior related to the target.source-map command
+        #
+        # If I have debug symbols for the following files:
+        # /tmp/pod_builder/Pods/SomeName/... which are now under /new/path/SomeName/
+        # /tmp/pod_builder/Pods/SomeNameCommon/... which are now under /new/path/SomeNameCommon/
+        #
+        # adding a remap as follows
+        # settings append '/tmp/pod_builder/Pods/SomeName/' '/new/path/SomeName/'
+        #
+        # causes breakpoints added to files under /new/path/SomeNameCommon/ to be incorrectly added to
+        # /tmp/pod_builder/Pods/SomeName/Common/Somefile
+        # 
+        # LLDB evaluates remap in order so to workaround this issue we have to add a remap of
+        # /tmp/pod_builder/Pods/SomeNameCommon/ before remapping /tmp/pod_builder/Pods/SomeName/
+        # even if the remap isn't needed!
+        lldbinit_content = other_source_map_entries.sort.reverse + prebuilt_source_map_entries.sort.reverse
+
+        lldbinit_content.insert(0, "settings clear target.source-map\n")
+
+        File.write(lldbinit_path, lldbinit_content.join("\n"))
         
         puts "\n\n🎉 done!\n".green
         return 0
       end
-
+      
       private 
-
-      def self.is_absolute_path(path)
-        return ["~", "/"].any? { |t| t.start_with?(t) }
-      end
-
-      def self.is_prebuilt_pod(podspec_path, app_podfile_content)
-        development_path = Pathname.new(podspec_path).relative_path_from(Pathname.new(PodBuilder::project_path)).parent.to_s
-
-        return app_podfile_content.include?(":path => '#{development_path}'")
-      end
-
-      def self.rewrite_lldinit(lldbinit_path, source_map_lines, base_path, podfile_hash)
-        puts "Writing #{lldbinit_path}".yellow
-
-        FileUtils.touch(lldbinit_path)
-        raise "\n\nDestination file should be a file".red unless File.exist?(lldbinit_path)
-
-        lldbinit_lines = []
-        skipNext = false
-        File.read(lldbinit_path).each_line do |line|
-          if line.include?("# <pb:#{base_path}>") || line.include?("# <pb>")
-            skipNext = true
-            next
-          elsif skipNext
-            skipNext = false
-            next
-          elsif line != "\n"
-            if line.include?("settings set target.source-map")
-              raise "\n\n#{lldbinit_destination_path} already includes a manual `settings set target.source-map`. This is unsupported and you'll have to manually remove that entry\n".red
-            end
-            lldbinit_lines.push(line)
-          end
-        end
-
-        source_map_lines.insert(0, "# <pb>\n")
-        source_map_lines.insert(1, "settings clear target.source-map\n")
-        source_map_lines.insert(2, "# <pb:#{base_path}>\n")
-        source_map_lines.insert(3, "# <pb_md5:#{base_path}:#{podfile_hash}>\n")
-
-        lldbinit_lines += source_map_lines
       
-        File.write(lldbinit_path, lldbinit_lines.join())
-      end
-
-      def self.find_podspec_path_for(name, podspec_paths, podspec_contents)
-        if (path = podspec_paths.detect { |t| File.basename(t, ".podspec") == name.gsub("_", "-") })
-          return path
-        elsif (path_index = podspec_contents.find_index { |t| t.include?(".module_name='#{name}'") })
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?(".name='#{name}") }) # kind of optimistic,, but a last resort
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?("'module_name':'#{name}'") }) # [json podspec]
-          return podspec_paths[path_index]
-        elsif (path_index = podspec_contents.find_index { |t| t.include?("'name':'#{name}") }) # [json podspec] kind of optimistic,, but a last resort
-          return podspec_paths[path_index]
-        else
-          return nil
-        end
+      def self.is_absolute_path(path)
+        return ["~", "/"].any? { |t| path.start_with?(t) }
       end
     end
   end

data/lib/pod_builder/configuration.rb

@@ -45,8 +45,8 @@ module PodBuilder
     DEFAULT_BUILD_SYSTEM = "Latest".freeze # either Latest (New build system) or Legacy (Standard build system)
     DEFAULT_LIBRARY_EVOLUTION_SUPPORT = false
     DEFAULT_PLATFORMS = ["iphoneos", "iphonesimulator", "appletvos", "appletvsimulator"].freeze
-    DEFAULT_BUILD_FOR_APPLE_SILICON = false
     DEFAULT_BUILD_USING_REPO_PATHS = false
+    DEFAULT_BUILD_XCFRAMEWORKS = false
     
     private_constant :DEFAULT_BUILD_SETTINGS
     private_constant :DEFAULT_BUILD_SETTINGS_OVERRIDES
@@ -78,10 +78,10 @@ module PodBuilder
       attr_accessor :use_bundler
       attr_accessor :deterministic_build
       attr_accessor :supported_platforms
-      attr_accessor :build_for_apple_silicon
       attr_accessor :build_using_repo_paths
       attr_accessor :react_native_project
       attr_accessor :lldbinit_name
+      attr_accessor :build_xcframeworks
     end
     
     @allow_building_development_pods = false
@@ -111,9 +111,10 @@ module PodBuilder
     @deterministic_build = false
 
     @supported_platforms = DEFAULT_PLATFORMS
-    @build_for_apple_silicon = DEFAULT_BUILD_FOR_APPLE_SILICON
     @build_using_repo_paths = DEFAULT_BUILD_USING_REPO_PATHS
     @react_native_project = false
+
+    @build_xcframeworks = DEFAULT_BUILD_XCFRAMEWORKS
     
     def self.check_inited
       raise "\n\nNot inited, run `pod_builder init`\n".red if podbuilder_path.nil?
@@ -207,11 +208,6 @@ module PodBuilder
             Configuration.deterministic_build = value
           end
         end
-        if value = json["build_for_apple_silicon"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.build_for_apple_silicon = value
-          end
-        end
         if value = json["build_using_repo_paths"]
           if [TrueClass, FalseClass].include?(value.class)
             Configuration.build_using_repo_paths = value
@@ -222,6 +218,11 @@ module PodBuilder
             Configuration.react_native_project = value
           end
         end
+        if value = json["build_xcframeworks"]
+          if [TrueClass, FalseClass].include?(value.class)
+            Configuration.build_xcframeworks = value
+          end
+        end
         
         Configuration.build_settings.freeze
 
@@ -264,7 +265,6 @@ module PodBuilder
       config["allow_building_development_pods"] = Configuration.allow_building_development_pods
       config["use_bundler"] = Configuration.use_bundler
       config["deterministic_build"] = Configuration.deterministic_build
-      config["build_for_apple_silicon"] = Configuration.build_for_apple_silicon
       config["build_using_repo_paths"] = Configuration.build_using_repo_paths
       config["react_native_project"] = Configuration.react_native_project
       

data/lib/pod_builder/podfile.rb

@@ -2,12 +2,10 @@ require 'json'
 module PodBuilder
   class Podfile
     PODBUILDER_LOCK_ACTION = ["raise \"\\n🚨  Do not launch 'pod install' manually, use `pod_builder` instead!\\n\" if !File.exist?('pod_builder.lock')"].freeze    
-    POST_INSTALL_ACTIONS = ["require 'pod_builder/podfile/post_actions'", "PodBuilder::Podfile::pod_builder_post_process"].freeze
     
-    PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}"].freeze
-    private_constant :PRE_INSTALL_ACTIONS
+    PRE_INSTALL_ACTIONS = ["Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}", "require 'pod_builder/podfile/pre_actions_swizzles'"].freeze
 
-    def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks)
+    def self.from_podfile_items(items, analyzer, build_configuration, install_using_frameworks, build_catalyst, build_xcframeworks)
       raise "\n\nno items".red unless items.count > 0
 
       sources = analyzer.sources
@@ -19,7 +17,9 @@ module PodBuilder
 
       podfile.sub!("%%%use_frameworks%%%", install_using_frameworks ? "use_frameworks!" : "use_modular_headers!") 
       podfile.sub!("%%%uses_frameworks%%%", install_using_frameworks ? "true" : "false") 
-
+      podfile.sub!("%%%build_xcframeworks%%%", build_xcframeworks ? "true" : "false") 
+      podfile.sub!("%%%build_catalyst%%%", build_catalyst ? "true" : "false") 
+      
       podfile.sub!("%%%platform_name%%%", platform.name.to_s)
       podfile.sub!("%%%deployment_version%%%", platform.deployment_target.version)
 
@@ -41,6 +41,9 @@ module PodBuilder
         build_settings["ONLY_ACTIVE_ARCH"] = "NO"
         build_settings["DEBUG_INFORMATION_FORMAT"] = "dwarf-with-dsym"
 
+        # https://thi.imhttps://thi.im/posts/swift-serialize-debugging-options/
+        build_settings["SWIFT_SERIALIZE_DEBUGGING_OPTIONS"] = "NO"
+
         build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = platform.deployment_target.version # Fix compilation warnings on Xcode 12
 
         # Don't store .pcm info in binary, see https://forums.swift.org/t/swift-behavior-of-gmodules-and-dsyms/23211/3
@@ -61,6 +64,9 @@ module PodBuilder
         elsif Configuration.library_evolution_support
           build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
         end
+        if Configuration.build_xcframeworks
+          build_settings["BUILD_LIBRARY_FOR_DISTRIBUTION"] = "YES"
+        end
 
         build_settings["SWIFT_VERSION"] = item_build_settings["SWIFT_VERSION"] || item.swift_version || project_swift_version(analyzer)
 
@@ -229,7 +235,6 @@ module PodBuilder
       podfile_content = Podfile.update_require_entries(podfile_content, Podfile.method(:podfile_path_transform))
 
       podfile_content = add_pre_install_actions(podfile_content)
-      podfile_content = add_post_install_checks(podfile_content)
 
       project_podfile_path = PodBuilder::project_path("Podfile")
       File.write(project_podfile_path, podfile_content)
@@ -249,7 +254,6 @@ module PodBuilder
       podfile_content = Podfile.update_require_entries(podfile_content, Podfile.method(:podfile_path_transform))
 
       podfile_content = add_pre_install_actions(podfile_content)
-      podfile_content = add_post_install_checks(podfile_content)
 
       project_podfile_path = PodBuilder::project_path("Podfile")
       File.write(project_podfile_path, podfile_content)
@@ -486,10 +490,6 @@ module PodBuilder
       return add(PRE_INSTALL_ACTIONS + [" "], "pre_install", podfile_content)
     end
 
-    def self.add_post_install_checks(podfile_content)
-      return add(POST_INSTALL_ACTIONS + [" "], "post_install", podfile_content)
-    end
-
     def self.add(entries, marker, podfile_content)
       file_indentation = indentation_from_string(podfile_content)
 

data/lib/pod_builder/podfile/pre_actions_swizzles.rb

@@ -0,0 +1,84 @@
+require 'xcodeproj'
+require 'pod_builder/core'
+require 'digest'
+
+class Pod::Generator::FileList
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(paths)
+    paths.uniq!
+    swz_initialize(paths)
+  end
+end 
+
+class Pod::Generator::CopyXCFrameworksScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(xcframeworks, sandbox_root, platform)
+    xcframeworks.uniq! { |t| t.path }
+    swz_initialize(xcframeworks, sandbox_root, platform)
+  end
+end 
+
+class Pod::Generator::EmbedFrameworksScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(*args)
+    raise "Unsupported CocoaPods version" if (args.count == 0 || args.count > 2)
+    
+    frameworks_by_config = args[0]
+    frameworks_by_config.keys.each do |key|
+      items = frameworks_by_config[key]
+      items.uniq! { |t| t.source_path }
+      frameworks_by_config[key] = items
+    end
+
+    if args.count == 2
+      # CocoaPods 1.10.0 and newer
+      xcframeworks_by_config = args[1]
+      xcframeworks_by_config.keys.each do |key|
+        items = xcframeworks_by_config[key]
+        items.uniq! { |t| t.path }
+        xcframeworks_by_config[key] = items
+      end
+    end
+
+    swz_initialize(*args)
+  end
+end 
+
+class Pod::Generator::CopyResourcesScript
+  alias_method :swz_initialize, :initialize
+  
+  def initialize(resources_by_config, platform)
+    resources_by_config.keys.each do |key|
+      items = resources_by_config[key]
+      items.uniq!
+
+      colliding_resources = items.group_by { |t| File.basename(t) }.values.select { |t| t.count > 1 }
+
+      unless colliding_resources.empty?
+        message = ""
+        colliding_resources.each do |resources|
+          resources.map! { |t| File.expand_path(t.gsub("${PODS_ROOT}", "#{Dir.pwd}/Pods")) }
+          # check that files are identical. 
+          # For files with paths that are resolved (e.g containing ${PODS_ROOT}) we use the file hash
+          # we fallback to the filename for the others
+          hashes = resources.map { |t| File.exists?(t) ? Digest::MD5.hexdigest(File.read(t)) : File.basename(t) }
+          if hashes.uniq.count > 1
+            message += resources.join("\n") + "\n"
+          end
+        end
+
+        unless message.empty?
+          message = "\n\nThe following resources have the same name and will collide once copied into application bundle:\n" + message
+          raise message
+        end
+      end
+
+      resources_by_config[key] = items
+    end
+    
+    swz_initialize(resources_by_config, platform)
+  end
+end 

data/lib/pod_builder/podfile_item.rb

@@ -459,24 +459,6 @@ module PodBuilder
       return root_name == named.split("/").first
     end
 
-    def vendored_framework_path
-      if File.exist?(PodBuilder::prebuiltpath("#{root_name}/#{vendored_subspec_framework_name}"))
-        return vendored_subspec_framework_name
-      elsif File.exist?(PodBuilder::prebuiltpath("#{root_name}/#{vendored_spec_framework_name}"))
-        return vendored_spec_framework_name
-      end
-      
-      return nil
-    end
-    
-    def vendored_subspec_framework_name
-      return "#{prebuilt_rel_path}"
-    end
-    
-    def vendored_spec_framework_name
-      return "#{module_name}.framework"
-    end
-
     private
 
     def extract_vendored_frameworks(spec, all_specs)

data/lib/pod_builder/podspec.rb

@@ -32,8 +32,8 @@ module PodBuilder
         if_exists = lambda { |t| File.exist?(PodBuilder::prebuiltpath("#{item.root_name}/#{t}") || "") }
 
         vendored_frameworks = item.vendored_frameworks 
-        if item.default_subspecs.count == 0 && install_using_frameworks
-          vendored_frameworks += ["#{item.module_name}.framework"]
+        if item.default_subspecs.reject { |t| "#{item.root_name}/#{t}" == item.name }.count == 0 && install_using_frameworks
+          vendored_frameworks += ["#{item.module_name}.framework", "#{item.module_name}.xcframework"].select(&if_exists)
         end
 
         existing_vendored_frameworks = vendored_frameworks.select(&if_exists)
@@ -49,13 +49,23 @@ module PodBuilder
           # .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 }  
+          public_headers = []
+          resources = []
+          exclude_files = []
+          vendored_frameworks.each do |vendored_framework|
+            binary_path = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{vendored_framework}/**/#{File.basename(vendored_framework, ".*")}")).first
 
-          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
+            next if binary_path.nil?
 
-          exclude_files = static_frameworks.map { |x| x.vendored_framework_path.nil? ? nil : "#{x.vendored_framework_path}/Info.plist" }.compact.flatten.uniq
-          public_headers = []
+            is_static = `file '#{binary_path}'`.include?("current ar archive")
+            if is_static
+              parent_folder = File.expand_path("#{binary_path}/..")
+              rel_path = Pathname.new(parent_folder).relative_path_from(Pathname.new(PodBuilder::prebuiltpath(item.root_name))).to_s
+              
+              resources.push("#{rel_path}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}")
+              exclude_files.push("#{rel_path}/Info.plist")
+            end
+          end
         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"]
@@ -152,6 +162,10 @@ module PodBuilder
         if name == item.root_name
           deps.reject! { |t| t.split("/").first == item.root_name }
         end
+
+        deps.reject! { |t| t == item.name }
+        all_buildable_items_name = all_buildable_items.map(&:name)
+        deps.select! { |t| all_buildable_items_name.include?(t) }
   
         if deps.count > 0
           if podspec.count("\n") > 1
@@ -164,10 +178,12 @@ module PodBuilder
 
         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}/") }
-      subspec_names_groups = subspec_names.group_by { |t| name + "/" + t.gsub("#{name}/", '').split("/").first }
-      subspec_names = subspec_names_groups.keys.uniq.sort
+
+      subspec_base = name.split("/").first(slash_count).join("/")
+      subspec_items = all_buildable_items.select { |t| t.name.start_with?("#{subspec_base}/") }
+
+      subspec_names = subspec_items.map { |t| t.name.split("/").drop(slash_count).first }.uniq
+      subspec_names.map! { |t| "#{subspec_base}/#{t}" }
 
       subspec_names.each do |subspec|
         subspec_item = all_buildable_items.detect { |t| t.name == subspec } || item
@@ -201,6 +217,7 @@ module PodBuilder
         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

data/lib/pod_builder/rome/post_install.rb

@@ -3,9 +3,27 @@ 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)
-    raise "\n\nApple silicon hardware still unsupported since it requires to migrate to xcframeworks".red if build_for_apple_silicon
-    
+  class XcodeBuildSettings
+    attr_reader :platform_name
+    attr_reader :build_destination
+
+    def initialize(platform_name)
+      @platform_name = platform_name
+   
+      case platform_name
+      when "iphoneos" then @build_destination = "generic/platform=iOS"
+      when "iphonesimulator" then @build_destination = "generic/platform=iOS Simulator"
+      when "catalyst" then @build_destination = "platform=macOS,arch=x86_64,variant=Mac Catalyst"
+      when "macos" then @build_destination = "generic/platform=OS X"
+      when "tvos" then @build_destination = "generic/platform=tvOS"
+      when "tvossimulator" then @build_destination = "generic/platform=tvOS Simulator"
+      when "watchos" then @build_destination = "generic/platform=watchOS"
+      when "watchossimulator" then @build_destination = "generic/platform=watchOS Simulator"
+      else raise "\n\nUnknown platform '#{platform_name}'".red end
+    end
+  end
+
+  def self.build_for_iosish_platform_framework(sandbox, build_dir, target, device, simulator, configuration, deterministic_build)    
     dsym_device_folder = File.join(build_dir, "dSYM", device)
     dsym_simulator_folder = File.join(build_dir, "dSYM", simulator)
     FileUtils.mkdir_p(dsym_device_folder)
@@ -16,7 +34,7 @@ module PodBuilder
     
     xcodebuild(sandbox, target_label, device, deployment_target, configuration, deterministic_build, [], {})
     excluded_archs = ["i386"] # Fixes https://github.com/Subito-it/PodBuilder/issues/17
-    excluded_archs += build_for_apple_silicon ? [] : ["arm64"]
+    excluded_archs += ["arm64"] # Exclude apple silicon slice
     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
@@ -65,16 +83,14 @@ module PodBuilder
     end
   end
   
-  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
-    
+  def self.build_for_iosish_platform_lib(sandbox, build_dir, target, device, simulator, configuration, deterministic_build, prebuilt_root_paths)    
     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, [], prebuilt_root_paths)
-    excluded_archs = build_for_apple_silicon ? [] : ["arm64"]
+    excluded_archs = ["arm64"] # Exclude Apple silicon slice
     xcodebuild(sandbox, target_label, simulator, deployment_target, configuration, deterministic_build, excluded_archs, prebuilt_root_paths)
     
     spec_names.each do |root_name, module_name|
@@ -273,6 +289,8 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   if user_options["pre_compile"]
     user_options["pre_compile"].call(installer_context)
   end
+  build_catalyst = user_options.fetch('build_catalyst', false)
+  build_xcframeworks = user_options.fetch('build_xcframeworks', false)
   
   prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub('=>', ':'))
   
@@ -285,82 +303,143 @@ Pod::HooksManager.register('podbuilder-rome', :post_install) do |installer_conte
   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|
+  raise "\n\nUnsupported target count".red unless targets.count == 1
+  target = targets.first
+
+  if build_xcframeworks
+    project_path = sandbox_root.parent + 'Pods/Pods.xcodeproj'
+        
+    case target.platform_name
+    when :ios then 
+      xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("iphoneos"), PodBuilder::XcodeBuildSettings.new("iphonesimulator")]
+      if build_catalyst
+        xcodebuild_settings += [PodBuilder::XcodeBuildSettings.new("catalyst")]
+      end
+    when :osx then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("macos")]
+    when :tvos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("tvos"), PodBuilder::XcodeBuildSettings.new("tvossimulator")]
+    when :watchos then xcodebuild_settings = [PodBuilder::XcodeBuildSettings.new("watchos"), PodBuilder::XcodeBuildSettings.new("watchossimulator")]
+    else raise "\n\nUnknown platform '#{target.platform_name}'".red end
+  
+    xcodebuild_settings.each do |xcodebuild_setting|
+      puts "Building xcframeworks for #{xcodebuild_setting.platform_name}".yellow
+      raise "\n\n#{build_destination} xcframework archive failed!".red if !system("xcodebuild archive -project #{project_path.to_s} -scheme Pods-DummyTarget -destination '#{xcodebuild_setting.build_destination}' -archivePath '#{build_dir}/#{xcodebuild_setting.platform_name}' SKIP_INSTALL=NO > /dev/null 2>&1")
+    end
+
+    built_items = Dir.glob("#{build_dir}/#{xcodebuild_settings[0].platform_name}.xcarchive/Products/Library/Frameworks/*").reject { |t| File.basename(t, ".*") == "Pods_DummyTarget" }
+
+    built_items.each do |built_item|      
+      built_item_paths = [built_item]
+      xcodebuild_settings.drop(1).each do |xcodebuild_setting|
+        path = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/Products/Library/Frameworks/#{File.basename(built_item)}"
+        if File.directory?(path)
+          built_item_paths.push(path)
+        else
+          built_item_paths = []
+          break
+        end
+      end
+
+      next if built_item_paths.count == 0
+
+      framework_name = File.basename(built_item_paths.first, ".*")
+      xcframework_path = "#{base_destination}/#{framework_name}/#{framework_name}.xcframework"
+      framework_params = built_item_paths.map { |t| "-framework '#{t}'"}.join(" ")
+      raise "\n\nFailed packing xcframework!".red if !system("xcodebuild -create-xcframework #{framework_params} -output '#{xcframework_path}' > /dev/null 2>&1")      
+
+      if enable_dsym
+        xcodebuild_settings.each do |xcodebuild_setting|
+          dsym_source = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/dSYMs/"
+          if File.directory?(dsym_source)
+            destination = sandbox_root.parent + "dSYMs"
+            FileUtils.mkdir_p(destination)
+            FileUtils.mv(dsym_source, destination)
+            FileUtils.mv("#{destination}/dSYMs", "#{destination}/#{xcodebuild_setting.platform_name}")
+          end  
+        end
+      else
+        raise "Not implemented"
+      end
+    end
+
+    built_count = built_items.count
+    Pod::UI.puts "Built #{built_count} #{'item'.pluralize(built_count)}"
+  else
     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, 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)
+    when [:ios, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build)
+    when [:osx, true] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, {})
+    when [:tvos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build)
+    when [:watchos, true] then PodBuilder::build_for_iosish_platform_framework(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build)
+    when [:ios, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'iphoneos', 'iphonesimulator', configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
+    when [:osx, false] then PodBuilder::xcodebuild(sandbox, target.cocoapods_target_label, configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
+    when [:tvos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'appletvos', 'appletvsimulator', configuration, PodBuilder::Configuration.deterministic_build, prebuilt_root_paths)
+    when [:watchos, false] then PodBuilder::build_for_iosish_platform_lib(sandbox, build_dir, target, 'watchos', 'watchsimulator', configuration, PodBuilder::Configuration.deterministic_build, 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?
     
-  raise Pod::Informative, 'The build directory was not found in the expected location.' unless build_dir.directory?
-  
-  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?
+    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} #{'item'.pluralize(built_count)}, copying..."
     
-  installer_context.umbrella_targets.each do |umbrella|
-    umbrella.specs.each do |spec|
-      root_name = spec.name.split("/").first
+    base_destination.rmtree if base_destination.directory?
       
-      if uses_frameworks
-        destination = File.join(base_destination, root_name)        
-      else
-        destination = File.join(base_destination, root_name, root_name)        
+    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
+        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)
+        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    
+      end
+    end
+    
+    # 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
-      # 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
-      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)
-      files += file_accessor.vendored_libraries
-      files += file_accessor.vendored_frameworks
-      files += file_accessor.resources
+      files = Dir.glob("#{path}/*")
+      framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
       
-      FileUtils.mkdir_p(destination)        
       files.each do |file|
-        FileUtils.cp_r(file, destination)
-      end    
-    end
-  end
-  
-  # 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
+        filename = File.basename(file.gsub(/\.xib$/, ".nib"))
+        if framework_files.include?(filename)
+          FileUtils.rm_rf(file)
+        end
+      end
     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)
+    if enable_dsym
+      dsym_source = "#{build_dir}/dSYM"
+      if File.directory?(dsym_source)
+        FileUtils.mv(dsym_source, sandbox_root.parent)
       end
-    end
+    else
+      raise "Not implemented"
+    end    
   end
-  
-  if enable_dsym
-    dsym_source = "#{build_dir}/dSYM"
-    if File.directory?(dsym_source)
-      FileUtils.mv(dsym_source, sandbox_root.parent)
-    end
-  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

data/lib/pod_builder/templates/build_podfile.template

@@ -4,7 +4,7 @@ require 'cfpropertylist'
 
 %%%use_frameworks%%%
 
-plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, prebuilt_root_paths: '%%%prebuilt_root_paths%%%', pre_compile: Proc.new { |installer|
+plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, build_catalyst: %%%build_catalyst%%%, build_xcframeworks: %%%build_xcframeworks%%%, prebuilt_root_paths: '%%%prebuilt_root_paths%%%', pre_compile: Proc.new { |installer|
 
   def set_build_settings(target_name, build_configurations, installer)
     installer.pods_project.targets.each do |target|

data/lib/pod_builder/version.rb

@@ -1,4 +1,4 @@
 module PodBuilder
-  VERSION = "2.0.0"
+  VERSION = "2.3.0"
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Tomas Camin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -204,7 +204,7 @@ files:
 - lib/pod_builder/install.rb
 - lib/pod_builder/licenses.rb
 - lib/pod_builder/podfile.rb
-- lib/pod_builder/podfile/post_actions.rb
+- lib/pod_builder/podfile/pre_actions_swizzles.rb
 - lib/pod_builder/podfile_cp.rb
 - lib/pod_builder/podfile_item.rb
 - lib/pod_builder/podspec.rb

data/lib/pod_builder/podfile/post_actions.rb

@@ -1,136 +0,0 @@
-require 'xcodeproj'
-require 'pod_builder/core'
-
-module PodBuilder
-  class Podfile
-    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
-      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
-
-      puts "[PodBuilder] Checking target support resource collisions".yellow
-      target_names.each do |target|
-        check_for_colliding_resources("Pods/Target Support Files/Pods-#{target}/Pods-#{target}-resources.sh", target, targets)
-      end
-    end
-
-    private
-
-    def self.remove_duplicate_entries(path)
-      if !File.file?(path)
-        return
-      end
-      
-      # Adding the same pod to multiple targets results in duplicate entries in Pods-TARGET-frameworks.sh and Pods-TARGET-resources.sh (Cocoapods 1.4.0)
-      # To avoid conflicts during parallel codesign we manually remove duplicates
-      in_section_to_update = false
-      processed_entries = []
-      lines = []
-      File.read(path).each_line do |line|
-        stripped_line = line.strip()
-        next if stripped_line.empty?
-
-        if stripped_line.include?("if [[ \"$CONFIGURATION\" == ")
-          in_section_to_update = true
-        elsif stripped_line == "fi"
-          in_section_to_update = false
-          processed_entries = []
-        end
-        if in_section_to_update
-          if processed_entries.include?(stripped_line)
-            if !line.include?("#")
-              line = "# #{line}"
-            end
-          end
-          processed_entries.push(stripped_line)
-        end
-        
-        lines.push(line)
-      end
-      
-      File.write(path, lines.join)
-    end
-
-    def self.check_for_colliding_resources(path, target_name, targets)
-      if !File.file?(path)
-        return
-      end
-
-      if target = targets.detect { |x| x.name == target_name }
-        resource_files = target.resources_build_phase.files.map { |i| i.file_ref.real_path.to_s }.to_set
-        resource_files = resource_files.map { |i| File.basename(i) }
-        resource_files = resource_files.map { |i| i.gsub(".xib", ".nib") }
-      else
-        raise "\n\n#{target} not found!".red
-      end
-      
-      # Check that Pods-TARGET-resources.sh doesn't contain colliding entries (Cocoapods 1.4.0)
-      in_section_to_update = false
-      processed_entries = []
-      File.read(path).each_line do |line|
-        stripped_line = line.strip()
-        next if stripped_line.empty?
-        
-        if stripped_line.include?("if [[ \"$CONFIGURATION\" == ")
-          in_section_to_update = true
-          next
-        elsif stripped_line == "fi"
-          in_section_to_update = false
-          
-          processed_entries.each do |entry|
-            matches_other_framework = processed_entries.select { |t| t[0] == entry[0] }
-            
-            # Check for static framework cross-collisions
-            if matches_other_framework.count > 1
-              error = "\n\nCross-framework resource collision detected:\n"
-              error += "#{entry[0]} found in\n"
-              error += matches_other_framework.map { |x| "- #{x[1]}" }.join("\n")
-              error += "\n\n"
-              
-              raise error.red
-            end
-            
-            # Check for collisions with app's resources
-            matches_app_resources = resource_files.select { |t| t == entry[0] }
-            if matches_app_resources.count > 0
-              error = "\n\nResource collision with app file detected:\n"
-              error += "#{entry[0]} found in app but also in\n"
-              error += matches_app_resources.map { |x| "- #{x[1]}" }.join("\n")
-              error += "\n\n"
-              
-              raise error.red
-            end
-          end
-          
-          processed_entries = []
-        end
-        
-        next if stripped_line.start_with?("#") # skip commented lines
-        next if stripped_line.count("/..") > 2 # skip development pods
-        
-        line.gsub!("\"", "")
-        line.gsub!("install_resource", "")
-        line.strip!()
-        
-        if in_section_to_update
-          filename = File.basename(line)
-          processed_entries.push([filename, line])
-        end
-      end
-    end
-
-    def self.find_xcodeproj_targets      
-      project = Xcodeproj::Project.open(PodBuilder::find_xcodeproj)
-
-      return project.targets
-    end
-  end
-end