cocoapods 1.9.0.beta.2 → 1.9.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af00d9cda4270d38359bb91efda3e7eeadfa605dea256f99070cf72368bf4090
-  data.tar.gz: cb5b627c35b676ea0a587ca0abf64e13ae33957d8406e228633ecae22550412f
+  metadata.gz: '090f2135af901aa68538da5553e60544a3a6426353296708272dfd57717bce8d'
+  data.tar.gz: 9d6a6cfa64727bce678f7c66b8b985f293c78fc0e3bd7d79b8d8c9b0d2a695a8
 SHA512:
-  metadata.gz: ad1be879990e2150bf9d6f7dcfbba749ce76b3fde68c212f0e0de5751e3a3ebdd55a51d627bac1f5efbdf008580e8440978e63ac9a8bf30022fbd4bc87ce531a
-  data.tar.gz: f545c4630dd73698f9d95664a1ee5acfef3cf83972b012696b0468b18cc5fda2b3596d2bbe1a34d0b77b4cbba0e6602496e933dd9adc14e80de566a6fc2a5ddc
+  metadata.gz: 64d5011e5653537b95d7d6e32843289b93f604d36b5fefce4d2b7bb14d7ac3dd0b0cf309ba9e530e2d58f9bc7e7fbb67a31659e0afcdc66782906a00f201f165
+  data.tar.gz: 94242285df5c8147d52e88c3b5e72e4993955ae6546550085c0a1e457dad67ec56372a36e3790f2d302ac191d3a974b7ae11bb7dcc89b4f5a643f325f6cf2437

data/CHANGELOG.md

@@ -4,6 +4,40 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.9.0.beta.3 (2020-02-04)
+
+##### Enhancements
+
+* PathList optimizations related to file system reads.  
+  [manuyavuz](https://github.com/manuyavuz)
+  [#9428](https://github.com/CocoaPods/CocoaPods/pull/9428)
+
+##### Bug Fixes
+
+* Apply Xcode 11 `XCTUnwrap` fix to library and framework targets.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9500](https://github.com/CocoaPods/CocoaPods/pull/9500)
+
+* Fix resources script when building a project from a symlink.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#9423](https://github.com/CocoaPods/CocoaPods/issues/9423)
+
+* Fix `pod install` crash on projects with atypical configuration names.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#9465](https://github.com/CocoaPods/CocoaPods/pull/9465)
+
+* Fix an issue that caused iOS archives to be invalid when including a vendored XCFramework  
+  [Eric Amorde](https://github.com/amorde)
+  [#9458](https://github.com/CocoaPods/CocoaPods/issues/9458)
+
+* Fix a bug where an incremental install missed library resources.  
+  [Igor Makarov](https://github.com/igor-makarov)
+  [#9431](https://github.com/CocoaPods/CocoaPods/pull/9431)
+
+* Fix an issue that caused an incorrect warning to be emitted for CLI targets with static libraries  
+  [Eric Amorde](https://github.com/amorde)
+  [#9498](https://github.com/CocoaPods/CocoaPods/issues/9498)
+
 ## 1.9.0.beta.2 (2019-12-17)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -216,7 +216,7 @@ EOS
 if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
 then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
-  OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
+  OTHER_XCASSETS=$(find -L "$PWD" -iname "*.xcassets" -type d)
   while read line; do
     if [[ $line != "${PODS_ROOT}*" ]]; then
       XCASSET_FILES+=("$line")

data/lib/cocoapods/generator/prepare_artifacts_script.rb

@@ -117,7 +117,7 @@ module Pod
             fi
 
             local record_artifact=${2:-true}
-            local destination="${TARGET_BUILD_DIR}"
+            local destination="${CONFIGURATION_BUILD_DIR}"
 
             if [ -L "${source}" ]; then
               echo "Symlinked..."

data/lib/cocoapods/installer/analyzer.rb

@@ -334,15 +334,16 @@ module Pod
       #
       def analyze_host_targets_in_podfile(aggregate_targets, embedded_aggregate_targets)
         target_definitions_by_uuid = {}
-        cli_host_with_frameworks = []
+        cli_host_with_dynamic_linkage = []
         cli_product_type = 'com.apple.product-type.tool'
         # Collect aggregate target definitions by uuid to later lookup host target
         # definitions and verify their compatibility with their embedded targets
         aggregate_targets.each do |target|
           target.user_targets.each do |user_target|
-            target_definitions_by_uuid[user_target.uuid] = target.target_definition
-            if user_target.product_type == cli_product_type
-              cli_host_with_frameworks << user_target
+            target_definition = target.target_definition
+            target_definitions_by_uuid[user_target.uuid] = target_definition
+            if user_target.product_type == cli_product_type && target_definition.build_type.linkage == :dynamic
+              cli_host_with_dynamic_linkage << user_target
             end
           end
         end
@@ -368,10 +369,10 @@ module Pod
           end
         end
 
-        unless cli_host_with_frameworks.empty?
-          UI.warn "The Podfile contains command line tool target(s) (#{cli_host_with_frameworks.map(&:name).to_sentence}) which are attempting to integrate dynamic frameworks." \
+        unless cli_host_with_dynamic_linkage.empty?
+          UI.warn "The Podfile contains command line tool target(s) (#{cli_host_with_dynamic_linkage.map(&:name).to_sentence}) which are attempting to integrate dynamic frameworks or libraries." \
             "\n" \
-            'This may not behave as expected, because command line tools are usually distributed as a single binary and cannot contain their own dynamic frameworks.'
+            'This may not behave as expected, because command line tools are usually distributed as a single binary and cannot contain their own dynamic dependencies.'
         end
 
         unless embedded_targets_missing_hosts.empty?

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

@@ -51,10 +51,13 @@ module Pod
               return :project if (other.key_hash.keys - key_hash.keys).any?
               return :project if other.key_hash['CHECKSUM'] != key_hash['CHECKSUM']
               return :project if other.key_hash['SPECS'] != key_hash['SPECS']
-              return :project if other.key_hash['FILES'] != key_hash['FILES']
               return :project if other.key_hash['PROJECT_NAME'] != key_hash['PROJECT_NAME']
             end
 
+            this_files = key_hash['FILES']
+            other_files = other.key_hash['FILES']
+            return :project if this_files != other_files
+
             this_build_settings = key_hash['BUILD_SETTINGS_CHECKSUM']
             other_build_settings = other.key_hash['BUILD_SETTINGS_CHECKSUM']
             return :project if this_build_settings != other_build_settings
@@ -155,7 +158,14 @@ module Pod
             build_settings[configuration] = Digest::MD5.hexdigest(aggregate_target.build_settings(configuration).xcconfig.to_s)
           end
 
-          TargetCacheKey.new(sandbox, :aggregate, 'BUILD_SETTINGS_CHECKSUM' => build_settings)
+          contents = {
+            'BUILD_SETTINGS_CHECKSUM' => build_settings,
+          }
+          if aggregate_target.includes_resources?
+            relative_file_paths = aggregate_target.resource_paths_by_config.values.flatten.uniq
+            contents['FILES'] = relative_file_paths.sort_by(&:downcase)
+          end
+          TargetCacheKey.new(sandbox, :aggregate, contents)
         end
       end
     end

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

@@ -65,7 +65,10 @@ module Pod
           # @return [void]
           #
           def refresh_file_accessors
-            file_accessors.map(&:path_list).uniq.each(&:read_file_system)
+            file_accessors.reject do |file_accessor|
+              pod_name = file_accessor.spec.name
+              sandbox.local?(pod_name)
+            end.map(&:path_list).uniq.each(&:read_file_system)
           end
 
           # Prepares the main groups to which all files will be added for the respective target

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

@@ -163,8 +163,10 @@ module Pod
           def remove_pod_target_xcconfig_overrides_from_target(build_settings_by_config, native_target)
             native_target.build_configurations.each do |configuration|
               build_settings = build_settings_by_config[target.user_build_configurations[configuration.name]]
-              build_settings.merged_pod_target_xcconfigs.each_key do |setting|
-                configuration.build_settings.delete(setting)
+              unless build_settings.nil?
+                build_settings.merged_pod_target_xcconfigs.each_key do |setting|
+                  configuration.build_settings.delete(setting)
+                end
               end
             end
           end

data/lib/cocoapods/sandbox/path_list.rb

@@ -51,12 +51,15 @@ module Pod
         unless root.exist?
           raise Informative, "Attempt to read non existent folder `#{root}`."
         end
-
         dirs = []
         files = []
         root_length = root.cleanpath.to_s.length + File::SEPARATOR.length
-        Find.find(root.to_s) do |f|
+        escaped_root = escape_path_for_glob(root)
+        Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH).each do |f|
           directory = File.directory?(f)
+          # Ignore `.` and `..` directories
+          next if directory && f =~ /\.\.?$/
+
           f = f.slice(root_length, f.length - root_length)
           next if f.nil?
 
@@ -214,6 +217,25 @@ module Pod
         end
       end
 
+      # Escapes the glob metacharacters from a given path so it can used in
+      # Dir#glob and similar methods.
+      #
+      # @note   See CocoaPods/CocoaPods#862.
+      #
+      # @param  [String, Pathname] path
+      #         The path to escape.
+      #
+      # @return [Pathname] The escaped path.
+      #
+      def escape_path_for_glob(path)
+        result = path.to_s
+        characters_to_escape = ['[', ']', '{', '}', '?', '*']
+        characters_to_escape.each do |character|
+          result.gsub!(character, "\\#{character}")
+        end
+        Pathname.new(result)
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods/target/build_settings.rb

@@ -492,9 +492,15 @@ module Pod
         attr_reader :test_xcconfig
         alias test_xcconfig? test_xcconfig
 
+        # @return [Boolean]
+        #   whether settings are being generated for an application bundle
+        #
         attr_reader :app_xcconfig
         alias app_xcconfig? app_xcconfig
 
+        # @return [Boolean]
+        #   whether settings are being generated for an library bundle
+        #
         attr_reader :library_xcconfig
         alias library_xcconfig? library_xcconfig
 
@@ -683,6 +689,12 @@ module Pod
           file_accessors.flat_map(&:vendored_xcframeworks).map { |path| Xcode::XCFramework.new(path) }
         end
 
+        # @return [Array<String>]
+        define_build_settings_method :system_framework_search_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
+          return ['$(PLATFORM_DIR)/Developer/usr/lib'] if should_apply_xctunwrap_fix?
+          []
+        end
+
         #-------------------------------------------------------------------------#
 
         # @!group Libraries
@@ -737,16 +749,18 @@ module Pod
 
         # @return [Array<String>]
         define_build_settings_method :library_search_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
-          return [] if library_xcconfig? && target.build_as_static?
+          library_search_paths = should_apply_xctunwrap_fix? ? ['$(PLATFORM_DIR)/Developer/usr/lib'] : []
+          return library_search_paths if library_xcconfig? && target.build_as_static?
 
-          vendored = library_search_paths_to_import.dup
-          vendored.concat dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_dynamic_library_search_paths }
+          library_search_paths.concat library_search_paths_to_import.dup
+          library_search_paths.concat dependent_targets.flat_map { |pt| pt.build_settings[@configuration].vendored_dynamic_library_search_paths }
           if library_xcconfig?
-            vendored.delete(target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE))
+            library_search_paths.delete(target.configuration_build_dir(CONFIGURATION_BUILD_DIR_VARIABLE))
           else
-            vendored.concat(dependent_targets.flat_map { |pt| pt.build_settings[@configuration].library_search_paths_to_import })
+            library_search_paths.concat(dependent_targets.flat_map { |pt| pt.build_settings[@configuration].library_search_paths_to_import })
           end
-          vendored
+
+          library_search_paths
         end
 
         # @return [Array<String>]
@@ -837,6 +851,7 @@ module Pod
         define_build_settings_method :swift_include_paths, :build_setting => true, :memoized => true, :sorted => true, :uniqued => true do
           paths = dependent_targets.flat_map { |pt| pt.build_settings[@configuration].swift_include_paths_to_import }
           paths.concat swift_include_paths_to_import if non_library_xcconfig?
+          paths.concat ['$(PLATFORM_DIR)/Developer/usr/lib'] if should_apply_xctunwrap_fix?
           paths
         end
 
@@ -966,6 +981,20 @@ module Pod
           end
         end
 
+        # Xcode 11 causes an issue with frameworks or libraries before 12.2 deployment target that link or are part of
+        # test bundles that use XCTUnwrap. Apple has provided an official work around for this.
+        #
+        # @see https://developer.apple.com/documentation/xcode_release_notes/xcode_11_release_notes
+        #
+        # @return [Boolean] Whether to apply the fix or not.
+        #
+        define_build_settings_method :should_apply_xctunwrap_fix?, :memoized => true do
+          library_xcconfig? &&
+            target.platform.name == :ios &&
+            Version.new(target.platform.deployment_target) < Version.new('12.2') &&
+            frameworks_to_import.include?('XCTest')
+        end
+
         #-------------------------------------------------------------------------#
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.9.0.beta.2
+  version: 1.9.0.beta.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-02-04 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.9.0.beta.2
+        version: 1.9.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0.beta.2
+        version: 1.9.0.beta.3
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement