cocoapods 1.5.2 → 1.6.1

data/lib/cocoapods/installer/analyzer/locking_dependency_analyzer.rb

@@ -33,6 +33,8 @@ module Pod
           dependency_graph = Molinillo::DependencyGraph.new
 
           if lockfile
+            added_dependency_strings = Set.new
+
             explicit_dependencies = lockfile.dependencies
             explicit_dependencies.each do |dependency|
               dependency_graph.add_vertex(dependency.name, dependency, true)
@@ -40,7 +42,7 @@ module Pod
 
             pods = lockfile.to_hash['PODS'] || []
             pods.each do |pod|
-              add_to_dependency_graph(pod, [], dependency_graph, pods_to_unlock)
+              add_to_dependency_graph(pod, [], dependency_graph, pods_to_unlock, added_dependency_strings)
             end
 
             pods_to_update = pods_to_update.flat_map do |u|
@@ -51,6 +53,11 @@ module Pod
             pods_to_update.each do |u|
               dependency_graph.detach_vertex_named(u)
             end
+
+            dependency_graph.each do |vertex|
+              next unless dep = vertex.payload
+              dep.podspec_repo ||= lockfile.spec_repo(dep.root_name)
+            end
           end
 
           dependency_graph
@@ -67,7 +74,8 @@ module Pod
 
         private
 
-        def self.add_child_vertex_to_graph(dependency_string, parents, dependency_graph, pods_to_unlock)
+        def self.add_child_vertex_to_graph(dependency_string, parents, dependency_graph, pods_to_unlock, added_dependency_strings)
+          return unless added_dependency_strings.add?(dependency_string)
           dependency = Dependency.from_string(dependency_string)
           if pods_to_unlock.include?(dependency.root_name)
             dependency = Dependency.new(dependency.name)
@@ -78,14 +86,14 @@ module Pod
           dependency
         end
 
-        def self.add_to_dependency_graph(object, parents, dependency_graph, pods_to_unlock)
+        def self.add_to_dependency_graph(object, parents, dependency_graph, pods_to_unlock, added_dependency_strings)
           case object
           when String
-            add_child_vertex_to_graph(object, parents, dependency_graph, pods_to_unlock)
+            add_child_vertex_to_graph(object, parents, dependency_graph, pods_to_unlock, added_dependency_strings)
           when Hash
             object.each do |key, value|
-              dependency = add_child_vertex_to_graph(key, parents, dependency_graph, pods_to_unlock)
-              value.each { |v| add_to_dependency_graph(v, [dependency.name], dependency_graph, pods_to_unlock) }
+              dependency = add_child_vertex_to_graph(key, parents, dependency_graph, pods_to_unlock, added_dependency_strings)
+              value.each { |v| add_to_dependency_graph(v, [dependency.name], dependency_graph, pods_to_unlock, added_dependency_strings) }
             end
           end
         end

data/lib/cocoapods/installer/analyzer/pod_variant.rb

@@ -38,6 +38,7 @@ module Pod
           @test_specs = test_specs
           @platform = platform
           @requires_frameworks = requires_frameworks
+          @hash = [specs, platform, requires_frameworks].hash
         end
 
         # @note Test specs are intentionally not included as part of the equality for pod variants since a
@@ -48,9 +49,9 @@ module Pod
         #
         def ==(other)
           self.class == other.class &&
-            specs == other.specs &&
+            requires_frameworks == other.requires_frameworks &&
             platform == other.platform &&
-            requires_frameworks == other.requires_frameworks
+            specs == other.specs
         end
         alias_method :eql?, :==
 
@@ -59,9 +60,7 @@ module Pod
         # This adds support to make instances usable as Hash keys.
         #
         # @!visibility private
-        def hash
-          [specs, platform, requires_frameworks].hash
-        end
+        attr_reader :hash
       end
     end
   end

data/lib/cocoapods/installer/analyzer/sandbox_analyzer.rb

@@ -42,27 +42,16 @@ module Pod
 
         alias_method :update_mode?, :update_mode
 
-        # @return [Lockfile] The lockfile of the installation as a fall-back if
-        #         there is no sandbox manifest. This is indented as a temporary
-        #         solution to prevent the full re-installation from users which
-        #         are upgrading from CP < 0.17.
-        #
-        # @todo   Remove for CP 0.18.
-        #
-        attr_reader :lockfile
-
         # Init a new SandboxAnalyzer
         #
         # @param [Sandbox] sandbox @see sandbox
         # @param [Array<Specifications>] specs @see specs
         # @param [Bool] update_mode @see update_mode
-        # @param [Lockfile] lockfile @see lockfile
         #
-        def initialize(sandbox, specs, update_mode, lockfile = nil)
+        def initialize(sandbox, specs, update_mode)
           @sandbox = sandbox
           @specs = specs
           @update_mode = update_mode
-          @lockfile = lockfile
         end
 
         # Performs the analysis to the detect the state of the sandbox respect
@@ -114,7 +103,7 @@ module Pod
         #
         def pod_added?(pod)
           return true if resolved_pods.include?(pod) && !sandbox_pods.include?(pod)
-          return true unless folder_exist?(pod)
+          return true if !folder_exist?(pod) && !sandbox.local?(pod)
           false
         end
 
@@ -164,7 +153,7 @@ module Pod
         # @return [Lockfile] The manifest to use for the sandbox.
         #
         def sandbox_manifest
-          sandbox.manifest || lockfile
+          sandbox.manifest
         end
 
         #--------------------------------------#

data/lib/cocoapods/installer/analyzer/specs_state.rb

@@ -59,10 +59,14 @@ module Pod
         # @return [void]
         #
         def print
-          added    .sort.each { |pod| UI.message('A'.green + " #{pod}", '', 2) }
-          deleted  .sort.each { |pod| UI.message('R'.red + " #{pod}", '', 2) }
-          changed  .sort.each { |pod| UI.message('M'.yellow + " #{pod}", '', 2) }
-          unchanged.sort.each { |pod| UI.message('-' + " #{pod}", '', 2) }
+          states = %i(added deleted changed unchanged)
+          lines(states).each do |line|
+            UI.message(line, '', 2)
+          end
+        end
+
+        def to_s(states: %i(added deleted changed unchanged))
+          lines(states).join("\n")
         end
 
         # Adds the name of a Pod to the give state.
@@ -78,6 +82,26 @@ module Pod
         def add_name(name, state)
           send(state) << Specification.root_name(name)
         end
+
+        private
+
+        # @return [Array<String>] A description of changes for the given states,
+        #                         one per line
+        #
+        def lines(states)
+          prefixes = {
+            :added     => 'A'.green,
+            :deleted   => 'R'.red,
+            :changed   => 'M'.yellow,
+            :unchanged => '-',
+          }
+
+          states.flat_map do |state|
+            send(state).sort.map do |pod|
+              prefixes[state.to_sym] + " #{pod}"
+            end
+          end
+        end
       end
     end
   end

data/lib/cocoapods/installer/analyzer/target_inspection_result.rb

@@ -5,40 +5,53 @@ module Pod
         # @return [TargetDefinition] the target definition, whose project was
         #         inspected
         #
-        attr_accessor :target_definition
+        attr_reader :target_definition
 
-        # @return [Pathname] the path of the user project that the
-        #         #target_definition should integrate
+        # @return [Xcodeproj::Project] the user's Xcode project
         #
-        attr_accessor :project_path
+        attr_reader :project
 
         # @return [Array<String>] the uuid of the user's targets
         #
-        attr_accessor :project_target_uuids
+        attr_reader :project_target_uuids
 
         # @return [Hash{String=>Symbol}] A hash representing the user build
         #         configurations where each key corresponds to the name of a
         #         configuration and its value to its type (`:debug` or
         #         `:release`).
         #
-        attr_accessor :build_configurations
+        attr_reader :build_configurations
 
         # @return [Platform] the platform of the user targets
         #
-        attr_accessor :platform
+        attr_reader :platform
 
         # @return [Array<String>] the architectures used by user's targets
         #
-        attr_accessor :archs
+        attr_reader :archs
 
-        # @return [Bool] whether frameworks are recommended for the integration
-        #         due to the presence of Swift source in the user's targets
+        # @return [Pathname] the path to the root of the project containing the user target
         #
-        attr_accessor :recommends_frameworks
+        attr_reader :client_root
 
-        # @return [Xcodeproj::Project] the user's Xcode project
-        #
-        attr_accessor :project
+        # Initialize a new instance
+        #
+        # @param [TargetDefinition] target_definition @see #target_definition
+        # @param [Xcodeproj::Project] project @see #project
+        # @param [Array<String>] project_target_uuids @see #project_target_uuids
+        # @param [Hash{String=>Symbol}] build_configurations @see #build_configurations
+        # @param [Platform] platform @see #platform
+        # @param [Array<String>] archs @see #archs
+        #
+        def initialize(target_definition, project, project_target_uuids, build_configurations, platform, archs)
+          @target_definition = target_definition
+          @project = project
+          @project_target_uuids = project_target_uuids
+          @build_configurations = build_configurations
+          @platform = platform
+          @archs = archs
+          @client_root = project.project_dir.realpath
+        end
       end
     end
   end

data/lib/cocoapods/installer/analyzer/target_inspector.rb

@@ -32,22 +32,21 @@ module Pod
         #
         # @raise If no `user_project` is set
         #
-        # @return [TargetInspectionResult]
+        # @return [TargetInspectionResult] the result of the inspection of the target definition within the user project
         #
         def compute_results(user_project)
           raise ArgumentError, 'Cannot compute results without a user project set' unless user_project
 
           targets = compute_targets(user_project)
+          project_target_uuids = targets.map(&:uuid)
+          build_configurations = compute_build_configurations(targets)
+          platform = compute_platform(targets)
+          archs = compute_archs(targets)
+          swift_version = compute_swift_version_from_targets(targets)
 
-          result = TargetInspectionResult.new
-          result.target_definition = target_definition
-          result.project_path = user_project.path
-          result.project_target_uuids = targets.map(&:uuid)
-          result.build_configurations = compute_build_configurations(targets)
-          result.platform = compute_platform(targets)
-          result.archs = compute_archs(targets)
-          result.project = user_project
-          result.target_definition.swift_version = compute_swift_version_from_targets(targets)
+          result = TargetInspectionResult.new(target_definition, user_project, project_target_uuids,
+                                              build_configurations, platform, archs)
+          result.target_definition.swift_version = swift_version
           result
         end
 
@@ -219,7 +218,14 @@ module Pod
         #
         def compute_swift_version_from_targets(targets)
           versions_to_targets = targets.inject({}) do |memo, target|
-            versions = target.resolved_build_setting('SWIFT_VERSION').values
+            # User project may have an xcconfig that specifies the `SWIFT_VERSION`. We first check if that is true and
+            # that the xcconfig file actually exists. After the first integration the xcconfig set is most probably
+            # the one that was generated from CocoaPods. See https://github.com/CocoaPods/CocoaPods/issues/7731 for
+            # more details.
+            resolve_against_xcconfig = target.build_configuration_list.build_configurations.all? do |bc|
+              !bc.base_configuration_reference.nil? && File.exist?(bc.base_configuration_reference.real_path)
+            end
+            versions = target.resolved_build_setting('SWIFT_VERSION', resolve_against_xcconfig).values
             versions.each do |version|
               memo[version] = [] if memo[version].nil?
               memo[version] << target.name unless memo[version].include? target.name