cocoapods 1.4.0 → 1.5.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ef975b90a00794720b4ee7f518780d588916450692e9c8316337cb7035d0714
-  data.tar.gz: '048a8ba73eeb3b2630dca90ce7d1dd2f04f9ce68f045f025ed21249c496448d0'
+  metadata.gz: 23ada42af2f965ab38a89ef0b7c1c131f23efb03297f118b9804a4232a59b791
+  data.tar.gz: f4f83b2e947828dec6f070c7f500261a8ee787f754e839ce76d82cecb93bf6bb
 SHA512:
-  metadata.gz: c71ca98c34dcfac5cec43b9bb2fc16726d5d190b0a6f34d49d06f4189b86d6997b965cf04018b756324597643a35b4df6b5482dc71c06c2d45019fe722d1f676
-  data.tar.gz: 9a8521c02a86e9056bc1b8387297b95694e60e2c314cfcac2b5c8b54ccd4a1a8f575f3e6317b5301d7ff5ef94e1e1e88e8f9ea44a619bcec5f72ef03a312b903
+  metadata.gz: 517bac4e5a5b1c9db7920e7d98672388d723e210144be3e25389b938b4d5cd7e958d9c82eb66e2a66ccde6f333f074ade23d64c24cc0a698b7eef3e2d69d3f04
+  data.tar.gz: d328813a70d9b5bb595a58c1995687efdf14667161b6de54448ea78fc03a8602a45dd7b08fc6b4ffd5ed412d71e6ba9dfdc06a40cef57096415cf4fcb2f151b1

data/CHANGELOG.md

@@ -4,6 +4,155 @@ 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.0.beta.1 (2018-03-23)
+
+##### Enhancements
+
+* Add `--exclude-pods` option to `pod update` to allow excluding specific pods from update  
+  [Oleksandr Kruk](https://github.com/0mega)
+  [#7334](https://github.com/CocoaPods/CocoaPods/issues/7334)
+
+* Add support for mixed Objective-C and Swift static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7213](https://github.com/CocoaPods/CocoaPods/issues/7213)
+
+* Improve `pod install` performance for pods with exact file paths rather than glob patterns  
+  [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
+  [#7473](https://github.com/CocoaPods/CocoaPods/pull/7473)
+
+* Display a message when a pods source has changed during installation  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7464](https://github.com/CocoaPods/CocoaPods/pull/7464)
+
+* Add support for modular header search paths, include "legacy" support.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7412](https://github.com/CocoaPods/CocoaPods/pull/7412)
+
+* Set direct and transitive dependency header search paths for pod targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7116](https://github.com/CocoaPods/CocoaPods/pull/7116)
+
+* Log target names missing host for libraries  
+  [Keith Smiley](https://github.com/keith)
+  [#7346](https://github.com/CocoaPods/CocoaPods/pull/7346)
+
+* Add a `--no-overwrite` flag to `pod repo push` to disable overwriting
+  existing specs that have already been pushed.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Store which specs repo a pod comes from in the lockfile.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Add `set -u` to the copy frameworks and copy resources scripts.  
+  [Keith Smiley](https://github.com/keith)
+  [#7180](https://github.com/CocoaPods/CocoaPods/pull/7180)
+
+* Allow integrating into static library targets without attempting to copy 
+  resources or embed frameworks unless `UNLOCALIZED_RESOURCES_FOLDER_PATH` 
+  or `FRAMEWORKS_FOLDER_PATH` is set.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Change color scheme of `pod outdated` from red-yellow-green to red-blue-green to be more colorblind friendly  
+  [iv-mexx](https://github.com/iv-mexx)  
+  [#7372](https://github.com/CocoaPods/CocoaPods/issues/7372)  
+
+* Add support for integrating swift pods as static libraries.  
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [Samuel Giddins](https://github.com/segiddins)
+  [#6899](https://github.com/CocoaPods/CocoaPods/issues/6899)
+
+* Document format of POD_NAMES in pod update  
+  [mrh-is](https://github.com/mrh-is)
+
+* Update validator to stream output as xcodebuild runs  
+  [abbeycode](https://github.com/abbeycode)
+  [#7040](https://github.com/CocoaPods/CocoaPods/issues/7040)
+  
+##### Bug Fixes
+
+* Create a generic Info.plist file for test targets  
+  Use xcode default `PRODUCT_MODULE_NAME` for generated test targets  
+  [Paul Zabelin](https://github.com/paulz)
+  [#7506](https://github.com/CocoaPods/CocoaPods/issues/7506)
+  
+* Prevent `xcassets` compilation from stomping over the apps `xcassets`  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7003](https://github.com/CocoaPods/CocoaPods/issues/7003)
+
+* Fix script phase output path for `.xcasset` resources  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7511](https://github.com/CocoaPods/CocoaPods/issues/7511)
+
+* Fix `PRODUCT_MODULE_NAME` for generated test targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7507](https://github.com/CocoaPods/CocoaPods/issues/7507)
+
+* Ensure `SWIFT_VERSION` is set for test only pod targets during validation  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7498](https://github.com/CocoaPods/CocoaPods/issues/7498)
+
+* Fix iOS test native target signing settings  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7504](https://github.com/CocoaPods/CocoaPods/pull/7504)
+
+* Clear input/output paths if they exceed an arbitrary limit  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7362](https://github.com/CocoaPods/CocoaPods/issues/7362)
+
+* Warn instead of throwing an exception when a development pod specifies an invalid license file path  
+  [Eric Amorde](https://github.com/amorde)
+  [#7377](https://github.com/CocoaPods/CocoaPods/issues/7377)
+
+* Better static frameworks transitive dependency error checking  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7352](https://github.com/CocoaPods/CocoaPods/issues/7352)
+
+* Always update input/output paths even if they are empty  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7368](https://github.com/CocoaPods/CocoaPods/pull/7368)
+
+* Unique all available pre-release versions when displaying  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#7353](https://github.com/CocoaPods/CocoaPods/pull/7353)
+
+* Do not attempt compilation for pods with no sources and skipping import validation  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7336](https://github.com/CocoaPods/CocoaPods/issues/7336)
+
+* Avoid adding copy resources and frameworks script phases when those phases
+  would not copy anything.  
+  [Keith Smiley](https://github.com/keith)
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Speed up `pod install` times by up to 50% for very large project.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Avoid dependency resolution conflicts when a pod depends upon a local pod.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Fix legacy header search paths that broke due to #7116 and #7412.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7445](https://github.com/CocoaPods/CocoaPods/pull/7445)
+
+* Stop adding header search paths that do not contain any headers.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Do not warn when http source uses `file:///` URI scheme  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7460](https://github.com/CocoaPods/CocoaPods/issues/7460)
+
+* Remove bogus `PROVISIONING_PROFILE_SPECIFIER` value from Pods project.  
+  [Ruenzuo](https://github.com/Ruenzuo)
+  [#6964](https://github.com/CocoaPods/CocoaPods/issues/6964)
+
+* Fix returning absolute paths from glob, fixes issue with static framework and public headers.  
+  [Morgan McKenzie](https://github.com/rmtmckenzie)
+  [#7463](https://github.com/CocoaPods/CocoaPods/issues/7463)
+
+* Improve messages when integrating Swift pods as static libraries.  
+  [Marcelo Fabri](https://github.com/marcelofabri)
+  [#7495](https://github.com/CocoaPods/CocoaPods/issues/7495)
+
 ## 1.4.0 (2018-01-18)
 
 ##### Enhancements

data/lib/cocoapods.rb

@@ -57,6 +57,7 @@ module Pod
     autoload :Markdown,                'cocoapods/generator/acknowledgements/markdown'
     autoload :Plist,                   'cocoapods/generator/acknowledgements/plist'
     autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
+    autoload :Constant,                'cocoapods/generator/constant'
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
     autoload :EmbedFrameworksScript,   'cocoapods/generator/embed_frameworks_script'

data/lib/cocoapods/command/outdated.rb

@@ -24,13 +24,13 @@ module Pod
         else
           UI.section 'The color indicates what happens when you run `pod update`' do
             UI.puts "#{'<green>'.green}\t\t - Will be updated to the newest version"
-            UI.puts "#{'<yellow>'.yellow}\t - Will be updated, but not to the newest version because of specified version in Podfile"
+            UI.puts "#{'<blue>'.blue}\t - Will be updated, but not to the newest version because of specified version in Podfile"
             UI.puts "#{'<red>'.red}\t\t - Will not be updated because of specified version in Podfile"
             UI.puts ''
           end
           UI.section 'The following pod updates are available:' do
             updates.each do |(name, from_version, matching_version, to_version)|
-              color = :yellow
+              color = :blue
               if matching_version == to_version
                 color = :green
               elsif from_version == matching_version

data/lib/cocoapods/command/repo/push.rb

@@ -36,6 +36,7 @@ module Pod
             ['--use-json', 'Push JSON spec to repo'],
             ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used when linting the spec. ' \
              'This takes precedence over a .swift-version file.'],
+            ['--no-overwrite', 'Disallow pushing that would overwrite an existing spec.'],
           ].concat(super)
         end
 
@@ -54,6 +55,7 @@ module Pod
           @swift_version = argv.option('swift-version', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
           @skip_tests = argv.flag?('skip-tests', false)
+          @allow_overwrite = argv.flag?('overwrite', true)
           super
         end
 
@@ -183,6 +185,9 @@ module Pod
             if @message && !@message.empty?
               message = @message
             elsif output_path.exist?
+              unless @allow_overwrite
+                raise Informative, "#{spec} already exists and overwriting has been disabled."
+              end
               message = "[Fix] #{spec}"
             elsif output_path.dirname.directory?
               message = "[Update] #{spec}"

data/lib/cocoapods/command/update.rb

@@ -8,11 +8,11 @@ module Pod
         'Podfile.lock'
 
       self.description = <<-DESC
-        Updates the Pods identified by the specified `POD_NAMES`. If no
-        `POD_NAMES` are specified it updates all the Pods ignoring the contents
-        of the Podfile.lock.
-        This command is reserved to the update of dependencies and pod install
-        should be used to install changes to the Podfile.
+        Updates the Pods identified by the specified `POD_NAMES`, which is a
+        space-delimited list of pod names. If no `POD_NAMES` are specified, it
+        updates all the Pods, ignoring the contents of the Podfile.lock. This
+        command is reserved for the update of dependencies; pod install should
+        be used to install changes to the Podfile.
       DESC
 
       self.arguments = [
@@ -23,6 +23,7 @@ module Pod
         [
           ['--sources=https://github.com/artsy/Specs,master', 'The sources from which to update dependent pods. ' \
            'Multiple sources must be comma-delimited. The master repo will not be included by default with this option.'],
+          ['--exclude-pods=podName', 'Pods to exclude during update. Multiple pods must be comma-delimited.'],
         ].concat(super)
       end
 
@@ -30,6 +31,7 @@ module Pod
         @pods = argv.arguments! unless argv.arguments.empty?
 
         source_urls = argv.option('sources', '').split(',')
+        excluded_pods = argv.option('exclude-pods', '').split(',')
         unless source_urls.empty?
           source_pods = source_urls.flat_map { |url| config.sources_manager.source_with_name_or_url(url).pods }
           unless source_pods.empty?
@@ -42,6 +44,20 @@ module Pod
           end
         end
 
+        unless excluded_pods.empty?
+          @pods ||= config.lockfile.pod_names.dup
+
+          non_installed_pods = (excluded_pods - @pods)
+          unless non_installed_pods.empty?
+            pluralized_words = non_installed_pods.length > 1 ? %w(Pods are) : %w(Pod is)
+            message = "Trying to skip `#{non_installed_pods.join('`, `')}` #{pluralized_words.first} " \
+                    "which #{pluralized_words.last} not installed"
+            raise Informative, message
+          end
+
+          @pods.delete_if { |pod| excluded_pods.include?(pod) }
+        end
+
         super
       end
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements.rb

@@ -73,13 +73,16 @@ module Pod
         return nil unless spec.license
         text = spec.license[:text]
         unless text
-          if license_file = file_accessor(spec).license
-            if license_file.exist?
-              text = IO.read(license_file)
+          if license_file = spec.license[:file]
+            license_path = file_accessor(spec).root + license_file
+            if File.exist?(license_path)
+              text = IO.read(license_path)
             else
               UI.warn "Unable to read the license file `#{license_file}` " \
               "for the spec `#{spec}`"
             end
+          elsif license_file = file_accessor(spec).license
+            text = IO.read(license_file)
           end
         end
         text

data/lib/cocoapods/generator/constant.rb

@@ -0,0 +1,19 @@
+module Pod
+  module Generator
+    # Generates a constant file.
+    #
+    class Constant
+      def initialize(contents)
+        @generate = contents
+      end
+
+      attr_reader :generate
+
+      def save_as(path)
+        path.open('w') do |f|
+          f.write(generate)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -96,6 +96,14 @@ module Pod
       INSTALL_RESOURCES_FUNCTION = <<EOS
 #!/bin/sh
 set -e
+set -u
+set -o pipefail
+
+if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
+    # If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
+    # resources to, so exit 0 (signalling the script phase was successful).
+    exit 0
+fi
 
 mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
@@ -108,7 +116,7 @@ XCASSET_FILES=()
 # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
 RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
-case "${TARGETED_DEVICE_FAMILY}" in
+case "${TARGETED_DEVICE_FAMILY:-}" in
   1,2)
     TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
     ;;
@@ -194,7 +202,7 @@ EOS
 
       XCASSETS_COMPILE = <<EOS
 
-if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
+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)
@@ -204,7 +212,11 @@ then
     fi
   done <<<"$OTHER_XCASSETS"
 
-  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}"
+  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"
+  fi
 fi
 EOS
     end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -37,10 +37,19 @@ module Pod
         script = <<-SH.strip_heredoc
           #!/bin/sh
           set -e
+          set -u
+          set -o pipefail
+
+          if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
+              # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
+              # frameworks to, so exit 0 (signalling the script phase was successful).
+              exit 0
+          fi
 
           echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
           mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
 
+          COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
           SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
           # Used as a return value for each invocation of `strip_invalid_archs` function.
@@ -129,10 +138,10 @@ module Pod
 
           # Signs a framework with the provided identity
           code_sign_if_enabled() {
-            if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
+            if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
               # Use the current code_sign_identitiy
               echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-              local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
+              local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
 
               if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
                 code_sign_cmd="$code_sign_cmd &"

data/lib/cocoapods/generator/module_map.rb

@@ -10,12 +10,41 @@ module Pod
       #
       attr_reader :target
 
+      attr_reader :headers
+
+      Header = Struct.new(:path, :umbrella, :private, :textual, :exclude, :size, :mtime) do
+        alias_method :private?, :private
+        def to_s
+          [
+            (:private if private?),
+            (:textual if textual),
+            (:umbrella if umbrella),
+            (:exclude if exclude),
+            'header',
+            %("#{path}"),
+            attrs,
+          ].compact.join(' ')
+        end
+
+        def attrs
+          attrs = {
+            'size' => size,
+            'mtime' => mtime,
+          }.reject { |_k, v| v.nil? }
+          return nil if attrs.empty?
+          attrs.to_s
+        end
+      end
+
       # Initialize a new instance
       #
       # @param  [PodTarget] target @see target
       #
       def initialize(target)
         @target = target
+        @headers = [
+          Header.new(target.umbrella_header_path.basename, true),
+        ]
       end
 
       # Generates and saves the Info.plist to the given path.
@@ -38,14 +67,36 @@ module Pod
       #
       def generate
         <<-MODULE_MAP.strip_heredoc
-          framework module #{target.product_module_name} {
-            umbrella header "#{target.umbrella_header_path.basename}"
+#{module_specifier_prefix}module #{target.product_module_name}#{module_declaration_attributes} {
+  #{headers.join("\n  ")}
 
-            export *
-            module * { export * }
-          }
+  export *
+  module * { export * }
+}
         MODULE_MAP
       end
+
+      private
+
+      # The prefix to `module` to prepend in the module map.
+      # Ensures that only framework targets have `framework` prepended.
+      #
+      def module_specifier_prefix
+        if target.requires_frameworks?
+          'framework '
+        else
+          ''
+        end
+      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
 end