cocoapods 1.10.0 → 1.11.0

data/lib/cocoapods/installer/xcode/pods_project_generator/file_references_installer.rb

@@ -6,6 +6,9 @@ module Pod
         # specifications in the Pods project.
         #
         class FileReferencesInstaller
+          # Regex for extracting the region portion of a localized file path. Ex. `Resources/en.lproj` --> `en`
+          LOCALIZATION_REGION_FILEPATTERN_REGEX = /(\/|^)(?<region>[^\/]*?)\.lproj(\/|$)/
+
           # @return [Sandbox] The sandbox of the installation.
           #
           attr_reader :sandbox
@@ -126,8 +129,9 @@ module Pod
           #
           def add_resources
             UI.message '- Adding resources' do
-              add_file_accessors_paths_to_pods_group(:resources, :resources, true)
-              add_file_accessors_paths_to_pods_group(:resource_bundle_files, :resources, true)
+              refs = add_file_accessors_paths_to_pods_group(:resources, :resources, true)
+              refs.concat add_file_accessors_paths_to_pods_group(:resource_bundle_files, :resources, true)
+              add_known_regions(refs)
             end
           end
 
@@ -207,20 +211,20 @@ module Pod
           #         Whether organizing a local pod's files in subgroups inside
           #         the pod's group is allowed.
           #
-          # @return [void]
+          # @return [Array<PBXFileReference>] the added file references
           #
           def add_file_accessors_paths_to_pods_group(file_accessor_key, group_key = nil, reflect_file_system_structure = false)
-            file_accessors.each do |file_accessor|
+            file_accessors.flat_map do |file_accessor|
               paths = file_accessor.send(file_accessor_key)
               paths = allowable_project_paths(paths)
-              next if paths.empty?
+              next [] if paths.empty?
 
               pod_name = file_accessor.spec.name
               preserve_pod_file_structure_flag = (sandbox.local?(pod_name) || preserve_pod_file_structure) && reflect_file_system_structure
               base_path = preserve_pod_file_structure_flag ? common_path(paths) : nil
               actual_group_key = preserve_pod_file_structure_flag ? nil : group_key
               group = pods_project.group_for_spec(pod_name, actual_group_key)
-              paths.each do |path|
+              paths.map do |path|
                 pods_project.add_file_reference(path, group, preserve_pod_file_structure_flag, base_path)
               end
             end
@@ -302,6 +306,21 @@ module Pod
             return result unless result.to_s == '' || result.to_s == '/'
           end
 
+          # Adds the known localization regions to the root of the project
+          #
+          # @param [Array<PBXFileReferences>] file_references the resource file references
+          #
+          def add_known_regions(file_references)
+            pattern = LOCALIZATION_REGION_FILEPATTERN_REGEX
+            regions = file_references.map do |ref|
+              if (match = ref.path.to_s.match(pattern))
+                match[:region]
+              end
+            end.compact
+
+            pods_project.root_object.known_regions = (pods_project.root_object.known_regions | regions).sort
+          end
+
           #-----------------------------------------------------------------------#
         end
       end

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_dependency_installer.rb

@@ -36,25 +36,24 @@ module Pod
             pod_target = pod_target_installation_result.target
             native_target = pod_target_installation_result.native_target
             project = native_target.project
-            frameworks_group = project.frameworks_group
 
             # First, wire up all resource bundles.
             wire_resource_bundle_targets(pod_target_installation_result.resource_bundle_targets,
                                          native_target, pod_target)
             # Wire up all dependencies to this pod target, if any.
             wire_target_dependencies(pod_target, native_target, project, pod_target_installation_results,
-                                     metadata_cache, frameworks_group)
+                                     metadata_cache)
 
             # Wire up test native targets.
             unless pod_target_installation_result.test_native_targets.empty?
               wire_test_native_targets(pod_target, pod_target_installation_result, pod_target_installation_results,
-                                       project, frameworks_group, metadata_cache)
+                                       project, metadata_cache)
             end
 
             # Wire up app native targets.
             unless pod_target_installation_result.app_native_targets.empty?
               wire_app_native_targets(pod_target, pod_target_installation_result, pod_target_installation_results,
-                                      project, frameworks_group, metadata_cache)
+                                      project, metadata_cache)
             end
           end
         end
@@ -70,8 +69,7 @@ module Pod
           end
         end
 
-        def wire_target_dependencies(pod_target, native_target, project,
-                                     pod_target_installation_results, metadata_cache, frameworks_group)
+        def wire_target_dependencies(pod_target, native_target, project, pod_target_installation_results, metadata_cache)
           dependent_targets = pod_target.dependent_targets
           dependent_targets.each do |dependent_target|
             is_local = sandbox.local?(dependent_target.pod_name)
@@ -81,7 +79,6 @@ module Pod
                 project.add_pod_subproject(dependent_project, is_local)
               end
               native_target.add_dependency(installation_result.native_target)
-              add_framework_file_reference_to_native_target(native_target, pod_target, dependent_target, frameworks_group)
             else
               # Hit the cache
               cached_dependency = metadata_cache.target_label_by_metadata[dependent_target.label]
@@ -91,7 +88,7 @@ module Pod
           end
         end
 
-        def wire_test_native_targets(pod_target, installation_result, pod_target_installation_results, project, frameworks_group, metadata_cache)
+        def wire_test_native_targets(pod_target, installation_result, pod_target_installation_results, project, metadata_cache)
           installation_result.test_specs_by_native_target.each do |test_native_target, test_spec|
             resource_bundle_native_targets = installation_result.test_resource_bundle_targets[test_spec.name] || []
             resource_bundle_native_targets.each do |test_resource_bundle_target|
@@ -107,7 +104,6 @@ module Pod
                   project.add_pod_subproject(dependent_test_project, is_local)
                 end
                 test_native_target.add_dependency(dependency_installation_result.native_target)
-                add_framework_file_reference_to_native_target(test_native_target, pod_target, test_dependent_target, frameworks_group)
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[test_dependent_target.label]
@@ -162,7 +158,7 @@ module Pod
           end
         end
 
-        def wire_app_native_targets(pod_target, installation_result, pod_target_installation_results, project, frameworks_group, metadata_cache)
+        def wire_app_native_targets(pod_target, installation_result, pod_target_installation_results, project, metadata_cache)
           installation_result.app_specs_by_native_target.each do |app_native_target, app_spec|
             resource_bundle_native_targets = installation_result.app_resource_bundle_targets[app_spec.name] || []
             resource_bundle_native_targets.each do |app_resource_bundle_target|
@@ -184,7 +180,6 @@ module Pod
                   project.add_pod_subproject(dependency_project, is_local)
                 end
                 app_native_target.add_dependency(dependency_installation_result.native_target)
-                add_framework_file_reference_to_native_target(app_native_target, pod_target, app_dependent_target, frameworks_group)
               else
                 # Hit the cache
                 cached_dependency = metadata_cache.target_label_by_metadata[app_dependent_target.label]
@@ -194,14 +189,6 @@ module Pod
             end
           end
         end
-
-        def add_framework_file_reference_to_native_target(native_target, pod_target, dependent_target, frameworks_group)
-          if pod_target.should_build? && pod_target.build_as_dynamic? && dependent_target.should_build?
-            product_ref = frameworks_group.files.find { |f| f.path == dependent_target.product_name } ||
-                frameworks_group.new_product_ref_for_target(dependent_target.product_basename, dependent_target.product_type)
-            native_target.frameworks_build_phase.add_file_reference(product_ref, true)
-          end
-        end
       end
     end
   end

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -43,18 +43,14 @@ module Pod
               test_file_accessors = target.file_accessors.select { |fa| fa.spec.test_specification? }
               app_file_accessors = target.file_accessors.select { |fa| fa.spec.app_specification? }
 
-              unless target.should_build?
-                # For targets that should not be built (e.g. pre-built vendored frameworks etc), we add a placeholder
-                # PBXAggregateTarget that will be used to wire up dependencies later.
-                native_target = add_placeholder_target
-                resource_bundle_targets = add_resources_bundle_targets(library_file_accessors).values.flatten
-                create_copy_dsyms_script
-                create_copy_xcframeworks_script unless target.xcframeworks.values.all?(&:empty?)
-                create_xcconfig_file(native_target, resource_bundle_targets)
-                return TargetInstallationResult.new(target, native_target, resource_bundle_targets)
-              end
+              native_target = if target.should_build?
+                                add_target
+                              else
+                                # For targets that should not be built (e.g. pre-built vendored frameworks etc), we add a placeholder
+                                # PBXAggregateTarget that will be used to wire up dependencies later.
+                                add_placeholder_target
+                              end
 
-              native_target = add_target
               resource_bundle_targets = add_resources_bundle_targets(library_file_accessors).values.flatten
 
               test_native_targets = add_test_targets
@@ -65,8 +61,10 @@ module Pod
               app_resource_bundle_targets = add_resources_bundle_targets(app_file_accessors)
 
               add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
-              validate_targets_contain_sources(test_native_targets + app_native_targets.values + [native_target])
-              validate_xcframeworks
+              targets_to_validate = test_native_targets + app_native_targets.values
+              targets_to_validate << native_target if target.should_build?
+              validate_targets_contain_sources(targets_to_validate)
+              validate_xcframeworks if target.should_build?
 
               create_copy_xcframeworks_script unless target.xcframeworks.values.all?(&:empty?)
 
@@ -74,7 +72,7 @@ module Pod
               create_test_xcconfig_files(test_native_targets, test_resource_bundle_targets)
               create_app_xcconfig_files(app_native_targets, app_resource_bundle_targets)
 
-              if target.defines_module?
+              if target.should_build? && target.defines_module? && !skip_modulemap?(target.library_specs)
                 create_module_map(native_target) do |generator|
                   generator.headers.concat module_map_additional_headers
                 end
@@ -99,20 +97,21 @@ module Pod
                 end
               end
 
-              if target.build_as_framework?
+              if target.should_build? && target.build_as_framework?
                 unless skip_info_plist?(native_target)
-                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform, :additional_entries => target.info_plist_entries)
+                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform,
+                                         :additional_entries => target.info_plist_entries)
                 end
                 create_build_phase_to_symlink_header_folders(native_target)
               end
 
-              if target.build_as_library? && target.uses_swift?
+              if target.should_build? && target.build_as_library? && target.uses_swift?
                 add_swift_library_compatibility_header_phase(native_target)
               end
 
               project_directory = project.path.dirname
 
-              unless skip_pch?(target.library_specs)
+              if target.should_build? && !skip_pch?(target.library_specs)
                 path = target.prefix_header_path
                 create_prefix_header(path, library_file_accessors, target.platform, native_target, project_directory)
                 add_file_to_support_group(path)
@@ -135,7 +134,7 @@ module Pod
                   add_file_to_support_group(path)
                 end
               end
-              create_dummy_source(native_target)
+              create_dummy_source(native_target) if target.should_build?
               create_copy_dsyms_script
               clean_support_files_temp_dir
               TargetInstallationResult.new(target, native_target, resource_bundle_targets,
@@ -191,6 +190,10 @@ module Pod
             specs.any? { |spec| spec.root.prefix_header_file.is_a?(FalseClass) }
           end
 
+          def skip_modulemap?(specs)
+            specs.any? { |spec| spec.module_map.is_a?(FalseClass) }
+          end
+
           # True if info.plist generation should be skipped
           #
           # @param [PXNativeTarget] native_target
@@ -264,10 +267,10 @@ module Pod
           # @yield_param  [Array<PBXFileReference>} The filtered resource file references to be installed
           #               in the compile sources phase.
           #
-          # @note   Core Data model directories (.xcdatamodeld) used to be added to the
-          #         `Copy Resources` build phase like all other resources, since they would
-          #         compile correctly in either the resources or compile phase. In recent
-          #         versions of xcode, there's an exception for data models that generate
+          # @note   Core Data model directories (.xcdatamodeld) and RealityKit projects (.rcproject)
+          #         used to be added to the `Copy Resources` build phase like all other resources,
+          #         since they would compile correctly in either the resources or compile phase. In
+          #         recent versions of xcode, there's an exception for data models that generate
           #         headers. These need to be added to the compile sources phase of a real
           #         target for the headers to be built in time for code in the target to
           #         use them. These kinds of models generally break when added to resource
@@ -287,7 +290,7 @@ module Pod
 
               ref
             end.compact.uniq
-            compile_phase_matcher = lambda { |ref| !(ref.path =~ /.*\.xcdatamodeld/i).nil? }
+            compile_phase_matcher = lambda { |ref| !(ref.path =~ /.*\.(xcdatamodeld|rcproject)/i).nil? }
             compile_phase_refs, resources_phase_refs = file_references.partition(&compile_phase_matcher)
             yield compile_phase_refs, resources_phase_refs
           end
@@ -307,21 +310,26 @@ module Pod
           #
           # @return [void]
           #
-          def add_files_to_build_phases(native_target, test_native_targets, app_native_targets)
+          def add_files_to_build_phases(library_native_target, test_native_targets, app_native_targets)
             target.file_accessors.each do |file_accessor|
               consumer = file_accessor.spec_consumer
 
               native_target =  case consumer.spec.spec_type
                                when :library
-                                 native_target
+                                 library_native_target
                                when :test
                                  test_native_target_from_spec(consumer.spec, test_native_targets)
                                when :app
                                  app_native_targets[consumer.spec]
+                               else
+                                 raise ArgumentError, "Unknown spec type #{consumer.spec.spec_type}."
                                end
 
+              next if native_target.is_a?(Xcodeproj::Project::Object::PBXAggregateTarget)
+
               headers = file_accessor.headers
               public_headers = file_accessor.public_headers.map(&:realpath)
+              project_headers = file_accessor.project_headers.map(&:realpath)
               private_headers = file_accessor.private_headers.map(&:realpath)
               other_source_files = file_accessor.other_source_files
 
@@ -344,7 +352,7 @@ module Pod
 
               header_file_refs = project_file_references_array(headers, 'header')
               native_target.add_file_references(header_file_refs) do |build_file|
-                add_header(file_accessor, build_file, public_headers, private_headers, native_target)
+                add_header(file_accessor, build_file, public_headers, project_headers, private_headers, native_target)
               end
 
               other_file_refs = project_file_references_array(other_source_files, 'other source')
@@ -356,7 +364,10 @@ module Pod
                 native_target.add_file_references(compile_phase_refs, nil)
 
                 if target.build_as_static_framework? && consumer.spec.library_specification?
-                  resource_phase_refs = resource_phase_refs.select { |ref| Target.resource_extension_compilable?(File.extname(ref.path)) }
+                  resource_phase_refs = resource_phase_refs.select do |ref|
+                    filename = ref.name || ref.path
+                    Target.resource_extension_compilable?(File.extname(filename))
+                  end
                 end
 
                 native_target.add_resources(resource_phase_refs)
@@ -377,9 +388,11 @@ module Pod
               name = target.test_target_label(test_spec)
               platform_name = target.platform.name
               language = target.uses_swift_for_spec?(test_spec) ? :swift : :objc
+              product_basename = target.product_basename_for_spec(test_spec)
+              embedded_content_contains_swift = target.dependent_targets_for_test_spec(test_spec).any?(&:uses_swift?)
               test_native_target = project.new_target(product_type, name, platform_name,
                                                       target.deployment_target_for_non_library_spec(test_spec), nil,
-                                                      language)
+                                                      language, product_basename)
               test_native_target.product_reference.name = name
 
               target.user_build_configurations.each do |bc_name, type|
@@ -413,6 +426,9 @@ module Pod
                 elsif target.platform == :ios
                   configuration.build_settings['CODE_SIGN_IDENTITY'] = 'iPhone Developer'
                 end
+                # Ensure swift stdlib gets copied in if needed, even when the target contains no swift files,
+                # because a dependency uses swift
+                configuration.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES' if embedded_content_contains_swift
               end
 
               remove_pod_target_xcconfig_overrides_from_target(target.test_spec_build_settings_by_config[test_spec.name], test_native_target)
@@ -463,10 +479,12 @@ module Pod
               info_plist_entries = spec_consumer.info_plist
               resources = target.file_accessors.find { |fa| fa.spec == app_spec }.resources
               add_launchscreen_storyboard = resources.none? { |resource| resource.basename.to_s == 'LaunchScreen.storyboard' } && platform.name == :ios
+              embedded_content_contains_swift = target.dependent_targets_for_app_spec(app_spec).any?(&:uses_swift?)
               app_native_target = AppHostInstaller.new(sandbox, project, platform, subspec_name, spec_name,
                                                        app_target_label, :add_main => false,
                                                                          :add_launchscreen_storyboard => add_launchscreen_storyboard,
-                                                                         :info_plist_entries => info_plist_entries).install!
+                                                                         :info_plist_entries => info_plist_entries,
+                                                                         :product_basename => target.product_basename_for_spec(app_spec)).install!
 
               app_native_target.product_reference.name = app_target_label
               target.user_build_configurations.each do |bc_name, type|
@@ -505,6 +523,9 @@ module Pod
                   configuration.build_settings.delete('CODE_SIGN_IDENTITY[sdk=iphoneos*]')
                   configuration.build_settings.delete('CODE_SIGN_IDENTITY[sdk=watchos*]')
                 end
+                # Ensure swift stdlib gets copied in if needed, even when the target contains no swift files,
+                # because a dependency uses swift
+                configuration.build_settings['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES' if embedded_content_contains_swift
               end
 
               remove_pod_target_xcconfig_overrides_from_target(target.app_spec_build_settings_by_config[app_spec.name], app_native_target)
@@ -548,12 +569,8 @@ module Pod
             file_accessors.each_with_object({}) do |file_accessor, hash|
               hash[file_accessor.spec.name] = file_accessor.resource_bundles.map do |bundle_name, paths|
                 label = target.resources_bundle_target_label(bundle_name)
-                resource_bundle_target = project.new_resources_bundle(label, file_accessor.spec_consumer.platform_name)
-                resource_bundle_target.product_reference.tap do |bundle_product|
-                  bundle_file_name = "#{bundle_name}.bundle"
-                  bundle_product.name = bundle_file_name
-                end
-
+                resource_bundle_target = project.new_resources_bundle(label, file_accessor.spec_consumer.platform_name, nil, bundle_name)
+                resource_bundle_target.product_reference.name = label
                 contains_compile_phase_refs = add_resources_to_target(paths, resource_bundle_target)
 
                 target.user_build_configurations.each do |bc_name, type|
@@ -655,10 +672,6 @@ module Pod
                 scoped_test_resource_bundle_targets = test_resource_bundle_targets[test_spec.name]
                 apply_xcconfig_file_ref_to_targets([test_native_target] + scoped_test_resource_bundle_targets, test_xcconfig_file_ref, names)
               end
-
-              test_native_target.build_configurations.each do |test_native_target_bc|
-                test_target_swift_debug_hack(test_spec, test_native_target_bc)
-              end
             end
           end
 
@@ -837,20 +850,8 @@ module Pod
             add_file_to_support_group(path)
           end
 
-          # Manually add `libswiftSwiftOnoneSupport.dylib` as it seems there is an issue with tests that do not include it for Debug configurations.
-          # Possibly related to Swift module optimization.
-          #
-          # @return [void]
-          #
-          def test_target_swift_debug_hack(test_spec, test_target_bc)
-            return unless test_target_bc.debug?
-            return unless target.dependent_targets_for_test_spec(test_spec).any?(&:uses_swift?)
-            ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= '$(inherited)'
-            ldflags << ' -lswiftSwiftOnoneSupport'
-          end
-
           # Creates a build phase which links the versioned header folders
-          # of the OS X into the framework bundle's root root directory.
+          # of the OS X framework into the framework bundle's root directory.
           # This is only necessary because the way how headers are copied
           # via custom copy file build phases in combination with
           # header_mappings_dir interferes with xcodebuild's expectations
@@ -862,11 +863,16 @@ module Pod
           # @return [void]
           #
           def create_build_phase_to_symlink_header_folders(native_target)
-            return unless target.platform.name == :osx && any_header_mapping_dirs?
+            # This is required on iOS for Catalyst, which uses macOS framework layouts
+            return unless (target.platform.name == :osx || target.platform.name == :ios) && any_header_mapping_dirs?
 
             build_phase = native_target.new_shell_script_build_phase('Create Symlinks to Header Folders')
             build_phase.shell_script = <<-eos.strip_heredoc
               cd "$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME" || exit 1
+              if [ ! -d Versions ]; then
+                # Not a versioned framework, so no need to do anything
+                exit 0
+              fi
 
               public_path="${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}"
               if [ ! -f "$public_path" ]; then
@@ -993,7 +999,7 @@ module Pod
           end
 
           def create_umbrella_header(native_target)
-            return super(native_target) unless custom_module_map
+            super(native_target) unless custom_module_map
           end
 
           def custom_module_map
@@ -1030,12 +1036,14 @@ module Pod
                                                    end
           end
 
-          def add_header(file_accessor, build_file, public_headers, private_headers, native_target)
+          def add_header(file_accessor, build_file, public_headers, project_headers, private_headers, native_target)
             file_ref = build_file.file_ref
             acl = if !target.build_as_framework? # Headers are already rooted at ${PODS_ROOT}/Headers/P*/[pod]/...
                     'Project'
                   elsif public_headers.include?(file_ref.real_path)
                     'Public'
+                  elsif project_headers.include?(file_ref.real_path)
+                    'Project'
                   elsif private_headers.include?(file_ref.real_path)
                     'Private'
                   else
@@ -1191,7 +1199,11 @@ module Pod
             def dsym_paths(target)
               dsym_paths = target.framework_paths.values.flatten.reject { |fmwk_path| fmwk_path.dsym_path.nil? }.map(&:dsym_path)
               dsym_paths.concat(target.xcframeworks.values.flatten.flat_map { |xcframework| xcframework_dsyms(xcframework.path) })
-              dsym_paths
+              dsym_paths.map do |dsym_path|
+                dsym_pathname = Pathname(dsym_path)
+                dsym_path = "${PODS_ROOT}/#{dsym_pathname.relative_path_from(target.sandbox.root)}" unless dsym_pathname.relative?
+                dsym_path
+              end
             end
 
             # @param [PodTarget] target the target to be installed
@@ -1201,7 +1213,7 @@ module Pod
             def bcsymbolmap_paths(target)
               target.framework_paths.values.flatten.reject do |fmwk_path|
                 fmwk_path.bcsymbolmap_paths.nil?
-              end.flat_map(&:bcsymbolmap_paths)
+              end.flat_map(&:bcsymbolmap_paths).uniq
             end
 
             # @param  [Pathname] xcframework_path