cocoapods 1.7.0.beta.1 → 1.7.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251d2a4d591d6dc009ac406e8ada03758161935b
-  data.tar.gz: ad7bfa1ad9867f8f6bb43f3006263cd83bd7cb6d
+  metadata.gz: 91a0b13ca93c3781d072736e1e1ff9d200dd43c9
+  data.tar.gz: '0265518cae07022eca43ac72ae9e011dbc9b93bc'
 SHA512:
-  metadata.gz: 2910aeb0f9ca431d6a516db10233f27353815bb137a6a59f6e5c5559e7c931cc8eff3834182a783b968cd226e0a4bb54f93fea49233d775c91d936428eb1a184
-  data.tar.gz: 81fcb38ee8e277d599cc09d0e7c1f1cefba5a23423d55d6722ea162afdb216379146bfe53e365e4e6269d3c02e4b817fcb0882741f2533bb25ef4ec713d5f6de
+  metadata.gz: faf6624fea1e6e33486154b899249c986058e121801e50109ec60fad4c4ee10f3b9669b5a814d2c1a7915e6013cc7d7870942a9b1898e28b53d049876b54388f
+  data.tar.gz: 9d102fcddf3d7e680fdfa3d9a6665be1a644ebf8b9489556f084c5d0d2fe71be5187f04427f2fd803730344c50c5b5cb30b18083406d3c942fac145d85b6f28a

data/CHANGELOG.md

@@ -4,6 +4,51 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.7.0.beta.2 (2019-03-08)
+
+##### Enhancements
+
+* Integrate `xcfilelist` input/output paths for script phases.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8585](https://github.com/CocoaPods/CocoaPods/pull/8585)
+
+##### Bug Fixes
+
+* Do not warn of `.swift-version` file being deprecated if pod does not use Swift.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8593](https://github.com/CocoaPods/CocoaPods/pull/8593)
+
+* Generate sibling targets for incremental installation.  
+  [Sebastian Shanus](https://github.com/sebastianv1) & [Igor Makarov](https://github.com/igor-makarov)
+  [#8577](https://github.com/CocoaPods/CocoaPods/issues/8577)
+
+* Validator should filter our app specs from subspec analysis.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8592](https://github.com/CocoaPods/CocoaPods/pull/8592)
+
+* Do not warn that `--swift-version` parameter is deprecated.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8586](https://github.com/CocoaPods/CocoaPods/pull/8586)
+
+* Include `bcsymbolmap` file output paths into script phase.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#8563](https://github.com/CocoaPods/CocoaPods/pull/8563)
+
+* Copy `bcsymbolmap` files into correct destination to avoid invalid app archives  
+  [florianbuerger](https://github.com/florianbuerger)
+  [#8558](https://github.com/CocoaPods/CocoaPods/pull/8558)
+
+* Fix: unset GIT_DIR and GIT_WORK_TREE for git operations  
+  [tripleCC](https://github.com/tripleCC)
+  [#7958](https://github.com/CocoaPods/CocoaPods/issues/7958)
+
+* Do not use spaces around variable assignment in generated embed framework script  
+  [florianbuerger](https://github.com/florianbuerger)
+  [#8548](https://github.com/CocoaPods/CocoaPods/pull/8548)
+
+* Do not link specs into user targets that are only used by app specs.  
+  [Samuel Giddins](https://github.com/segiddins)
+
 ## 1.7.0.beta.1 (2019-02-22)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.7.0.beta.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.7.0.beta.2'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -156,8 +156,8 @@ module Pod
 
           # Copies the bcsymbolmap files of a vendored framework
           install_bcsymbolmap() {
-              local bcsymbolmap_path = "$1"
-              local destination="${TARGET_BUILD_DIR}"
+              local bcsymbolmap_path="$1"
+              local destination="${BUILT_PRODUCTS_DIR}"
               echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${bcsymbolmap_path}\" \"${destination}\""
               rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${bcsymbolmap_path}" "${destination}"
           }

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

@@ -37,6 +37,7 @@ module Pod
         #         A warmed, immutable cache of all the dependencies in the {Podfile}
         #
         def self.from_podfile(podfile)
+          raise ArgumentError, 'Must be initialized with a podfile' unless podfile
           podfile_dependencies = []
           dependencies_by_target_definition = {}
           podfile.target_definition_list.each do |target_definition|

data/lib/cocoapods/installer/project_cache/project_cache_analyzer.rb

@@ -75,28 +75,42 @@ module Pod
             return full_install_results
           end
 
+          pod_targets_to_generate = Set[]
+          aggregate_targets_to_generate = Set[]
           added_targets, removed_targets = compute_added_and_removed_targets(target_by_label,
                                                                              cache_key_by_target_label.keys,
                                                                              cache.cache_key_by_target_label.keys)
           added_pod_targets, added_aggregate_targets = added_targets.partition { |target| target.is_a?(PodTarget) }
           removed_aggregate_targets = removed_targets.select { |target| target.is_a?(AggregateTarget) }
+          pod_targets_to_generate.merge(added_pod_targets)
+          aggregate_targets_to_generate.merge(added_aggregate_targets + removed_aggregate_targets)
 
           changed_targets = compute_changed_targets_from_cache(cache_key_by_target_label, target_by_label, cache)
           changed_pod_targets, changed_aggregate_targets = changed_targets.partition { |target| target.is_a?(PodTarget) }
+          pod_targets_to_generate.merge(changed_pod_targets)
+          aggregate_targets_to_generate.merge(changed_aggregate_targets)
 
           dirty_targets = compute_dirty_targets(pod_targets + aggregate_targets)
           dirty_pod_targets, dirty_aggregate_targets = dirty_targets.partition { |target| target.is_a?(PodTarget) }
+          pod_targets_to_generate.merge(dirty_pod_targets)
+          aggregate_targets_to_generate.merge(dirty_aggregate_targets)
 
-          pod_targets_to_generate = (changed_pod_targets + added_pod_targets + dirty_pod_targets).uniq
+          # Since multi xcodeproj will group targets by PodTarget#pod_name into individual projects, we
+          # need to append these "sibling" targets to the list of targets we need to generate before finalizing the total list,
+          # otherwise we will end up with missing targets.
+          #
+          sibling_pod_targets = compute_sibling_pod_targets(pod_targets, pod_targets_to_generate)
+          pod_targets_to_generate.merge(sibling_pod_targets)
 
           # We either return the full list of aggregate targets or none since the aggregate targets go into the Pods.xcodeproj
           # and so we need to regenerate all aggregate targets when regenerating Pods.xcodeproj.
-          aggregate_target_to_generate =
-            unless (changed_aggregate_targets + added_aggregate_targets + removed_aggregate_targets + dirty_aggregate_targets).empty?
+
+          total_aggregate_targets_to_generate =
+            unless aggregate_targets_to_generate.empty?
               aggregate_targets
             end
 
-          ProjectCacheAnalysisResult.new(pod_targets_to_generate, aggregate_target_to_generate, cache_key_by_target_label,
+          ProjectCacheAnalysisResult.new(pod_targets_to_generate.to_a, total_aggregate_targets_to_generate, cache_key_by_target_label,
                                          build_configurations, project_object_version)
         end
 
@@ -150,6 +164,11 @@ module Pod
             support_files_dir_exists && xcodeproj_exists
           end
         end
+
+        def compute_sibling_pod_targets(pod_targets, pod_targets_to_generate)
+          pod_targets_by_name = pod_targets.group_by(&:pod_name)
+          pod_targets_to_generate.flat_map { |t| pod_targets_by_name[t.pod_name] }
+        end
       end
     end
   end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -233,6 +233,8 @@ module Pod
               phase.shell_path = script_phase[:shell_path] || '/bin/sh'
               phase.input_paths = script_phase[:input_files]
               phase.output_paths = script_phase[:output_files]
+              phase.input_file_list_paths = script_phase[:input_file_lists]
+              phase.output_file_list_paths = script_phase[:output_file_lists]
               # At least with Xcode 10 `showEnvVarsInLog` is *NOT* set to any value even if it's checked and it only
               # gets set to '0' if the user has explicitly disabled this.
               if (show_env_vars_in_log = script_phase.fetch(:show_env_vars_in_log, '1')) == '0'
@@ -324,10 +326,15 @@ module Pod
           def framework_output_paths(framework_input_paths)
             framework_input_paths.flat_map do |framework_path|
               framework_output_path = "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{File.basename(framework_path.source_path)}"
-              dsym_path = if (dsym_input_path = framework_path.dsym_path)
-                            "${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_input_path)}"
-                          end
-              [framework_output_path, dsym_path]
+              dsym_output_path = if (dsym_input_path = framework_path.dsym_path)
+                                   "${DWARF_DSYM_FOLDER_PATH}/#{File.basename(dsym_input_path)}"
+                                 end
+              bcsymbol_output_paths = unless framework_path.bcsymbolmap_paths.nil?
+                                        framework_path.bcsymbolmap_paths.map do |bcsymbolmap_path|
+                                          "${BUILT_PRODUCTS_DIR}/#{File.basename(bcsymbolmap_path)}"
+                                        end
+                                      end
+              [framework_output_path, dsym_output_path, *bcsymbol_output_paths]
             end.compact.uniq
           end
         end

data/lib/cocoapods/resolver.rb

@@ -106,8 +106,8 @@ module Pod
           resolver_specs_by_target[target] = vertices.
             map do |vertex|
               payload = vertex.payload
-              non_library = (!explicit_dependencies.include?(vertex.name) || payload.test_specification? || payload.app_specification?) &&
-                (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.test_specification? }
+              non_library = (!explicit_dependencies.include?(vertex.name) || payload.non_library_specification?) &&
+                (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.non_library_specification? }
               spec_source = payload.respond_to?(:spec_source) && payload.spec_source
               ResolverSpecification.new(payload, non_library, spec_source)
             end.

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -21,12 +21,12 @@ module Pod
           @spec_source = spec_source
         end
 
-        def subspec_by_name(name = nil, raise_if_missing = true, include_test_specifications = false)
+        def subspec_by_name(name = nil, raise_if_missing = true, include_non_library_specifications = false)
           subspec =
             if !name || name == self.name
               self
             else
-              specification.subspec_by_name(name, raise_if_missing, include_test_specifications)
+              specification.subspec_by_name(name, raise_if_missing, include_non_library_specifications)
             end
           return unless subspec
 

data/lib/cocoapods/sources_manager.rb

@@ -106,7 +106,12 @@ module Pod
     def repo_git(args, include_error: false)
       Executable.capture_command('git', ['-C', repo] + args,
                                  :capture => include_error ? :merge : :out,
-                                 :env => { 'GIT_CONFIG' => nil }).
+                                 :env => {
+                                   'GIT_CONFIG' => nil,
+                                   'GIT_DIR' => nil,
+                                   'GIT_WORK_TREE' => nil,
+                                 }
+                                ).
         first.strip
     end
 

data/lib/cocoapods/validator.rb

@@ -125,7 +125,6 @@ module Pod
       $stdout.flush
 
       perform_linting
-      warn_for_dot_swift_file_deprecation
       perform_extensive_analysis(a_spec) if a_spec && !quick
 
       UI.puts ' -> '.send(result_color) << (a_spec ? a_spec.to_s : file.basename.to_s)
@@ -350,22 +349,11 @@ module Pod
       @results.concat(linter.results.to_a)
     end
 
-    # Warns the user to delete the `.swift-version` file in favor of the `swift_versions` DSL attribute. This is
-    # intentionally not a lint warning since we do not want to break existing setups and instead just soft deprecate
-    # this slowly.
-    #
-    def warn_for_dot_swift_file_deprecation
-      if swift_version.nil? && (!spec.nil? && spec.swift_versions.empty?) && !dot_swift_version.nil?
-        UI.warn 'Usage of the `.swift_version` file has been deprecated! Please delete the file and use the ' \
-          "`swift_versions` attribute within your podspec instead.\n".yellow
-      end
-    end
-
     # Perform analysis for a given spec (or subspec)
     #
     def perform_extensive_analysis(spec)
-      if spec.test_specification?
-        error('spec', "Validating a test spec (`#{spec.name}`) is not supported.")
+      if spec.non_library_specification?
+        error('spec', "Validating a non library spec (`#{spec.name}`) is not supported.")
         return false
       end
       validate_homepage(spec)
@@ -407,7 +395,7 @@ module Pod
     # Recursively perform the extensive analysis on all subspecs
     #
     def perform_extensive_subspec_analysis(spec)
-      spec.subspecs.reject(&:test_specification?).send(fail_fast ? :all? : :each) do |subspec|
+      spec.subspecs.reject(&:non_library_specification?).send(fail_fast ? :all? : :each) do |subspec|
         @subspec_name = subspec.name
         perform_extensive_analysis(subspec)
       end
@@ -487,6 +475,7 @@ module Pod
     def validate_swift_version
       return unless uses_swift?
       spec_swift_versions = spec.swift_versions.map(&:to_s)
+
       unless spec_swift_versions.empty?
         message = nil
         if !dot_swift_version.nil? && !spec_swift_versions.include?(dot_swift_version)
@@ -501,12 +490,21 @@ module Pod
         end
       end
 
-      if swift_version.nil? && spec_swift_versions.empty? && dot_swift_version.nil?
-        warning('swift',
-                'The validator used ' \
-                "Swift `#{DEFAULT_SWIFT_VERSION}` by default because no Swift version was specified. " \
-                'To specify a Swift version during validation, add the `swift_versions` attribute in your podspec. ' \
-                'Note that usage of the `--swift-version` parameter or a `.swift-version` file is now deprecated.')
+      if swift_version.nil? && spec.swift_versions.empty?
+        if !dot_swift_version.nil?
+          # The user will be warned to delete the `.swift-version` file in favor of the `swift_versions` DSL attribute.
+          # This is intentionally not a lint warning since we do not want to break existing setups and instead just soft
+          # deprecate this slowly.
+          #
+          UI.warn 'Usage of the `.swift_version` file has been deprecated! Please delete the file and use the ' \
+            "`swift_versions` attribute within your podspec instead.\n".yellow
+        else
+          warning('swift',
+                  'The validator used ' \
+                  "Swift `#{DEFAULT_SWIFT_VERSION}` by default because no Swift version was specified. " \
+                  'To specify a Swift version during validation, add the `swift_versions` attribute in your podspec. ' \
+                  'Note that usage of a `.swift-version` file is now deprecated.')
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.7.0.beta.1
+  version: 1.7.0.beta.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.beta.1
+        version: 1.7.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0.beta.1
+        version: 1.7.0.beta.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement