cocoapods 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 654dba8405c2e6c2e3d62eb4bfdaf1c59eae5d6ff8c3aa485d439a62d834247d
-  data.tar.gz: bfbe39709a5c0b3bcdb5bf7e7e19a434425233f48322cb8d0c472a04916c71c0
+  metadata.gz: '0538f666ff652a383411cd5c3448e0ce028dc830ed2a159c008f6dacac3eb4d6'
+  data.tar.gz: afc9d2c684bff3ca4b3a4b49d18a84f3ad8c8b45a72a01fdd62e883465f9dac2
 SHA512:
-  metadata.gz: d3f40e8504678a8698895338e9fed53f7ed494b4f619cd852f24e01e8a0aa17b9d571508a01624b92fc8f4ad37221cff6d94d3c41cff553d6b2d3d4325ab2e3a
-  data.tar.gz: e45221290d9460f8b8f5ce6dd310aeee02294349627fa146f41e0de6c22456344d2b2035251d3f46768fe3fdac95e69e37d055c02b1e0864c303b0111fa91f9e
+  metadata.gz: 5f7792c323359d4ac642397c39f1834bcac25271510a706e79bc148a492bf4afe81b6e1e13c6581baae9afe42939838adcd340b002670cd4865b59939468ecff
+  data.tar.gz: 4c11e434c9d003eb26e339d44e8733314977d00c2637c3dcfbfd132836d3aaf6044aa0abae6f5fe3bc5a15daa272a54ba1b88db5d46b00fd9cfc2ce73d575703

data/CHANGELOG.md

@@ -4,6 +4,67 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.5.2 (2018-05-09)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* None.  
+
+
+## 1.5.1 (2018-05-07)
+
+##### Enhancements
+
+* Improve performance of the dependency resolver by removing duplicates for dependency nodes.
+  [Jacek Suliga](https://github.com/jmkk)
+
+##### Bug Fixes
+
+* Do not include test dependencies input and output paths.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7688](https://github.com/CocoaPods/CocoaPods/pull/7688)
+
+* Remove [system] declaration attribute from generated module maps.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7589](https://github.com/CocoaPods/CocoaPods/issues/7589)
+
+* Properly namespace Info.plist names during target installation.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7611](https://github.com/CocoaPods/CocoaPods/pull/7611)
+
+* Always generate FRAMEWORK_SEARCH_PATHS for vendored_frameworks.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7591](https://github.com/CocoaPods/CocoaPods/issues/7591)
+
+* Fix modular header access to header_dir's.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7597](https://github.com/CocoaPods/CocoaPods/issues/7597)
+
+* Fix static framework dependent target double linking without `use_frameworks`.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7592](https://github.com/CocoaPods/CocoaPods/issues/7592)
+
+* Make modular header private header access consistent with frameworks and static libraries.  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7596](https://github.com/CocoaPods/CocoaPods/issues/7596)
+
+* Inhibit warnings for all dependencies during validation except for the one being validated.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7434](https://github.com/CocoaPods/CocoaPods/issues/7434)
+
+* Prevent duplicated targets from being stripped out from the framework search paths.  
+  [Liquidsoul](https://github.com/liquidsoul)
+  [#7644](https://github.com/CocoaPods/CocoaPods/pull/7644)
+
+* Fix `assetcatalog_generated_info.plist` path in copy resources phase.  
+  [Maxime Le Moine](https://github.com/MaximeLM)
+  [#7590](https://github.com/CocoaPods/CocoaPods/issues/7590)
+
+
 ## 1.5.0 (2018-04-04)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -215,7 +215,7 @@ then
   if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
     printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
   else
-    printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_BUILD_DIR}/assetcatalog_generated_info.plist"
+    printf "%s\\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
   fi
 fi
 EOS

data/lib/cocoapods/generator/module_map.rb

@@ -90,12 +90,9 @@ module Pod
       end
 
       # The suffix attributes to `module`.
-      # Ensures that library module maps are treated as `system` modules,
-      # supressing warnings when imported, as is done for header imports given via `-isystem`.
       #
       def module_declaration_attributes
-        return '' if target.requires_frameworks?
-        ' [system]'
+        ''
       end
     end
   end

data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -69,7 +69,7 @@ module Pod
           XCConfigHelper.add_target_specific_settings(target, @xcconfig)
           recursive_dependent_targets = target.recursive_dependent_targets
           @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, recursive_dependent_targets, @test_xcconfig)
-          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false, @test_xcconfig) if target.requires_frameworks?
+          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false, @test_xcconfig)
           if @test_xcconfig
             test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
             @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -307,7 +307,7 @@ module Pod
 
           # Filter out dependent targets that are subsets of another target.
           subset_targets = []
-          dependent_targets.combination(2) do |a, b|
+          dependent_targets.uniq.combination(2) do |a, b|
             if (a.specs - b.specs).empty?
               subset_targets << a
             elsif (b.specs - a.specs).empty?
@@ -489,7 +489,7 @@ module Pod
           unless aggregate_target.nil?
             dependent_targets = aggregate_target.search_paths_aggregate_targets
             dependent_targets.each do |dependent_target|
-              if dependent_target.pod_targets.any?(&:static_framework?)
+              if aggregate_target.requires_frameworks? && dependent_target.pod_targets.any?(&:static_framework?)
                 generate_other_ld_flags(dependent_target, dependent_target.pod_targets, xcconfig)
               end
             end

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

@@ -594,7 +594,7 @@ module Pod
             UI.message "- Copying module map file to #{UI.path(path)}" do
               contents = custom_module_map.read
               unless target.requires_frameworks?
-                contents.gsub!(/^(\s*)framework\s+(module[^{}]+){/, '\1\2[system] {')
+                contents.gsub!(/^(\s*)framework\s+(module[^{}]+){/, '\1\2{')
               end
               generator = Generator::Constant.new(contents)
               update_changed_file(generator, path)

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

@@ -52,7 +52,10 @@ module Pod
           def add_copy_resources_script_phase(native_target)
             test_type = target.test_type_for_product_type(native_target.symbol_type)
             script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            resource_paths = target.all_dependent_targets.flat_map(&:resource_paths)
+            resource_paths = target.all_dependent_targets.flat_map do |dependent_target|
+              include_test_spec_paths = dependent_target == target
+              dependent_target.resource_paths(include_test_spec_paths)
+            end
             input_paths = []
             output_paths = []
             unless resource_paths.empty?
@@ -71,7 +74,11 @@ module Pod
           def add_embed_frameworks_script_phase(native_target)
             test_type = target.test_type_for_product_type(native_target.symbol_type)
             script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            framework_paths = target.all_dependent_targets.flat_map(&:framework_paths)
+            all_dependent_targets = target.all_dependent_targets
+            framework_paths = all_dependent_targets.flat_map do |dependent_target|
+              include_test_spec_paths = dependent_target == target
+              dependent_target.framework_paths(include_test_spec_paths)
+            end
             input_paths = []
             output_paths = []
             unless framework_paths.empty?

data/lib/cocoapods/target/pod_target.rb

@@ -607,7 +607,7 @@ module Pod
     #
     def header_search_paths(include_test_dependent_targets = false)
       header_search_paths = []
-      header_search_paths.concat(build_headers.search_paths(platform, nil, uses_modular_headers?))
+      header_search_paths.concat(build_headers.search_paths(platform, nil, false))
       header_search_paths.concat(sandbox.public_headers.search_paths(platform, pod_name, uses_modular_headers?))
       dependent_targets = recursive_dependent_targets
       dependent_targets += recursive_test_dependent_targets if include_test_dependent_targets
@@ -624,14 +624,14 @@ module Pod
     # @param  [Boolean] only_if_defines_modules
     #         whether the use of modular headers should require the target to define a module
     #
-    # @note  This must return false when a pod has a `header_mappings_dir`,
-    #        as that allows the spec to completely customize the header structure, and
+    # @note  This must return false when a pod has a `header_mappings_dir` or `header_dir`,
+    #        as that allows the spec to customize the header structure, and
     #        therefore it might not be expecting the module name to be prepended
     #        to imports at all.
     #
     def uses_modular_headers?(only_if_defines_modules = true)
       return false if only_if_defines_modules && !defines_module?
-      spec_consumers.none?(&:header_mappings_dir)
+      spec_consumers.none?(&:header_mappings_dir) && spec_consumers.none?(&:header_dir)
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-05-09 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.5.0
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement