pod-builder 5.2.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a195ea19893b53adf9bffdd392dfc0c71b96448ba87f9431e91350f5aaf928a
-  data.tar.gz: 2ab6e876ef84047c0c813025eef5681643ddc64fe3a79b96e2e732732646a945
+  metadata.gz: b3a72ea218112ca2e65fa7776fdcd144b33872dcea669f77f44de27a4bcc0ddb
+  data.tar.gz: b4b6fb3bbb6ceca774af3aac562fd1fe9c3599b7f59ec371f615d09f98f5e0a6
 SHA512:
-  metadata.gz: 2a8cb5a1d34c4991308160ec49483eefa0f731b3af7894429d41580da2b20b49ca0c8513e1a9ba8ee293f67ff316f83e93b273bf57754b4107294283bc7e1499
-  data.tar.gz: 640ec2216ddf0d6e880e14589b4bed129a86203b05a291f242dd12ed1ccde4a7e7d98a68b00e3a6eb7ddc46abdf830f8f1ee450597f16d6d3c1a1732286b6e42
+  metadata.gz: 6f5785da028d2853854d6e3049845e3cd6df18c3becf6c832f2edc5984b857343bab5b66be5746bdc28fd77dc14157d445b89adb08ded514fdb771f70f4a4440
+  data.tar.gz: 6a3e25f056346d4ab41d1522ff9c90751d0c5f56f906642491e77d5ddb3dda008f81ce0193152ad670835ca162edfdd41471fdbade2aaeebec98a127c301e1f5

data/README.md

@@ -207,6 +207,8 @@ _PodBuilder.json_ allows some advanced customizations.
 
 Starting with Xcode 14 it is mandatory to sign both frameworks and framework bundles. PodBuilder will try to automatically extract the developer team from the application, however there are cases where this will fail and the development_team needs to be added explicitly in the configuration file.
 
+With Xcode 15 onwards, signing xcframeworks has become an additional mandatory step. PodBuilder will try to automatically extract your code signing identity from the project, however if it fails you'll need to explicitly add the `CODE_SIGN_IDENTITY` key to the [build settings](#build_settings).
+
 
 #### `development_language`
 

data/lib/pod_builder/command/build.rb

@@ -54,10 +54,10 @@ module PodBuilder
         argument_pods.uniq!
 
         # We need to split pods to build in 4 groups
-        # 1. pods to build in release
-        # 2. pods to build in debug
-        # 3. pods to build in release as xcframeworks
-        # 4. pods to build in debug as xcframeworks
+        # 1. pods to build in debug
+        # 2. pods to build in release
+        # 3. pods to build in debug as xcframeworks
+        # 4. pods to build in release as xcframeworks
 
         check_not_building_development_pods(pods_to_build)
 
@@ -81,9 +81,9 @@ module PodBuilder
         check_dependencies_build_configurations(all_buildable_items)
 
         # When building mixed framwork/xcframeworks pods xcframeworks should be built last
-        # so that the .xcframework overwrite the .framwork if the same pod needs to be built
+        # so that the .xcframework overwrite the .framework if the same pod needs to be built
         # in both ways.
-        # For example we might have configured to build onlt PodA as xcframework, another pod
+        # For example we might have configured to build only PodA as xcframework, another pod
         # PodB has a dependency to PodA. When Building PodB, PodA gets rebuilt as .framework
         # but then PodA gets rebuilt again as .xcframework overwriting the .framework.
         podfiles_items = [pods_to_build_debug] + [pods_to_build_release] + [pods_to_build_debug_xcframework] + [pods_to_build_release_xcframework]

data/lib/pod_builder/configuration.rb

@@ -154,140 +154,113 @@ module PodBuilder
           raise "\n\n#{File.basename(config_path)} is an invalid JSON\n".red
         end
 
-        if value = json["spec_overrides"]
-          if value.is_a?(Hash) && value.keys.count > 0
-            Configuration.spec_overrides = value
-          end
+        value = json["spec_overrides"]
+        if value.is_a?(Hash) && value.keys.count > 0
+          Configuration.spec_overrides = value
         end
-        if value = json["skip_licenses"]
-          if value.is_a?(Array)
-            Configuration.skip_licenses = value
-          end
+        value = json["skip_licenses"]
+        if value.is_a?(Array)
+          Configuration.skip_licenses = value
         end
-        if value = json["skip_pods"]
-          if value.is_a?(Array)
-            Configuration.skip_pods = value
-          end
+        value = json["skip_pods"]
+        if value.is_a?(Array)
+          Configuration.skip_pods = value
         end
-        if value = json["skip_build_configuration_check"]
-          if value.is_a?(Array)
-            Configuration.skip_build_configuration_check = value
-          end
+        value = json["skip_build_configuration_check"]
+        if value.is_a?(Array)
+          Configuration.skip_build_configuration_check = value
         end
-        if value = json["force_prebuild_pods"]
-          if value.is_a?(Array)
-            Configuration.force_prebuild_pods = value
-          end
+        value = json["force_prebuild_pods"]
+        if value.is_a?(Array)
+          Configuration.force_prebuild_pods = value
         end
-        if value = json["build_settings"]
-          if value.is_a?(Hash) && value.keys.count > 0
-            Configuration.build_settings = value
-          end
+        value = json["build_settings"]
+        if value.is_a?(Hash) && value.keys.count > 0
+          Configuration.build_settings = value
         end
-        if value = json["build_settings_overrides"]
-          if value.is_a?(Hash) && value.keys.count > 0
-            Configuration.build_settings_overrides = value
-          end
+        value = json["build_settings_overrides"]
+        if value.is_a?(Hash) && value.keys.count > 0
+          Configuration.build_settings_overrides = value
         end
-        if value = json["build_system"]
-          if value.is_a?(String) && ["Latest", "Legacy"].include?(value)
-            Configuration.build_system = value
-          end
+        value = json["build_system"]
+        if value.is_a?(String) && ["Latest", "Legacy"].include?(value)
+          Configuration.build_system = value
         end
-        if value = json["library_evolution_support"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.library_evolution_support = value
-          end
+        value = json["library_evolution_support"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.library_evolution_support = value
         end
-        if value = json["license_filename"]
-          if value.is_a?(String) && value.length > 0
-            Configuration.license_filename = value
-          end
+        value = json["license_filename"]
+        if value.is_a?(String) && value.length > 0
+          Configuration.license_filename = value
         end
-        if value = json["project_name"]
-          if value.is_a?(String) && value.length > 0
-            Configuration.project_name = value
-          end
+        value = json["project_name"]
+        if value.is_a?(String) && value.length > 0
+          Configuration.project_name = value
         end
-        if value = json["restore_enabled"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.restore_enabled = value
-          end
+        value = json["restore_enabled"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.restore_enabled = value
         end
-        if value = json["allow_building_development_pods"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.allow_building_development_pods = value
-          end
+        value = json["allow_building_development_pods"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.allow_building_development_pods = value
         end
-        if value = json["use_bundler"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.use_bundler = value
-          end
+        value = json["use_bundler"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.use_bundler = value
         end
-        if value = json["deterministic_build"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.deterministic_build = value
-          end
+        value = json["deterministic_build"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.deterministic_build = value
         end
-        if value = json["build_using_repo_paths"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.build_using_repo_paths = value
-          end
+        value = json["build_using_repo_paths"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.build_using_repo_paths = value
         end
-        if value = json["react_native_project"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.react_native_project = value
-          end
+        value = json["react_native_project"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.react_native_project = value
         end
-        if value = json["build_xcframeworks_all"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.build_xcframeworks_all = value
-          end
+        value = json["build_xcframeworks_all"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.build_xcframeworks_all = value
         end
-        if value = json["build_xcframeworks_include"]
-          if value.is_a?(Array)
-            Configuration.build_xcframeworks_include = value
-          end
+        value = json["build_xcframeworks_include"]
+        if value.is_a?(Array)
+          Configuration.build_xcframeworks_include = value
         end
-        if value = json["build_xcframeworks_exclude"]
-          if value.is_a?(Array)
-            Configuration.build_xcframeworks_exclude = value
-          end
+        value = json["build_xcframeworks_exclude"]
+        if value.is_a?(Array)
+          Configuration.build_xcframeworks_exclude = value
         end
-        if value = json["generate_coverage"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.generate_coverage = value
-          end
+        value = json["generate_coverage"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.generate_coverage = value
         end
-        if value = json["remap_coverage_to_project_root"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.remap_coverage_to_project_root = value
-          end
+        value = json["remap_coverage_to_project_root"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.remap_coverage_to_project_root = value
         end
-        if value = json["keep_swiftmodules"]
-          if [TrueClass, FalseClass].include?(value.class)
-            Configuration.keep_swiftmodules = value
-          end
+        value = json["keep_swiftmodules"]
+        if [TrueClass, FalseClass].include?(value.class)
+          Configuration.keep_swiftmodules = value
         end
-        if value = json["pre_actions"]
-          if value.is_a?(Hash)
-            Configuration.pre_actions = PodBuilder::Actions.load(value)
-          end
+        value = json["pre_actions"]
+        if value.is_a?(Hash)
+          Configuration.pre_actions = PodBuilder::Actions.load(value)
         end
-        if value = json["post_actions"]
-          if value.is_a?(Hash)
-            Configuration.post_actions = PodBuilder::Actions.load(value)
-          end
+        value = json["post_actions"]
+        if value.is_a?(Hash)
+          Configuration.post_actions = PodBuilder::Actions.load(value)
         end
-        if value = json["development_team"]
-          if value.is_a?(String) && value.length > 0
-            Configuration.development_team = value
-          end
+        value = json["development_team"]
+        if value.is_a?(String) && value.length > 0
+          Configuration.development_team = value
         end
-        if value = json["development_language"]
-          if value.is_a?(String) && value.length > 0
-            Configuration.development_language = value
-          end
+        value = json["development_language"]
+        if value.is_a?(String) && value.length > 0
+          Configuration.development_language = value
         end
         Configuration.build_settings.freeze
 

data/lib/pod_builder/install.rb

@@ -319,23 +319,6 @@ module PodBuilder
           next
         end
 
-        unless Configuration.keep_swiftmodules
-          if podfile_item = podfile_items.detect { |t| t.root_name == item.root_name }
-            if Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
-              # We can safely remove .swiftmodule if .swiftinterface exists
-              swiftmodule_files = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
-              swiftmodule_files.each { |t| PodBuilder::safe_rm_rf(t) }
-            end
-          end
-        end
-
-        # Cleanup unneeded files (see https://github.com/bazelbuild/rules_apple/pull/1113)
-        ignore_files = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/*.{swiftdoc,swiftsourceinfo,private.swiftinterface}")
-        ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
-
-        project_folder = Dir.glob("#{source_path}/**/Modules/**/*.swiftmodule/Project")
-        project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
-
         unless Dir.glob("#{source_path}/**/*").select { |t| File.file?(t) }.empty?
           destination_folder = PodBuilder::prebuiltpath(item.root_name)
           FileUtils.mkdir_p(destination_folder)

data/lib/pod_builder/podfile.rb

@@ -11,13 +11,24 @@ module PodBuilder
       development_team = Configuration::development_team
       if development_team.empty?
         project_path = "#{PodBuilder.project_path}/#{Configuration::project_name}.xcodeproj"
-        development_team = `grep -rh 'DEVELOPMENT_TEAM' '#{project_path}' | uniq`.strip
+        development_team = `grep -rh 'DEVELOPMENT_TEAM' '#{project_path}' | sort | uniq`.strip
         development_team_match = development_team.match(/DEVELOPMENT_TEAM = (.+);/)
         if development_team.split("\n").count != 1 || development_team_match&.size != 2
           raise "\n\nFailed getting 'DEVELOPMENT_TEAM' build setting, please add your development team to #{PodBuilder::basepath(Configuration.configuration_filename)} as per documentation".red
         end
         development_team = development_team_match[1]
       end
+      # Xcode 15 requires xcframeworks to be signed
+      code_sign_identity = Configuration.build_settings["CODE_SIGN_IDENTITY"] || ""
+      if code_sign_identity.empty?
+        project_path = "#{PodBuilder.project_path}/#{Configuration::project_name}.xcodeproj"
+        code_sign_identity = `grep -rh 'CODE_SIGN_IDENTITY' '#{project_path}' | grep "Apple Distribution:" | sort | uniq`.strip
+        code_sign_identity_match = code_sign_identity.match(/CODE_SIGN_IDENTITY = \"(.+)\";/)
+        if code_sign_identity.split("\n").count != 1 || code_sign_identity_match&.size != 2
+          raise "\n\nFailed getting 'CODE_SIGN_IDENTITY' build setting, please add your code sign identity to #{PodBuilder::basepath(Configuration.configuration_filename)} as per documentation".red
+        end
+        code_sign_identity = code_sign_identity_match[1]
+      end
 
       sources = analyzer.sources
 
@@ -41,6 +52,8 @@ module PodBuilder
 
       podfile.sub!("%%%development_team%%%", development_team)
 
+      podfile.sub!("%%%code_sign_identity%%%", code_sign_identity)
+
       podfile_build_settings = ""
 
       git_rootpath = PodBuilder::git_rootpath

data/lib/pod_builder/podspec.rb

@@ -3,17 +3,17 @@
 
 module PodBuilder
   class Podspec
-    def self.generate(all_buildable_items, analyzer, install_using_frameworks)  
+    def self.generate(all_buildable_items, analyzer, install_using_frameworks)
       unless all_buildable_items.count > 0
         return
       end
-      
+
       puts "Generating PodBuilder's local podspec".yellow
-                  
+
       platform = analyzer.instance_variable_get("@result").targets.first.platform
       generate_podspec_from(all_buildable_items, platform, install_using_frameworks)
     end
-    
+
     private
 
     def self.generate_spec_keys_for(item, name, all_buildable_items, install_using_frameworks)
@@ -31,7 +31,7 @@ module PodBuilder
       if item.name == name
         if_exists = lambda { |t| File.exist?(PodBuilder::prebuiltpath("#{item.root_name}/#{t}") || "") }
 
-        vendored_frameworks = item.vendored_frameworks 
+        vendored_frameworks = item.vendored_frameworks
         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
@@ -44,7 +44,7 @@ module PodBuilder
         if install_using_frameworks
           existing_vendored_libraries = vendored_libraries.map { |t| "#{item.module_name}/#{t}" }.select(&if_exists)
           existing_vendored_libraries_basename = vendored_libraries.map { |t| File.basename(t) }.select(&if_exists)
-          vendored_libraries = (existing_vendored_libraries + existing_vendored_libraries_basename).uniq        
+          vendored_libraries = (existing_vendored_libraries + existing_vendored_libraries_basename).uniq
 
           # .a are static libraries and should not be included again in the podspec to prevent duplicated symbols (in the app and in the prebuilt framework)
           vendored_libraries.reject! { |t| t.end_with?(".a") }
@@ -65,16 +65,16 @@ module PodBuilder
             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          
+        else
           public_headers = Dir.glob(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/Headers/**/*.h"))
-          vendored_libraries +=  ["#{item.root_name}/lib#{item.root_name}.a"]
+          vendored_libraries += ["#{item.root_name}/lib#{item.root_name}.a"]
           vendored_libraries = vendored_libraries.select(&if_exists)
-           
+
           resources = ["#{item.root_name}/*.{nib,bundle,xcasset,strings,png,jpg,tif,tiff,otf,ttf,ttc,plist,json,caf,wav,p12,momd}"]
 
           exclude_files = ["*.modulemap"]
@@ -84,15 +84,15 @@ module PodBuilder
           exclude_files.map! { |t| "#{item.root_name}/#{t}" }
         end
 
-        entries = lambda { |spec_key, spec_value| 
+        entries = lambda { |spec_key, spec_value|
           key = "#{indentation}#{spec_var}.#{spec_key}"
           joined_values = spec_value.map { |t| "#{t}" }.uniq.sort.join("', '")
-          "#{key} = '#{joined_values}'\n" 
+          "#{key} = '#{joined_values}'\n"
         }
-          
+
         if vendored_frameworks.count > 0
           podspec += entries.call("vendored_frameworks", vendored_frameworks)
-        end      
+        end
         if vendored_libraries.count > 0
           podspec += entries.call("vendored_libraries", vendored_libraries)
         end
@@ -126,21 +126,21 @@ module PodBuilder
             unless k == "OTHER_LDFLAGS"
               next # For the time being limit to OTHER_LDFLAGS key
             end
-  
+
             if podspec_values = item.xcconfig[k]
               podspec_values_arr = podspec_values.split(" ")
               podspec_values_arr.push(v)
-              v = podspec_values_arr.join(" ")          
+              v = podspec_values_arr.join(" ")
             end
-            
+
             xcconfig[k] = item.xcconfig[k]
           end
-  
-          if xcconfig.keys.count > 0 
+
+          if xcconfig.keys.count > 0
             podspec += "#{indentation}#{spec_var}.xcconfig = #{xcconfig.to_s}\n"
           end
         end
-        if !install_using_frameworks && spec_var == "p1" && vendored_libraries.map { |t| File.basename(t) }.include?("lib#{item.root_name}.a" )
+        if !install_using_frameworks && spec_var == "p1" && vendored_libraries.map { |t| File.basename(t) }.include?("lib#{item.root_name}.a")
           module_path_files = Dir.glob(PodBuilder.prebuiltpath("#{item.root_name}/**/#{item.root_name}.modulemap"))
           raise "\n\nToo many module maps found for #{item.root_name}\n".red if module_path_files.count > 1
 
@@ -151,9 +151,8 @@ module PodBuilder
           if module_path_file = module_path_files.first
             module_map_rel = module_path_file.gsub(PodBuilder::prebuiltpath("#{item.root_name}/#{item.root_name}/"), "")
             static_cfg = { "SWIFT_INCLUDE_PATHS" => "$(inherited) \"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\"",
-                          "OTHER_CFLAGS" => "$(inherited) -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\"",
-                          "OTHER_SWIFT_FLAGS" => "$(inherited) -Xcc -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\""
-                          }            
+                           "OTHER_CFLAGS" => "$(inherited) -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\"",
+                           "OTHER_SWIFT_FLAGS" => "$(inherited) -Xcc -fmodule-map-file=\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}/#{module_map_rel}\"" }
           end
           static_cfg[prebuilt_root_var] = "$(PODS_ROOT)/#{rel_path}"
 
@@ -161,7 +160,7 @@ module PodBuilder
           # This seems to be a viable workaround to https://github.com/CocoaPods/CocoaPods/issues/9559 and https://github.com/CocoaPods/CocoaPods/issues/8454
           podspec += "#{indentation}#{spec_var}.user_target_xcconfig = { \"OTHER_LDFLAGS\" => \"$(inherited) -L\\\"$(#{prebuilt_root_var})/#{item.root_name}/#{item.root_name}\\\" -l\\\"#{item.root_name}\\\"\" }\n"
         end
-  
+
         deps = item.dependency_names.sort
         if name == item.root_name
           deps.reject! { |t| t.split("/").first == item.root_name }
@@ -170,7 +169,7 @@ module PodBuilder
         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
             podspec += "\n"
@@ -195,8 +194,8 @@ module PodBuilder
         if podspec.length > 0
           podspec += "\n"
         end
-          
-        subspec_keys, subspec_valid = generate_spec_keys_for(subspec_item, subspec, all_buildable_items, install_using_frameworks) 
+
+        subspec_keys, subspec_valid = generate_spec_keys_for(subspec_item, subspec, all_buildable_items, install_using_frameworks)
         valid = valid || subspec_valid
 
         if subspec_keys.length > 0
@@ -205,7 +204,7 @@ module PodBuilder
           podspec += "#{indentation}end\n"
         end
       end
-    
+
       return podspec, valid
     end
 
@@ -217,7 +216,7 @@ module PodBuilder
         end
       end
 
-      all_buildable_items.each do |item|  
+      all_buildable_items.each do |item|
         if item.is_prebuilt
           next
         end
@@ -238,7 +237,7 @@ module PodBuilder
         podspec += "    p1.summary          = '#{item.summary.gsub("'", "\\'")}'\n"
         podspec += "    p1.homepage         = '#{item.homepage}'\n"
         podspec += "    p1.author           = 'PodBuilder'\n"
-        podspec += "    p1.source           = { 'git' => '#{item.source['git']}'}\n"
+        podspec += "    p1.source           = { 'git' => '#{item.source["git"]}'}\n"
         podspec += "    p1.license          = { :type => '#{item.license}' }\n"
 
         podspec += "\n"
@@ -258,7 +257,7 @@ module PodBuilder
           File.write(spec_path, podspec)
         else
           message = "Prebuilt podspec destination not found for #{File.basename(spec_path)}".red
-          if ENV['DEBUGGING']
+          if ENV["DEBUGGING"]
             puts message
           else
             raise message
@@ -267,4 +266,4 @@ module PodBuilder
       end
     end
   end
-end
+end

data/lib/pod_builder/rome/post_install.rb

@@ -323,6 +323,7 @@ Pod::HooksManager.register("podbuilder-rome", :post_install) do |installer_conte
   build_catalyst = user_options.fetch("build_catalyst", false)
   build_xcframeworks = user_options.fetch("build_xcframeworks", false)
   keep_swiftmodules = user_options.fetch("keep_swiftmodules", false)
+  code_sign_identity = user_options.fetch("code_sign_identity", "")
 
   prebuilt_root_paths = JSON.parse(user_options["prebuilt_root_paths"].gsub("=>", ":"))
 
@@ -390,7 +391,7 @@ Pod::HooksManager.register("podbuilder-rome", :post_install) do |installer_conte
       next if built_item_paths.count == 0
 
       module_name = File.basename(built_item_paths.first, ".*")
-      spec = specs.detect { |t| t.module_name == module_name }
+      spec = specs.detect { |t| t.module_name == module_name && t.parent.nil? }
 
       # There seems to be a potential bug in CocoaPods-Core (https://github.com/CocoaPods/Core/issues/730)
       if spec.nil?
@@ -420,8 +421,21 @@ Pod::HooksManager.register("podbuilder-rome", :post_install) do |installer_conte
             FileUtils.cp(swiftmodule_path, destination_path)
           end
         end
+      else
+        if Dir.glob("#{xcframework_path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
+          # We can safely remove .swiftmodule if .swiftinterface exists
+          swiftmodule_files = Dir.glob("#{xcframework_path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
+          swiftmodule_files.each { |t| PodBuilder::safe_rm_rf(t) }
+        end
       end
 
+      # Cleanup unneeded files (see https://github.com/bazelbuild/rules_apple/pull/1113)
+      ignore_files = Dir.glob("#{xcframework_path}/**/Modules/**/*.swiftmodule/*.{swiftdoc,swiftsourceinfo,private.swiftinterface}")
+      ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
+
+      project_folder = Dir.glob("#{xcframework_path}/**/Modules/**/*.swiftmodule/Project")
+      project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
+
       if enable_dsym
         xcodebuild_settings.each do |xcodebuild_setting|
           dsym_source = "#{build_dir}/#{xcodebuild_setting.platform_name}.xcarchive/dSYMs/"
@@ -435,6 +449,11 @@ Pod::HooksManager.register("podbuilder-rome", :post_install) do |installer_conte
       else
         raise "\n\nNot implemented\n".red
       end
+
+      unless code_sign_identity.empty?
+        resigning_cmd = "codesign --timestamp -v --sign '#{code_sign_identity}' #{xcframework_path} &>/dev/null"
+        raise "\n\nFailed signing xcframework!\n".red if !system(resigning_cmd)
+      end
     end
 
     built_count = built_items.count
@@ -469,8 +488,23 @@ Pod::HooksManager.register("podbuilder-rome", :post_install) do |installer_conte
       end
 
       files = Dir.glob("#{path}/*")
-      framework_files = Dir.glob("#{path}/*.framework/**/*").map { |t| File.basename(t) }
 
+      unless keep_swiftmodules
+        if Dir.glob("#{path}/**/Modules/**/*.swiftmodule/*.swiftinterface").count > 0
+          # We can safely remove .swiftmodule if .swiftinterface exists
+          swiftmodule_files = Dir.glob("#{path}/**/Modules/**/*.swiftmodule/*.swiftmodule")
+          swiftmodule_files.each { |t| PodBuilder::safe_rm_rf(t) }
+        end
+      end
+
+      # Cleanup unneeded files (see https://github.com/bazelbuild/rules_apple/pull/1113)
+      ignore_files = Dir.glob("#{path}/**/Modules/**/*.swiftmodule/*.{swiftdoc,swiftsourceinfo,private.swiftinterface}")
+      ignore_files.each { |t| PodBuilder::safe_rm_rf(t) }
+
+      project_folder = Dir.glob("#{path}/**/Modules/**/*.swiftmodule/Project")
+      project_folder.select { |t| File.directory?(t) && Dir.empty?(t) }.each { |t| PodBuilder::safe_rm_rf(t) }
+
+      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)

data/lib/pod_builder/swizzles.rb

@@ -1,29 +1,29 @@
-require 'xcodeproj'
-require 'pod_builder/core'
-require 'digest'
+require "xcodeproj"
+require "pod_builder/core"
+require "digest"
 
 # Skip warning
-Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) {}
+Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_duplicate_framework_and_library_names) { }
 
 # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
-Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) { }
 
 # The following begin/end clause contains a set of monkey patches of the original CP implementation
 
 # The Pod::Target and Pod::Installer::Xcode::PodTargetDependencyInstaller swizzles patch
-# the following issues: 
+# the following issues:
 # - https://github.com/CocoaPods/Rome/issues/81
 # - https://github.com/leavez/cocoapods-binary/issues/50
 begin
-  require 'cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb'
-  
+  require "cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb"
+
   class Pod::Specification
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_hash, :from_hash)
     Pod::Specification.singleton_class.send(:alias_method, :swz_from_string, :from_string)
-    
+
     def self.from_string(*args)
       spec = swz_from_string(*args)
-      
+
       if overrides = PodBuilder::Configuration.spec_overrides[spec.name]
         overrides.each do |k, v|
           if spec.attributes_hash[k].is_a?(Hash)
@@ -34,16 +34,16 @@ begin
           end
         end
       end
-      
+
       spec
     end
-  end 
-  
+  end
+
   class Pod::Target
     attr_accessor :mock_dynamic_framework
-    
+
     alias_method :swz_build_type, :build_type
-    
+
     def build_type
       if mock_dynamic_framework == true
         if defined?(Pod::BuildType) # CocoaPods 1.9 and later
@@ -62,72 +62,72 @@ begin
   class Pod::PodTarget
     @@modules_override = Hash.new
 
-    def self.modules_override= (x)
+    def self.modules_override=(x)
       @@modules_override = x
     end
 
     def self.modules_override
-        return @@modules_override
+      return @@modules_override
     end
 
     alias_method :swz_defines_module?, :defines_module?
 
-    def defines_module?      
+    def defines_module?
       return @@modules_override.has_key?(name) ? @@modules_override[name] : swz_defines_module?
     end
   end
-  
+
   # Starting from CocoaPods 1.10.0 and later resources are no longer copied inside the .framework
   # when building static frameworks. While this is correct when using CP normally, for redistributable
   # frameworks we require resources to be shipped along the binary
   class Pod::Installer::Xcode::PodsProjectGenerator::PodTargetInstaller
     alias_method :swz_add_files_to_build_phases, :add_files_to_build_phases
-    
+
     def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = target.build_as_static_framework?
       swz_add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
       target.mock_dynamic_framework = false
     end
-  end 
-  
+  end
+
   class Pod::Installer::Xcode::PodTargetDependencyInstaller
     alias_method :swz_wire_resource_bundle_targets, :wire_resource_bundle_targets
-    
+
     def wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
       pod_target.mock_dynamic_framework = pod_target.build_as_static_framework?
       res = swz_wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
       pod_target.mock_dynamic_framework = false
       return res
     end
-  end  
+  end
 rescue LoadError
   # CocoaPods 1.6.2 or earlier
 end
 
 class Pod::Generator::FileList
   alias_method :swz_initialize, :initialize
-  
+
   def initialize(paths)
     paths.uniq!
     swz_initialize(paths)
   end
-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 
+end
 
 class Pod::Generator::EmbedFrameworksScript
   alias_method :swz_initialize, :initialize
-  
+
   def initialize(*args)
     raise "\n\nUnsupported CocoaPods version\n".red if (args.count == 0 || args.count > 2)
-    
+
     frameworks_by_config = args[0]
     frameworks_by_config.keys.each do |key|
       items = frameworks_by_config[key]
@@ -147,11 +147,11 @@ class Pod::Generator::EmbedFrameworksScript
 
     swz_initialize(*args)
   end
-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]
@@ -163,10 +163,10 @@ class Pod::Generator::CopyResourcesScript
         message = ""
         colliding_resources.each do |resources|
           resources.map! { |t| File.expand_path(t.gsub("${PODS_ROOT}", "#{Dir.pwd}/Pods")) }
-          # check that files are identical. 
+          # 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) }
+          hashes = resources.map { |t| (File.exists?(t) && File.file?(t)) ? Digest::MD5.hexdigest(File.read(t)) : File.basename(t) }
           if hashes.uniq.count > 1
             message += resources.join("\n") + "\n"
           end
@@ -180,7 +180,7 @@ class Pod::Generator::CopyResourcesScript
 
       resources_by_config[key] = items
     end
-    
+
     swz_initialize(resources_by_config, platform)
   end
-end 
+end

data/lib/pod_builder/templates/build_podfile.template

@@ -7,7 +7,7 @@ PodBuilder::Configuration::load
 
 %%%use_frameworks%%%
 
-plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, keep_swiftmodules: %%%keep_swiftmodules%%%, build_catalyst: %%%build_catalyst%%%, build_xcframeworks: %%%build_xcframeworks%%%, prebuilt_root_paths: '%%%prebuilt_root_paths%%%', pre_compile: Proc.new { |installer|
+plugin 'podbuilder-rome', {  dsym: true, configuration: '%%%build_configuration%%%', uses_frameworks: %%%uses_frameworks%%%, keep_swiftmodules: %%%keep_swiftmodules%%%, build_catalyst: %%%build_catalyst%%%, build_xcframeworks: %%%build_xcframeworks%%%, code_sign_identity: '%%%code_sign_identity%%%', 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,3 +1,3 @@
 module PodBuilder
-  VERSION = "5.2.0"
+  VERSION = "5.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pod-builder
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Tomas Camin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler