cocoapods 1.4.0 → 1.5.0.beta.1

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

@@ -153,7 +153,7 @@ module Pod
               build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
               build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
               build_configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'NO'
-              build_configuration.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = 'NO_SIGNING/' # a bogus provisioning profile ID assumed to be invalid
+              build_configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
             end
           end
         end
@@ -165,8 +165,14 @@ module Pod
 
         def install_libraries
           UI.message '- Installing targets' do
+            umbrella_headers_by_dir = pod_targets.map do |pod_target|
+              next unless pod_target.should_build? && pod_target.defines_module?
+              pod_target.umbrella_header_path
+            end.compact.group_by(&:dirname)
+
             pod_targets.sort_by(&:name).each do |pod_target|
               target_installer = PodTargetInstaller.new(sandbox, pod_target)
+              target_installer.umbrella_headers_by_dir = umbrella_headers_by_dir
               target_installer.install!
             end
 
@@ -277,7 +283,7 @@ module Pod
         #
         def development_pod_targets
           pod_targets.select do |pod_target|
-            sandbox.development_pods.keys.include?(pod_target.pod_name)
+            sandbox.local?(pod_target.pod_name)
           end
         end
 

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

@@ -20,6 +20,9 @@ module Pod
                 create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 create_module_map
                 create_umbrella_header
+              elsif target.uses_swift?
+                create_module_map
+                create_umbrella_header
               end
               # Because embedded targets live in their host target, CocoaPods
               # copies all of the embedded target's pod_targets to its host
@@ -60,6 +63,12 @@ module Pod
               'PODS_ROOT'                          => '$(SRCROOT)',
               'PRODUCT_BUNDLE_IDENTIFIER'          => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
               'SKIP_INSTALL'                       => 'YES',
+
+              # Needed to ensure that static libraries won't try to embed the swift stdlib,
+              # since there's no where to embed in for a static library.
+              # Not necessary for dynamic frameworks either, since the aggregate targets are never shipped
+              # on their own, and are always further embedded into an app target.
+              'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => 'NO',
             }
             super.merge(settings)
           end

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

@@ -58,9 +58,7 @@ module Pod
           # @return [void]
           #
           def refresh_file_accessors
-            file_accessors.each do |fa|
-              fa.path_list.read_file_system
-            end
+            file_accessors.map(&:path_list).uniq.each(&:read_file_system)
           end
 
           # Adds the source files of the Pods to the Pods project.
@@ -135,33 +133,41 @@ module Pod
           def link_headers
             UI.message '- Linking headers' do
               pod_targets.each do |pod_target|
+                # When integrating Pod as frameworks, built Pods are built into
+                # frameworks, whose headers are included inside the built
+                # framework. Those headers do not need to be linked from the
+                # sandbox.
+                next if pod_target.requires_frameworks? && pod_target.should_build?
+
+                headers_sandbox = Pathname.new(pod_target.pod_name)
+                added_build_headers = false
+                added_public_headers = false
+
                 pod_target.file_accessors.each do |file_accessor|
-                  framework_exp = /\.framework\//
-                  headers_sandbox = Pathname.new(file_accessor.spec.root.name)
-
-                  # When integrating Pod as frameworks, built Pods are built into
-                  # frameworks, whose headers are included inside the built
-                  # framework. Those headers do not need to be linked from the
-                  # sandbox.
-                  unless pod_target.requires_frameworks? && pod_target.should_build?
-                    pod_target.build_headers.add_search_path(headers_sandbox, pod_target.platform)
-                    sandbox.public_headers.add_search_path(headers_sandbox, pod_target.platform)
-
-                    header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
-                      pod_target.build_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp })
-                    end
+                  # Private headers will always end up in Pods/Headers/Private/PodA/*.h
+                  # This will allow for `""` imports to work.
+                  header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
+                    added_build_headers = true
+                    pod_target.build_headers.add_files(namespaced_path, files)
+                  end
 
-                    header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
-                      sandbox.public_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp })
-                    end
+                  # Public headers on the other hand will be added in Pods/Headers/Public/PodA/PodA/*.h
+                  # The extra folder is intentional in order for `<>` imports to work.
+                  header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
+                    added_public_headers = true
+                    sandbox.public_headers.add_files(namespaced_path, files)
                   end
 
                   unless pod_target.requires_frameworks?
                     vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
+                      added_public_headers = true
                       sandbox.public_headers.add_files(namespaced_path, files)
                     end
                   end
                 end
+
+                pod_target.build_headers.add_search_path(headers_sandbox, pod_target.platform) if added_build_headers
+                sandbox.public_headers.add_search_path(headers_sandbox, pod_target.platform) if added_public_headers
               end
             end
           end
@@ -176,7 +182,7 @@ module Pod
           #         specs platform combinations.
           #
           def file_accessors
-            @file_accessors ||= pod_targets.map(&:file_accessors).flatten.compact
+            @file_accessors ||= pod_targets.flat_map(&:file_accessors).compact
           end
 
           # Adds file references to the list of the paths returned by the file
@@ -304,15 +310,17 @@ module Pod
           #
           def header_mappings(headers_sandbox, file_accessor, headers)
             consumer = file_accessor.spec_consumer
+            header_mappings_dir = consumer.header_mappings_dir
             dir = headers_sandbox
             dir += consumer.header_dir if consumer.header_dir
 
             mappings = {}
             headers.each do |header|
+              next if header.to_s.include?('.framework/')
+
               sub_dir = dir
-              if consumer.header_mappings_dir
-                header_mappings_dir = file_accessor.path_list.root + consumer.header_mappings_dir
-                relative_path = header.relative_path_from(header_mappings_dir)
+              if header_mappings_dir
+                relative_path = header.relative_path_from(file_accessor.path_list.root + header_mappings_dir)
                 sub_dir += relative_path.dirname
               end
               mappings[sub_dir] ||= []

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

@@ -27,11 +27,11 @@ module Pod
               add_files_to_build_phases
               create_xcconfig_file
               create_test_xcconfig_files if target.contains_test_specifications?
-              if target.requires_frameworks?
-                unless target.static_framework?
-                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
+
+              if target.defines_module?
+                create_module_map do |generator|
+                  generator.headers.concat module_map_additional_headers
                 end
-                create_module_map
                 create_umbrella_header do |generator|
                   file_accessors = target.file_accessors
                   file_accessors = file_accessors.reject { |f| f.spec.test_specification? } if target.contains_test_specifications?
@@ -41,13 +41,19 @@ module Pod
                                          end
                                        else
                                          file_accessors.flat_map(&:public_headers).map(&:basename)
-                                       end
+                                      end
                 end
-                create_build_phase_to_symlink_header_folders
-                if target.static_framework?
-                  create_build_phase_to_move_static_framework_archive
+              end
+
+              if target.requires_frameworks?
+                unless target.static_framework?
+                  create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 end
+                create_build_phase_to_symlink_header_folders
+              elsif target.uses_swift?
+                add_swift_static_library_compatibility_header_phase
               end
+
               unless skip_pch?(target.non_test_specs)
                 path = target.prefix_header_path
                 file_accessors = target.file_accessors.reject { |f| f.spec.test_specification? }
@@ -64,6 +70,11 @@ module Pod
             end
           end
 
+          # @return [Hash<Pathname,Pathname>] A hash of all umbrella headers, grouped by the directory
+          #         the are stored in
+          #
+          attr_accessor :umbrella_headers_by_dir
+
           private
 
           # @param [Array<Specification>] specs
@@ -87,6 +98,9 @@ module Pod
               settings['PUBLIC_HEADERS_FOLDER_PATH'] = ''
             end
 
+            settings['PRODUCT_NAME'] = target.product_basename
+            settings['PRODUCT_MODULE_NAME'] = target.product_module_name
+
             settings['CODE_SIGN_IDENTITY[sdk=appletvos*]'] = ''
             settings['CODE_SIGN_IDENTITY[sdk=iphoneos*]'] = ''
             settings['CODE_SIGN_IDENTITY[sdk=watchos*]'] = ''
@@ -96,6 +110,7 @@ module Pod
             if target.swift_version
               settings['SWIFT_VERSION'] = target.swift_version
             end
+
             settings
           end
 
@@ -164,8 +179,8 @@ module Pod
 
               native_target = target.native_target_for_spec(consumer.spec)
               headers = file_accessor.headers
-              public_headers = file_accessor.public_headers
-              private_headers = file_accessor.private_headers
+              public_headers = file_accessor.public_headers.map(&:realpath)
+              private_headers = file_accessor.private_headers.map(&:realpath)
               other_source_files = file_accessor.source_files.reject { |sf| SOURCE_FILE_EXTENSIONS.include?(sf.extname) }
 
               {
@@ -259,8 +274,15 @@ module Pod
                 # requires frameworks. For tests we always use the test target name as the product name
                 # irrelevant to whether we use frameworks or not.
                 configuration.build_settings['PRODUCT_NAME'] = name
+                # Use xcode default product module name, which is $(PRODUCT_NAME:c99extidentifier)
+                # this gives us always valid name that is distinct from the parent spec module name
+                # which allow tests to use either import or @testable import to access the parent framework
+                configuration.build_settings.delete('PRODUCT_MODULE_NAME')
                 # We must codesign iOS XCTest bundles that contain binary frameworks to allow them to be launchable in the simulator
-                configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'YES' unless target.platform == :osx
+                unless target.platform == :osx
+                  configuration.build_settings['CODE_SIGNING_REQUIRED'] = 'YES'
+                  configuration.build_settings['CODE_SIGNING_ALLOWED'] = 'YES'
+                end
                 # For macOS we do not code sign the XCTest bundle because we do not code sign the frameworks either.
                 configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if target.platform == :osx
               end
@@ -269,6 +291,11 @@ module Pod
               create_test_target_embed_frameworks_script(test_type)
               create_test_target_copy_resources_script(test_type)
 
+              # Generate vanila Info.plist for test target similar to the one xcode gererates for new test target.
+              # This creates valid test bundle accessible at the runtime, allowing tests to load bundle resources
+              # defined in podspec.
+              create_info_plist_file(target.info_plist_path_for_test_type(test_type), native_test_target, '1.0', target.platform, :bndl)
+
               target.test_native_targets << native_test_target
             end
           end
@@ -321,14 +348,10 @@ module Pod
                 path = target.info_plist_path
                 path.dirname.mkdir unless path.dirname.exist?
                 info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
-                generator = Generator::InfoPlistFile.new(target.version, target.platform, :bndl)
-                update_changed_file(generator, info_plist_path)
-                add_file_to_support_group(info_plist_path)
+                create_info_plist_file(info_plist_path, bundle_target, target.version, target.platform, :bndl)
 
                 bundle_target.build_configurations.each do |c|
                   c.build_settings['PRODUCT_NAME'] = bundle_name
-                  relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
-                  c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
                   # Do not set the CONFIGURATION_BUILD_DIR for resource bundles that are only meant for test targets.
                   # This is because the test target itself also does not set this configuration build dir and it expects
                   # all bundles to be copied from the default path.
@@ -466,28 +489,6 @@ module Pod
             eos
           end
 
-          # Creates a build phase to put the static framework in the appropriate framework location
-          # Since Xcode does not provide template support for static library frameworks, we've built a static library
-          # of the form lib{LibraryName}.a. We need to move that to the framework location -
-          # {LibraryName}.framework/{LibraryName}.
-          #
-          # @return [void]
-          #
-          def create_build_phase_to_move_static_framework_archive
-            build_phase = native_target.new_shell_script_build_phase('Setup Static Framework')
-            build_phase.shell_script = <<-eos.strip_heredoc
-          mkdir -p "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules"
-          # The fat library archive is at a file symbolic link when archiving, so use -L option
-          rsync -tL "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
-          rsync -t "${MODULEMAP_FILE}" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/module.modulemap"
-          # If there's a .swiftmodule, copy it into the framework's Modules folder
-          rsync -tr "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}".swiftmodule "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/" 2>/dev/null || :
-          # If archiving, Headers copy is needed
-          rsync -tr "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.framework/Headers" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/" 2>/dev/null || :
-          rsync -tr "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.framework/PrivateHeaders" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/" 2>/dev/null || :
-            eos
-          end
-
           # Creates a prefix header file which imports `UIKit` or `Cocoa` according
           # to the platform of the target. This file also include any prefix header
           # content reported by the specification of the pods.
@@ -578,20 +579,6 @@ module Pod
             flags * ' '
           end
 
-          # Adds a reference to the given file in the support group of this target.
-          #
-          # @param  [Pathname] path
-          #         The path of the file to which the reference should be added.
-          #
-          # @return [PBXFileReference] the file reference of the added file.
-          #
-          def add_file_to_support_group(path)
-            pod_name = target.pod_name
-            dir = target.support_files_dir
-            group = project.pod_support_files_group(pod_name, dir)
-            group.new_file(path)
-          end
-
           def apply_xcconfig_file_ref_to_resource_bundle_targets(resource_bundle_targets, xcconfig_file_ref)
             resource_bundle_targets.each do |rsrc_target|
               rsrc_target.build_configurations.each do |rsrc_bc|
@@ -602,11 +589,15 @@ module Pod
 
           def create_module_map
             return super unless custom_module_map
+
             path = target.module_map_path
             UI.message "- Copying module map file to #{UI.path(path)}" do
-              unless path.exist? && FileUtils.identical?(custom_module_map, path)
-                FileUtils.cp(custom_module_map, path)
+              contents = custom_module_map.read
+              unless target.requires_frameworks?
+                contents.gsub!(/^(\s*)framework\s+(module[^{}]+){/, '\1\2[system] {')
               end
+              generator = Generator::Constant.new(contents)
+              update_changed_file(generator, path)
               add_file_to_support_group(path)
 
               native_target.build_configurations.each do |c|
@@ -616,6 +607,17 @@ module Pod
             end
           end
 
+          def module_map_additional_headers
+            return [] unless umbrella_headers_by_dir
+
+            other_paths = umbrella_headers_by_dir[target.module_map_path.dirname] - [target.umbrella_header_path]
+            other_paths.map do |module_map_path|
+              # exclude other targets umbrella headers, to avoid
+              # incomplete umbrella warnings
+              Generator::ModuleMap::Header.new(module_map_path.basename, nil, nil, nil, true)
+            end
+          end
+
           def create_umbrella_header
             return super unless custom_module_map
           end
@@ -667,6 +669,47 @@ module Pod
             end
           end
 
+          def support_files_group
+            pod_name = target.pod_name
+            dir = target.support_files_dir
+            project.pod_support_files_group(pod_name, dir)
+          end
+
+          # Adds a shell script phase, intended only for static library targets that contain swift,
+          # to copy the ObjC compatibility header (the -Swift.h file that the swift compiler generates)
+          # to the built products directory. Additionally, the script phase copies the module map, appending a `.Swift`
+          # submodule that references the (moved) compatibility header. Since the module map has been moved, the umbrella header
+          # is _also_ copied, so that it is sitting next to the module map. This is necessary for a successful archive build.
+          #
+          # @return [Void]
+          #
+          def add_swift_static_library_compatibility_header_phase
+            build_phase = native_target.new_shell_script_build_phase('Copy generated compatibility header')
+
+            relative_module_map_path = target.module_map_path.relative_path_from(target.sandbox.root)
+            relative_umbrella_header_path = target.umbrella_header_path.relative_path_from(target.sandbox.root)
+
+            build_phase.shell_script = <<-SH.strip_heredoc
+              COMPATIBILITY_HEADER_PATH="${BUILT_PRODUCTS_DIR}/Swift Compatibility Header/${PRODUCT_MODULE_NAME}-Swift.h"
+              MODULE_MAP_PATH="${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap"
+
+              ditto "${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h" "${COMPATIBILITY_HEADER_PATH}"
+              ditto "${PODS_ROOT}/#{relative_module_map_path}" "${MODULE_MAP_PATH}"
+              ditto "${PODS_ROOT}/#{relative_umbrella_header_path}" "${BUILT_PRODUCTS_DIR}"
+              printf "\\n\\nmodule ${PRODUCT_MODULE_NAME}.Swift {\\n  header \\"${COMPATIBILITY_HEADER_PATH}\\"\\n  requires objc\\n}\\n" >> "${MODULE_MAP_PATH}"
+            SH
+            build_phase.input_paths = %W(
+              ${DERIVED_SOURCES_DIR}/${PRODUCT_MODULE_NAME}-Swift.h
+              ${PODS_ROOT}/#{relative_module_map_path}
+              ${PODS_ROOT}/#{relative_umbrella_header_path}
+            )
+            build_phase.output_paths = %W(
+              ${BUILT_PRODUCTS_DIR}/${PRODUCT_MODULE_NAME}.modulemap
+              ${BUILT_PRODUCTS_DIR}/#{relative_umbrella_header_path.basename}
+              ${BUILT_PRODUCTS_DIR}/Swift\ Compatibility\ Header/${PRODUCT_MODULE_NAME}-Swift.h
+            )
+          end
+
           #-----------------------------------------------------------------------#
         end
       end

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

@@ -29,7 +29,7 @@ module Pod
                 add_copy_resources_script_phase(native_target)
                 UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(test_specs), native_target)
               end
-              specs = target.specs.reject(&:test_specification?)
+              specs = target.non_test_specs
               UserProjectIntegrator::TargetIntegrator.create_or_update_user_script_phases(script_phases_for_specs(specs), target.native_target)
             end
           end
@@ -58,13 +58,10 @@ module Pod
             unless resource_paths.empty?
               resource_paths_flattened = resource_paths.flatten.uniq
               input_paths = [script_path, *resource_paths_flattened]
-              output_paths = resource_paths_flattened.map do |input_path|
-                base_path = '${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}'
-                output_extension = UserProjectIntegrator::TargetIntegrator.output_extension_for_resource(File.extname(input_path))
-                File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
-              end
+              output_paths = UserProjectIntegrator::TargetIntegrator.resource_output_paths(resource_paths_flattened)
             end
-            UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.create_or_update_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
 
           # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
@@ -78,10 +75,11 @@ module Pod
             input_paths = []
             output_paths = []
             unless framework_paths.empty?
-              input_paths = [script_path, *framework_paths.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
-              output_paths = framework_paths.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
+              input_paths = [script_path, *framework_paths.flat_map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.compact]
+              output_paths = framework_paths.flat_map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.compact
             end
-            UserProjectIntegrator::TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.validate_input_output_path_limit(input_paths, output_paths)
+            UserProjectIntegrator::TargetIntegrator.create_or_update_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
 
           # @return [String] the message that should be displayed for the target
@@ -97,7 +95,7 @@ module Pod
           # @return [Array<Hash<Symbol=>String>] an array of all combined script phases from the specs.
           #
           def script_phases_for_specs(specs)
-            specs.map { |spec| spec.consumer(target.platform) }.map(&:script_phases).flatten
+            specs.flat_map { |spec| spec.consumer(target.platform).script_phases }
           end
         end
       end