cocoapods 1.6.2 → 1.7.0.beta.1

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

@@ -0,0 +1,75 @@
+module Pod
+  class Installer
+    class Xcode
+      # Wires up the dependencies for aggregate targets from the target installation results
+      #
+      class AggregateTargetDependencyInstaller
+        require 'cocoapods/native_target_extension.rb'
+
+        # @return [Hash{String => TargetInstallationResult}] The target installation results for pod targets.
+        #
+        attr_reader :pod_target_installation_results
+
+        # @return [Hash{String => TargetInstallationResult}] The target installation results for aggregate targets.
+        #
+        attr_reader :aggregate_target_installation_results
+
+        # @return [ProjectMetadataCache] The project metadata cache.
+        #
+        attr_reader :metadata_cache
+
+        # Initialize a new instance.
+        #
+        # @param [Hash{String => TargetInstallationResult}] aggregate_target_installation_results @see #aggregate_target_installation_results
+        # @param [Hash{String => TargetInstallationResult}] pod_target_installation_results @see #pod_target_installation_results
+        # @param [ProjectMetadataCache] metadata_cache @see #metadata_cache
+        #
+        def initialize(aggregate_target_installation_results, pod_target_installation_results, metadata_cache)
+          @aggregate_target_installation_results = aggregate_target_installation_results
+          @pod_target_installation_results = pod_target_installation_results
+          @metadata_cache = metadata_cache
+        end
+
+        def install!
+          aggregate_target_installation_results.values.each do |aggregate_target_installation_result|
+            aggregate_target = aggregate_target_installation_result.target
+            aggregate_native_target = aggregate_target_installation_result.native_target
+            project = aggregate_native_target.project
+            is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
+                [:app_extension, :watch_extension, :watch2_extension, :tv_extension, :messages_extension]).empty?
+            is_app_extension ||= aggregate_target.user_targets.any? { |ut| ut.common_resolved_build_setting('APPLICATION_EXTENSION_API_ONLY') == 'YES' }
+            configure_app_extension_api_only_to_native_target(aggregate_native_target) if is_app_extension
+            # Wire up dependencies that are part of inherit search paths for this aggregate target.
+            aggregate_target.search_paths_aggregate_targets.each do |search_paths_target|
+              aggregate_native_target.add_dependency(aggregate_target_installation_results[search_paths_target.name].native_target)
+            end
+            # Wire up all pod target dependencies to aggregate target.
+            aggregate_target.pod_targets.each do |pod_target|
+              if pod_target_installation_result = pod_target_installation_results[pod_target.name]
+                pod_target_native_target = pod_target_installation_result.native_target
+                aggregate_native_target.add_dependency(pod_target_native_target)
+                configure_app_extension_api_only_to_native_target(pod_target_native_target) if is_app_extension
+              else
+                # Hit the cache
+                cached_dependency = metadata_cache.target_label_by_metadata[pod_target.label]
+                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                Project.add_cached_dependency(aggregate_native_target, cached_dependency)
+              end
+            end
+          end
+        end
+
+        private
+
+        # Sets the APPLICATION_EXTENSION_API_ONLY build setting to YES for all
+        # configurations of the given native target.
+        #
+        def configure_app_extension_api_only_to_native_target(native_target)
+          native_target.build_configurations.each do |config|
+            config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'YES'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module Pod
               create_support_files_dir
               create_support_files_group
               create_xcconfig_file(native_target)
-              if target.requires_frameworks?
+              if target.host_requires_frameworks?
                 create_info_plist_file(target.info_plist_path, native_target, target.version, target.platform)
                 create_module_map(native_target)
                 create_umbrella_header(native_target)

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

@@ -13,7 +13,7 @@ module Pod
           attr_reader :sandbox
 
           # @return [Pod::Project]
-          #         The `Pods/Pods.xcodeproj` to install the app host into.
+          #         The project to install the app host into.
           #
           attr_reader :project
 
@@ -21,30 +21,42 @@ module Pod
           #
           attr_reader :platform
 
-          # @return [String] the name to use for this app host target.
+          # @return [String] the name of the sub group.
           #
-          attr_reader :name
+          attr_reader :subgroup_name
 
-          # @return [String] the name of the pod the app host installer will be installing within.
+          # @return [String] the name of the group the app host installer will be installing within.
           #
-          attr_reader :pod_name
+          attr_reader :group_name
+
+          # @return [String] the name of the app target label that will be used.
+          #
+          attr_reader :app_target_label
+
+          # @return [Boolean] whether the app host installer should add main.m
+          #
+          attr_reader :add_main
 
           # Initialize a new instance
           #
           # @param [Sandbox] sandbox @see #sandbox
           # @param [Pod::Project] project @see #project
           # @param [Platform] platform @see #platform
-          # @param [String] name @see #name
-          # @param [String] pod_name @see #pod_name
+          # @param [String] subgroup_name @see #subgroup_name
+          # @param [String] group_name @see #group_name
+          # @param [String] app_target_label see #app_target_label
+          # @param [Boolean] add_main see #add_main
           #
-          def initialize(sandbox, project, platform, name, pod_name)
+          def initialize(sandbox, project, platform, subgroup_name, group_name, app_target_label, add_main: true)
             @sandbox = sandbox
             @project = project
             @platform = platform
-            @name = name
-            @pod_name = pod_name
-            target_group = project.pod_group(pod_name)
-            @group = target_group[name] || target_group.new_group(name)
+            @subgroup_name = subgroup_name
+            @group_name = group_name
+            @app_target_label = app_target_label
+            @add_main = add_main
+            target_group = project.pod_group(group_name)
+            @group = target_group[subgroup_name] || target_group.new_group(subgroup_name)
           end
 
           # @return [PBXNativeTarget] the app host native target that was installed.
@@ -52,16 +64,16 @@ module Pod
           def install!
             platform_name = platform.name
             app_host_target = Pod::Generator::AppTargetHelper.add_app_target(project, platform_name, deployment_target,
-                                                                             name)
+                                                                             app_target_label)
             app_host_target.build_configurations.each do |configuration|
-              configuration.build_settings['PRODUCT_NAME'] = name
+              configuration.build_settings['PRODUCT_NAME'] = app_target_label
               configuration.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
               configuration.build_settings['CODE_SIGN_IDENTITY'] = '' if platform == :osx
               configuration.build_settings['CURRENT_PROJECT_VERSION'] = '1'
             end
 
-            Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, name)
-            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, name) if platform == :ios
+            Pod::Generator::AppTargetHelper.add_app_host_main_file(project, app_host_target, platform_name, @group, app_target_label) if add_main
+            Pod::Generator::AppTargetHelper.add_launchscreen_storyboard(project, app_host_target, @group, deployment_target, app_target_label) if platform == :ios
             additional_entries = platform == :ios ? ADDITIONAL_IOS_INFO_PLIST_ENTRIES : {}
             create_info_plist_file_with_sandbox(sandbox, app_host_info_plist_path, app_host_target, '1.0.0', platform,
                                                 :appl, additional_entries)
@@ -89,7 +101,7 @@ module Pod
           # @return [Pathname] The absolute path of the Info.plist to use for an app host.
           #
           def app_host_info_plist_path
-            project.path.dirname.+(name).+("#{name}-Info.plist")
+            project.path.dirname.+(subgroup_name).+("#{app_target_label}-Info.plist")
           end
 
           # @return [String] The deployment target.

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

@@ -14,7 +14,7 @@ module Pod
           #
           attr_reader :pod_targets
 
-          # @return [Project] The Pods project.
+          # @return [Project] The project to install the file references into.
           #
           attr_reader :pods_project
 
@@ -42,6 +42,7 @@ module Pod
           #
           def install!
             refresh_file_accessors
+            prepare_pod_groups
             add_source_files_references
             add_frameworks_bundles
             add_vendored_libraries
@@ -67,6 +68,19 @@ module Pod
             file_accessors.map(&:path_list).uniq.each(&:read_file_system)
           end
 
+          # Prepares the main groups to which all files will be added for the respective target
+          #
+          def prepare_pod_groups
+            file_accessors.each do |file_accessor|
+              pod_name = file_accessor.spec.name
+              next unless sandbox.local?(pod_name)
+              root_name = Specification.root_name(pod_name)
+              path = file_accessor.root
+              group = pods_project.group_for_spec(root_name)
+              group.set_path(path) unless group.path == path
+            end
+          end
+
           # Adds the source files of the Pods to the Pods project.
           #
           # @note   The source files are grouped by Pod and in turn by subspec
@@ -75,7 +89,7 @@ module Pod
           # @return [void]
           #
           def add_source_files_references
-            UI.message '- Adding source files to Pods project' do
+            UI.message '- Adding source files' do
               add_file_accessors_paths_to_pods_group(:source_files, nil, true)
             end
           end
@@ -85,7 +99,7 @@ module Pod
           # @return [void]
           #
           def add_frameworks_bundles
-            UI.message '- Adding frameworks to Pods project' do
+            UI.message '- Adding frameworks' do
               add_file_accessors_paths_to_pods_group(:vendored_frameworks, :frameworks)
             end
           end
@@ -95,7 +109,7 @@ module Pod
           # @return [void]
           #
           def add_vendored_libraries
-            UI.message '- Adding libraries to Pods project' do
+            UI.message '- Adding libraries' do
               add_file_accessors_paths_to_pods_group(:vendored_libraries, :frameworks)
             end
           end
@@ -108,14 +122,14 @@ module Pod
           # @return [void]
           #
           def add_resources
-            UI.message '- Adding resources to Pods project' do
+            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)
             end
           end
 
           def add_developer_files
-            UI.message '- Adding development pod helper files to Pods project' do
+            UI.message '- Adding development pod helper files' do
               file_accessors.each do |file_accessor|
                 pod_name = file_accessor.spec.name
                 next unless sandbox.local?(pod_name)
@@ -144,31 +158,21 @@ module Pod
                 # 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
-
-                file_accessors = pod_target.file_accessors.reject { |fa| fa.spec.test_specification? }
-                file_accessors.each do |file_accessor|
-                  # 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
+                next if pod_target.build_as_framework? && pod_target.should_build?
+
+                pod_target_header_mappings = pod_target.header_mappings_by_file_accessor.values
+                pod_target_header_mappings.each do |header_mappings|
+                  header_mappings.each do |namespaced_path, files|
                     pod_target.build_headers.add_files(namespaced_path, files)
                   end
+                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
+                public_header_mappings = pod_target.public_header_mappings_by_file_accessor.values
+                public_header_mappings.each do |header_mappings|
+                  header_mappings.each do |namespaced_path, files|
                     sandbox.public_headers.add_files(namespaced_path, files)
                   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
@@ -209,11 +213,11 @@ module Pod
               next if paths.empty?
 
               pod_name = file_accessor.spec.name
-              preserve_pod_file_structure_flag = (sandbox.local?(pod_name) || preserve_pod_file_structure)
+              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
               group = pods_project.group_for_spec(pod_name, group_key)
               paths.each do |path|
-                pods_project.add_file_reference(path, group, preserve_pod_file_structure_flag && reflect_file_system_structure, base_path)
+                pods_project.add_file_reference(path, group, preserve_pod_file_structure_flag, base_path)
               end
             end
           end
@@ -294,44 +298,6 @@ module Pod
             return result unless result.to_s == '' || result.to_s == '/'
           end
 
-          # Computes the destination sub-directory in the sandbox
-          #
-          # @param  [Pathname] headers_sandbox
-          #         The sandbox where the header links should be stored for this
-          #         Pod.
-          #
-          # @param  [Sandbox::FileAccessor] file_accessor
-          #         The consumer file accessor for which the headers need to be
-          #         linked.
-          #
-          # @param  [Array<Pathname>] headers
-          #         The absolute paths of the headers which need to be mapped.
-          #
-          # @return [Hash{Pathname => Array<Pathname>}] A hash containing the
-          #         headers folders as the keys and the absolute paths of the
-          #         header files as the values.
-          #
-          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 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] ||= []
-              mappings[sub_dir] << header
-            end
-            mappings
-          end
-
           #-----------------------------------------------------------------------#
         end
       end

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

@@ -0,0 +1,155 @@
+module Pod
+  class Installer
+    class Xcode
+      # Wires up the dependencies between targets from the target installation results
+      #
+      class PodTargetDependencyInstaller
+        require 'cocoapods/native_target_extension.rb'
+
+        # @return [TargetInstallationResults] The target installation results for pod targets.
+        #
+        attr_reader :pod_target_installation_results
+
+        # @return [ProjectMetadataCache] The metadata cache for targets.
+        #
+        attr_reader :metadata_cache
+
+        # Initialize a new instance.
+        #
+        # @param [TargetInstallationResults] pod_target_installation_results @see #pod_target_installation_results
+        # @param [ProjectMetadataCache] metadata_cache @see #metadata_cache
+        #
+        def initialize(pod_target_installation_results, metadata_cache)
+          @pod_target_installation_results = pod_target_installation_results
+          @metadata_cache = metadata_cache
+        end
+
+        def install!
+          # Wire up pod targets
+          pod_target_installation_results.values.each do |pod_target_installation_result|
+            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)
+
+            # 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)
+            end
+
+            # Wire up app native targets.
+            unless pod_target_installation_result.app_native_targets.empty?
+              wire_app_native_targets(pod_target, native_target, pod_target_installation_result,
+                                      pod_target_installation_results, project, frameworks_group, metadata_cache)
+            end
+          end
+        end
+
+        private
+
+        def wire_resource_bundle_targets(resource_bundle_targets, native_target, pod_target)
+          resource_bundle_targets.each do |resource_bundle_target|
+            native_target.add_dependency(resource_bundle_target)
+            if pod_target.build_as_dynamic_framework? && pod_target.should_build?
+              native_target.add_resources([resource_bundle_target.product_reference])
+            end
+          end
+        end
+
+        def wire_target_dependencies(pod_target, native_target, project,
+                                     pod_target_installation_results, metadata_cache, frameworks_group)
+          dependent_targets = pod_target.dependent_targets
+          dependent_targets.each do |dependent_target|
+            if installation_result = pod_target_installation_results[dependent_target.name]
+              dependent_project = installation_result.native_target.project
+              if dependent_project != project
+                project.add_subproject_reference(dependent_project, project.dependencies_group)
+              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]
+              project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+              Project.add_cached_dependency(native_target, cached_dependency)
+            end
+          end
+        end
+
+        def wire_test_native_targets(pod_target, installation_result, pod_target_installation_results, project, frameworks_group, 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|
+              test_native_target.add_dependency(test_resource_bundle_target)
+            end
+
+            test_dependent_targets = pod_target.test_dependent_targets_by_spec_name.fetch(test_spec.name, []).unshift(pod_target).uniq
+            test_dependent_targets.each do |test_dependent_target|
+              if dependency_installation_result = pod_target_installation_results[test_dependent_target.name]
+                dependent_test_project = dependency_installation_result.native_target.project
+                if dependent_test_project != project
+                  project.add_subproject_reference(dependent_test_project, project.dependencies_group)
+                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]
+                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                Project.add_cached_dependency(test_native_target, cached_dependency)
+              end
+            end
+          end
+        end
+
+        def wire_app_native_targets(pod_target, native_target, installation_result, pod_target_installation_results, project, frameworks_group, 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|
+              app_native_target.add_dependency(app_resource_bundle_target)
+            end
+
+            app_dependent_targets = pod_target.app_dependent_targets_by_spec_name.fetch(app_spec.name, []).unshift(pod_target).uniq
+            app_dependent_targets.each do |app_dependent_target|
+              if dependency_installation_result = pod_target_installation_results[app_dependent_target.name]
+                resource_bundle_native_targets = dependency_installation_result.app_resource_bundle_targets[app_spec.name]
+                unless resource_bundle_native_targets.nil?
+                  resource_bundle_native_targets.each do |app_resource_bundle_target|
+                    app_native_target.add_dependency(app_resource_bundle_target)
+                  end
+                end
+                dependency_project = dependency_installation_result.native_target.project
+                if dependency_project != project
+                  project.add_subproject_reference(dependency_project, project.dependencies_group)
+                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]
+                project.add_cached_subproject_reference(cached_dependency, project.dependencies_group)
+                Project.add_cached_dependency(native_target, cached_dependency)
+              end
+            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
+end