cocoapods 1.10.0 → 1.16.0

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
@@ -223,6 +226,11 @@ module Pod
 
             settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = '$(inherited) '
 
+            # Added in Xcode 16. We manually generate our own Info.plist file so opt out.
+            settings['GENERATE_INFOPLIST_FILE'] = 'NO'
+            # Added in Xcode 16. For Swift-only Pods to be visible to Objective-C we to enable this.
+            settings['SWIFT_INSTALL_OBJC_HEADER'] = 'YES'
+
             if target.swift_version
               settings['SWIFT_VERSION'] = target.swift_version
             end
@@ -242,7 +250,7 @@ module Pod
               @plist_bundle_id = target.info_plist_entries['CFBundleIdentifier']
               unless @plist_bundle_id.nil?
                 message = "The `#{target.name}` target " \
-              "sets a Bundle Identifier of `#{@plist_bundle_id}` in it's info.plist file. " \
+              "sets a Bundle Identifier of `#{@plist_bundle_id}` in its info.plist file. " \
               'The Bundle Identifier should be set using pod_target_xcconfig: ' \
               "s.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER': '#{@plist_bundle_id}' }`."
                 UI.warn message
@@ -264,10 +272,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 +295,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 +315,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 +357,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 +369,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 +393,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 +431,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 +484,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 +528,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 +574,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|
@@ -583,6 +605,9 @@ module Pod
                   # classes from the parent module.
                   configuration.build_settings['IBSC_MODULE'] = target.product_module_name
 
+                  # Xcode 14.x throws an error about code signing on resource bundles, turn it off for now.
+                  configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+
                   # Set the `SWIFT_VERSION` build setting for resource bundles that could have resources that get
                   # compiled such as an `xcdatamodeld` file which has 'Swift' as its code generation language.
                   if contains_compile_phase_refs && file_accessors.any? { |fa| target.uses_swift_for_spec?(fa.spec) }
@@ -655,10 +680,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 +858,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 +871,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
@@ -885,6 +899,7 @@ module Pod
             :osx => Version.new('10.8'),
             :watchos => Version.new('2.0'),
             :tvos => Version.new('9.0'),
+            :visionos => Version.new('1.0'),
           }.freeze
 
           # Returns the compiler flags for the source files of the given specification.
@@ -993,7 +1008,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
@@ -1004,6 +1019,9 @@ module Pod
             error_message_for_missing_reference = lambda do |sf, target|
               "Unable to find #{file_type} ref for `#{sf.basename}` for target `#{target.name}`."
             end
+
+            # Remove all file ref under .docc folder, but preserve the .docc folder
+            files = merge_to_docc_folder(files)
             files.map do |sf|
               begin
                 project.reference_for_path(sf).tap do |ref|
@@ -1030,12 +1048,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
@@ -1088,6 +1108,9 @@ module Pod
             target.user_build_configurations.each do |bc_name, type|
               native_target.add_build_configuration(bc_name, type)
             end
+            native_target.build_configurations.each do |configuration|
+              configuration.build_settings['ENABLE_USER_SCRIPT_SANDBOXING'] = 'NO'
+            end
             unless target.archs.empty?
               native_target.build_configurations.each do |configuration|
                 configuration.build_settings['ARCHS'] = target.archs
@@ -1191,7 +1214,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 +1228,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

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

@@ -34,6 +34,7 @@ module Pod
               target_installation_result.non_library_specs_by_native_target.each do |native_target, spec|
                 add_embed_frameworks_script_phase(native_target, spec)
                 add_copy_resources_script_phase(native_target, spec)
+                add_on_demand_resources(native_target, spec) if spec.app_specification?
                 UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(spec), native_target)
               end
               add_copy_dsyms_script_phase(target_installation_result.native_target)
@@ -134,20 +135,26 @@ module Pod
               spec_paths_to_include << spec.name if dependent_target == target
               dependent_target.framework_paths.values_at(*spec_paths_to_include).flatten.compact
             end.uniq
+            xcframework_paths = dependent_targets.flat_map do |dependent_target|
+              spec_paths_to_include = dependent_target.library_specs.map(&:name)
+              spec_paths_to_include -= host_target_spec_names
+              spec_paths_to_include << spec.name if dependent_target == target
+              dependent_target.xcframeworks.values_at(*spec_paths_to_include).flatten.compact
+            end.uniq
 
-            if use_input_output_paths? && !framework_paths.empty?
+            if use_input_output_paths? && !framework_paths.empty? || !xcframework_paths.empty?
               input_file_list_path = target.embed_frameworks_script_input_files_path_for_spec(spec)
               input_file_list_relative_path = "${PODS_ROOT}/#{input_file_list_path.relative_path_from(target.sandbox.root)}"
               input_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(input_file_list_path, input_file_list_relative_path)
-              input_paths_by_config[input_paths_key] = [script_path] + UserProjectIntegrator::TargetIntegrator.embed_frameworks_input_paths(framework_paths, [])
+              input_paths_by_config[input_paths_key] = [script_path] + UserProjectIntegrator::TargetIntegrator.embed_frameworks_input_paths(framework_paths, xcframework_paths)
 
               output_file_list_path = target.embed_frameworks_script_output_files_path_for_spec(spec)
               output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
               output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
-              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.embed_frameworks_output_paths(framework_paths, [])
+              output_paths_by_config[output_paths_key] = UserProjectIntegrator::TargetIntegrator.embed_frameworks_output_paths(framework_paths, xcframework_paths)
             end
 
-            if framework_paths.empty?
+            if framework_paths.empty? && xcframework_paths.empty?
               UserProjectIntegrator::TargetIntegrator.remove_embed_frameworks_script_phase_from_target(native_target)
             else
               UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(
@@ -183,7 +190,7 @@ module Pod
               output_file_list_relative_path = "${PODS_ROOT}/#{output_file_list_path.relative_path_from(target.sandbox.root)}"
               output_paths_key = UserProjectIntegrator::TargetIntegrator::XCFileListConfigKey.new(output_file_list_path, output_file_list_relative_path)
               output_paths_by_config[output_paths_key] = xcframeworks.map do |xcf|
-                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.name}"
+                "#{Target::BuildSettings::XCFRAMEWORKS_BUILD_DIR_VARIABLE}/#{xcf.target_name}/#{xcf.name}.framework"
               end
             end
 
@@ -199,7 +206,7 @@ module Pod
           # vendored dSYMs.
           #
           # @param [PBXNativeTarget] native_target
-          #         the native target for which to add the the copy dSYM files build phase.
+          #         the native target for which to add the copy dSYM files build phase.
           #
           # @return [void]
           #
@@ -242,6 +249,41 @@ module Pod
             UserProjectIntegrator::TargetIntegrator.set_input_output_paths(phase, input_paths_by_config, output_paths_by_config)
           end
 
+          # Adds the ODRs that are related to this app spec. This includes the app spec dependencies as well as the ODRs
+          # coming from the app spec itself.
+          #
+          # @param [Xcodeproj::PBXNativeTarget] native_target
+          #         the native target for which to add the ODR file references into.
+          #
+          # @param [Specification] app_spec
+          #         the app spec to integrate ODRs for.
+          #
+          # @return [void]
+          #
+          def add_on_demand_resources(native_target, app_spec)
+            dependent_targets = target.dependent_targets_for_app_spec(app_spec)
+            parent_odr_group = native_target.project.group_for_spec(app_spec.name)
+
+            # Add ODRs of the app spec dependencies first.
+            dependent_targets.each do |pod_target|
+              file_accessors = pod_target.file_accessors.select do |fa|
+                fa.spec.library_specification? ||
+                  fa.spec.test_specification? && pod_target.test_app_hosts_by_spec[fa.spec]&.first == app_spec
+              end
+              target_odr_group_name = "#{pod_target.label}-OnDemandResources"
+              UserProjectIntegrator::TargetIntegrator.update_on_demand_resources(target.sandbox, native_target.project,
+                                                                                 native_target, file_accessors,
+                                                                                 parent_odr_group, target_odr_group_name)
+            end
+
+            # Now add the ODRs of our own app spec declaration.
+            file_accessor = target.file_accessors.find { |fa| fa.spec == app_spec }
+            target_odr_group_name = "#{target.subspec_label(app_spec)}-OnDemandResources"
+            UserProjectIntegrator::TargetIntegrator.update_on_demand_resources(target.sandbox, native_target.project,
+                                                                               native_target, file_accessor,
+                                                                               parent_odr_group, target_odr_group_name)
+          end
+
           # @return [String] the message that should be displayed for the target
           #         integration.
           #

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

@@ -38,7 +38,7 @@ module Pod
         #
         attr_reader :podfile_path
 
-        # @return [Bool] Bool indicating if this project is a pod target subproject.
+        # @return [Boolean] Bool indicating if this project is a pod target subproject.
         # Used by `generate_multiple_pod_projects` installation option.
         #
         attr_reader :pod_target_subproject
@@ -103,11 +103,13 @@ module Pod
             ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
             watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
             tvos_deployment_target = platforms.select { |p| p.name == :tvos }.map(&:deployment_target).min
+            visionos_deployment_target = platforms.select { |p| p.name == :visionos }.map(&:deployment_target).min
             project.build_configurations.each do |build_configuration|
               build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
               build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
               build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
               build_configuration.build_settings['TVOS_DEPLOYMENT_TARGET'] = tvos_deployment_target.to_s if tvos_deployment_target
+              build_configuration.build_settings['XROS_DEPLOYMENT_TARGET'] = visionos_deployment_target.to_s if visionos_deployment_target
               build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
               build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
               build_configuration.build_settings['CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED'] = 'YES'

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

@@ -79,12 +79,12 @@ module Pod
           # @param  [Specification] spec
           #         The specification to base from in order to find the native target.
           #
-          # @return [PBXNativeTarget] the native target to use or `nil` if none is found.
+          # @return [PBXNativeTarget, Nil] the native target to use or `nil` if none is found.
           #
           def native_target_for_spec(spec)
             return native_target if spec.library_specification?
             return test_native_target_from_spec(spec) if spec.test_specification?
-            return app_native_target_from_spec(spec) if spec.app_specification?
+            app_native_target_from_spec(spec) if spec.app_specification?
           end
 
           # @return [Hash{PBXNativeTarget => Specification}] a hash where the keys are the test native targets and the value

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

@@ -56,11 +56,8 @@ module Pod
             name = target.label
             platform = target.platform.name
             language = target.uses_swift? ? :swift : :objc
-            native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
-
-            product_name = target.product_name
-            product = native_target.product_reference
-            product.name = product_name
+            native_target = project.new_target(product_type, name, platform, deployment_target, nil, language, target.product_basename)
+            native_target.product_reference.name = name
 
             target.user_build_configurations.each do |bc_name, type|
               native_target.add_build_configuration(bc_name, type)
@@ -97,6 +94,12 @@ module Pod
               settings.merge!('OTHER_LDFLAGS' => '', 'OTHER_LIBTOOLFLAGS' => '')
             end
 
+            # This interferes with our custom run script phases
+            settings['ENABLE_USER_SCRIPT_SANDBOXING'] = 'NO'
+
+            # We aren't yet ready to support this for our targets
+            settings['ENABLE_MODULE_VERIFIER'] = 'NO'
+
             settings
           end
 

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

@@ -48,17 +48,23 @@ module Pod
           #  @param [Hash] additional_entries
           #         any additional entries to include in this Info.plist file.
           #
+          # @param [String] build_setting_value
+          #         an optional value to set for the `INFOPLIST_FILE` build setting on the
+          #         native target. If none is specified then the value is calculated from the
+          #         Info.plist path relative to the sandbox root.
+          #
           # @return [void]
           #
           def create_info_plist_file_with_sandbox(sandbox, path, native_target, version, platform,
-                                                  bundle_package_type = :fmwk, additional_entries: {})
+                                                  bundle_package_type = :fmwk, additional_entries: {},
+                                                  build_setting_value: nil)
             UI.message "- Generating Info.plist file at #{UI.path(path)}" do
               generator = Generator::InfoPlistFile.new(version, platform, bundle_package_type, additional_entries)
               update_changed_file(generator, path)
 
-              relative_path_string = path.relative_path_from(sandbox.root).to_s
+              build_setting_value ||= path.relative_path_from(sandbox.root).to_s
               native_target.build_configurations.each do |c|
-                c.build_settings['INFOPLIST_FILE'] = relative_path_string
+                c.build_settings['INFOPLIST_FILE'] = build_setting_value
               end
             end
           end

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

@@ -195,7 +195,7 @@ module Pod
 
         # @param  [String] pod The root name of the development pod.
         #
-        # @return [Bool] whether the scheme for the given development pod should be
+        # @return [Boolean] whether the scheme for the given development pod should be
         #         shared.
         #
         def share_scheme_for_development_pod?(pod)
@@ -247,7 +247,7 @@ module Pod
           end
           is_custom_host = !hosted_test_specs_by_host.empty?
           specs.each do |spec|
-            scheme_name = spec.spec_type == :library ? pod_target.label : pod_target.non_library_spec_label(spec)
+            scheme_name = pod_target.spec_label(spec)
             scheme_configuration = pod_target.scheme_for_spec(spec)
             if !scheme_configuration.empty? || is_custom_host
               scheme_path = Xcodeproj::XCScheme.user_data_dir(project.path) + "#{scheme_name}.xcscheme"
@@ -265,6 +265,10 @@ module Pod
               if scheme_configuration.key?(:code_coverage)
                 scheme.test_action.code_coverage_enabled = scheme_configuration[:code_coverage]
               end
+              if scheme_configuration.key?(:parallelizable)
+                scheme.test_action.testables.each { |testable| testable.parallelizable = scheme_configuration[:parallelizable] }
+              end
+              set_scheme_build_configurations(scheme, scheme_configuration.fetch(:build_configurations, {}))
 
               hosted_test_specs_by_host[spec].each do |hosted_spec|
                 # We are an app spec which hosts this test spec.
@@ -285,6 +289,37 @@ module Pod
             Xcodeproj::XCScheme.share_scheme(project.path, scheme_name) if share_scheme
           end
         end
+
+        # @param [Xcodeproj::XCSheme] scheme
+        # scheme to apply configuration to
+        #
+        # @param [Hash{String => String}] configuration
+        # action => build configuration to use for the action
+        #
+        # @return [void]
+        #
+        def set_scheme_build_configurations(scheme, configuration)
+          configuration.each do |k, v|
+            unless @build_configurations.include?(v)
+              raise Informative, "Unable to set `#{v}` as a build configuration as " \
+              "it doesn't match with any of your projects build configurations."
+            end
+
+            case k
+            when 'Run'
+              scheme.launch_action.build_configuration = v
+            when 'Test'
+              scheme.test_action.build_configuration = v
+            when 'Analyze'
+              scheme.analyze_action.build_configuration = v
+            when 'Archive'
+              scheme.archive_action.build_configuration = v
+            else
+              raise Informative, "#{k} is not a valid scheme action " \
+              "only one of ['run', 'test', 'analyze', 'archive'] is available"
+            end
+          end
+        end
       end
     end
   end

data/lib/cocoapods/installer/xcode/target_validator.rb

@@ -129,7 +129,7 @@ module Pod
         def verify_swift_pods_have_module_dependencies
           error_messages = []
           pod_targets.each do |pod_target|
-            next unless pod_target.uses_swift?
+            next unless pod_target.uses_swift? && pod_target.should_build?
 
             non_module_dependencies = []
             pod_target.dependent_targets.each do |dependent_target|