cocoapods-core 0.39.0 → 1.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f9473c0dbe12681c534fac5fa372d3b8997df7
-  data.tar.gz: 2b53fe1b21668fc6528b9458a6b0ed0be4ea21af
+  metadata.gz: e18c7dc1ff175a43cf2b37bc3bebf90248145ec5
+  data.tar.gz: 0bef178f77551fbf32d34d06a0de11f7cc3776d4
 SHA512:
-  metadata.gz: 1d239f82e3c5ff14fbbf88b7d77131163581da7048ea0cdacd1063ea0799db8f6afaee8e9ecaca38c7d2a4c8979eba483338cb9f650ff257f806b3de9c2d1337
-  data.tar.gz: 78109de42ccbd79638687ffa50550a8f064bfc59d3a6880a59acc0db5d48b5db90f190edaf5be118b583d4d050718f0030286fdbf9265249ae6dee08d1265b51
+  metadata.gz: 4339a0143abdc6bc7ecea329512f2933c5a52d33b2cfb378f9171c650857ab0f1146b84106c1974153f491111e78a8a8bfb9fe8a448f4cdafc29dde1ee4e6dbb
+  data.tar.gz: 93e5dc9d9c650e0b0e540ee3aaab823ecdc327423841df5a435c926e90d803b2c23048f7fc100711a92cfeba7cc5c89f97ab044abf74930404350bd6e802b41e

data/lib/cocoapods-core/dependency.rb

@@ -19,12 +19,10 @@ module Pod
     #
     attr_accessor :external_source
 
-    # @return [Bool] whether the dependency should use the podspec with the
-    #         highest know version but force the downloader to checkout the
-    #         `head` of the source repository.
-    #
-    attr_accessor :head
-    alias_method :head?, :head
+    # @return [String] The source URL of the podspec repo to use to resolve
+    #         this dependency. If not set then the standard source list
+    #         should be used to resolve the dependency.
+    attr_accessor :podspec_repo
 
     # @overload   initialize(name, requirements)
     #
@@ -55,6 +53,22 @@ module Pod
     #             Dependency.new('libPusher', {:path    => 'path/to/folder'})
     #             Dependency.new('libPusher', {:podspec => 'example.com/libPusher.podspec'})
     #
+    # @overload   initialize(name, requirements, podspec_repo)
+    #
+    #   @param    [String] name
+    #             the name of the Pod.
+    #
+    #   @param    [Array, Version, String, Requirement] requirements
+    #             an array specifying the version requirements of the
+    #             dependency.
+    #
+    #   @param    [Hash] podspec_repo
+    #             The URL of the specific podspec repo to resolve this dependency from.
+    #
+    #   @example  Initialization with a specific podspec repo
+    #
+    #             Dependency.new('Artsy+UILabels', '~> 1.0', :source => 'https://github.com/Artsy/Specs.git')
+    #
     # @overload   initialize(name, is_head)
     #
     #   @param    [String] name
@@ -63,26 +77,36 @@ module Pod
     #   @param    [Symbol] is_head
     #             a symbol that can be `:head` or nil.
     #
+    #   @todo     Remove `:head` code once everyone has migrated past CocoaPods 1.0.
+    #
     #   @example  Initialization with the head option
     #
     #             Dependency.new('RestKit', :head)
     #
     def initialize(name = nil, *requirements)
       if requirements.last.is_a?(Hash)
-        external_source = requirements.pop.select { |_, v| !v.nil? }
-        @external_source = external_source unless external_source.empty?
-        unless requirements.empty?
-          raise Informative, 'A dependency with an external source may not ' \
-            "specify version requirements (#{name})."
+        additional_params = requirements.pop.select { |_, v| !v.nil? }
+        additional_params = nil if additional_params.empty?
+
+        if additional_params && @podspec_repo = additional_params[:source]
+          # This dependency specifies the exact source podspec repo to use.
+          additional_params.delete(:source)
+          unless additional_params.empty?
+            raise Informative, 'A dependency with a specified podspec repo may ' \
+              "not include other source parameters (#{name})."
+          end
+        else
+          @external_source = additional_params
+          unless requirements.empty?
+            raise Informative, 'A dependency with an external source may not ' \
+              "specify version requirements (#{name})."
+          end
         end
 
       elsif requirements.last == :head
-        @head = true
-        requirements.pop
-        unless requirements.empty?
-          raise Informative, 'A `:head` dependency may not specify version ' \
-            "requirements (#{name})."
-        end
+        raise Informative, '`:head` dependencies have been removed. Please use ' \
+          "normal external source dependencies (`:git => 'GIT_REPO_URL'`) " \
+          "instead of `:head` for `#{name}`."
       end
 
       if requirements.length == 1 && requirements.first.is_a?(Requirement)
@@ -127,7 +151,7 @@ module Pod
     #
     def local?
       if external_source
-        external_source[:path] || external_source[:local]
+        external_source[:path]
       end
     end
 
@@ -177,7 +201,6 @@ module Pod
     #
     def compatible?(other)
       return false unless name == other.name
-      return false unless head? == other.head?
       return false unless external_source == other.external_source
 
       other.requirement.requirements.all? do |_operator, version|
@@ -193,7 +216,6 @@ module Pod
       self.class == other.class &&
         name == other.name &&
         requirement == other.requirement &&
-        head? == other.head? &&
         external_source == other.external_source
     end
     alias_method :eql?, :==
@@ -217,11 +239,11 @@ module Pod
     # @param  [Dependency] other
     #         the other dependency to merge with.
     #
-    # @note   If one of the decencies specifies an external source or is head,
+    # @note   If one of the dependencies specifies an external source or is head,
     #         the resulting dependency preserves this attributes.
     #
-    # @return [Dependency] a dependency (not necessary a new instance) that
-    #         includes also the version requirements of the given one.
+    # @return [Dependency] a dependency (not necessarily a new instance) that
+    #         also includes the version requirements of the given one.
     #
     def merge(other)
       unless name == other.name
@@ -239,7 +261,6 @@ module Pod
         dep = self.class.new(name, self_req.as_list.concat(other_req.as_list))
       end
 
-      dep.head = head? || other.head?
       if external_source || other.external_source
         self_external_source  = external_source || {}
         other_external_source = other.external_source || {}
@@ -290,7 +311,6 @@ module Pod
     #           "libPusher (= 1.0)"
     #           "libPusher (~> 1.0.1)"
     #           "libPusher (> 1.0, < 2.0)"
-    #           "libPusher (HEAD)"
     #           "libPusher (from `www.example.com')"
     #           "libPusher (defined in Podfile)"
     #           "RestKit/JSON"
@@ -301,8 +321,6 @@ module Pod
       version = ''
       if external?
         version << external_source_description(external_source)
-      elsif head?
-        version << 'HEAD'
       elsif requirement != Requirement.default
         version << requirement.to_s
       end
@@ -332,8 +350,6 @@ module Pod
       case version
       when nil, /from `(.*)(`|')/
         Dependency.new(name)
-      when /HEAD/
-        Dependency.new(name, :head)
       else
         version_requirements = version.split(',') if version
         Dependency.new(name, version_requirements)
@@ -344,7 +360,7 @@ module Pod
     #
     def inspect
       "<#{self.class} name=#{name} requirements=#{requirement} " \
-        "external_source=#{external_source || 'nil'}>"
+        "source=#{podspec_repo || 'nil'} external_source=#{external_source || 'nil'}>"
     end
 
     #--------------------------------------#
@@ -377,8 +393,6 @@ module Pod
         desc = "`#{source[:podspec]}`"
       elsif source.key?(:path)
         desc = "`#{source[:path]}`"
-      elsif source.key?(:local)
-        desc = "`#{source[:local]}`"
       else
         desc = "`#{source}`"
       end

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.39.0' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.0.0.beta.1'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/lockfile.rb

@@ -239,7 +239,7 @@ module Pod
     # - added: Pods that weren't present in the Podfile.
     # - changed: Pods that were present in the Podfile but changed:
     #   - Pods whose version is not compatible anymore with Podfile,
-    #   - Pods that changed their head or external options.
+    #   - Pods that changed their external options.
     # - removed: Pods that were removed form the Podfile.
     # - unchanged: Pods that are still compatible with Podfile.
     #
@@ -316,6 +316,7 @@ module Pod
     #     'EXTERNAL SOURCES' => { "JSONKit" => { :podspec => path/JSONKit.podspec } },
     #     'SPEC CHECKSUMS'   => { "BananaLib" => "439d9f683377ecf4a27de43e8cf3bce6be4df97b",
     #                             "JSONKit", "92ae5f71b77c8dec0cd8d0744adab79d38560949" },
+    #     'PODFILE CHECKSUM' => "439d9f683377ecf4a27de43e8cf3bce6be4df97b",
     #     'COCOAPODS'        => "0.17.0"
     #   }
     #
@@ -323,11 +324,24 @@ module Pod
     def to_hash
       hash = {}
       internal_data.each do |key, value|
-        hash[key] = value unless value.empty?
+        hash[key] = value unless value.nil? || value.empty?
       end
       hash
     end
 
+    # @return [Array<String>] The order in which the hash keys should appear in
+    #         a serialized Lockfile.
+    #
+    HASH_KEY_ORDER = [
+      'PODS',
+      'DEPENDENCIES',
+      'EXTERNAL SOURCES',
+      'CHECKOUT OPTIONS',
+      'SPEC CHECKSUMS',
+      'PODFILE CHECKSUM',
+      'COCOAPODS',
+    ].map(&:freeze).freeze
+
     # @return [String] the YAML representation of the Lockfile, used for
     #         serialization.
     #
@@ -336,15 +350,7 @@ module Pod
     # @note   The YAML string is prettified.
     #
     def to_yaml
-      keys_hint = [
-        'PODS',
-        'DEPENDENCIES',
-        'EXTERNAL SOURCES',
-        'CHECKOUT OPTIONS',
-        'SPEC CHECKSUMS',
-        'COCOAPODS',
-      ]
-      YAMLHelper.convert_hash(to_hash, keys_hint, "\n\n")
+      YAMLHelper.convert_hash(to_hash, HASH_KEY_ORDER, "\n\n")
     end
 
     #-------------------------------------------------------------------------#
@@ -374,6 +380,7 @@ module Pod
           'EXTERNAL SOURCES' => generate_external_sources_data(podfile),
           'CHECKOUT OPTIONS' => checkout_options,
           'SPEC CHECKSUMS'   => generate_checksums(specs),
+          'PODFILE CHECKSUM' => podfile.checksum,
           'COCOAPODS'        => CORE_VERSION,
         }
         Lockfile.new(hash)
@@ -440,10 +447,6 @@ module Pod
       #           the values store the external source hashes of each
       #           dependency.
       #
-      # @todo     The downloader should generate an external source hash that
-      #           should be store for dependencies in head mode and for those
-      #           with external source.
-      #
       def generate_external_sources_data(podfile)
         deps = podfile.dependencies.select(&:external?)
         deps = deps.sort { |d, other| d.name <=> other.name }

data/lib/cocoapods-core/platform.rb

@@ -83,6 +83,14 @@ module Pod
       new :watchos
     end
 
+    # Convenience method to get all available platforms.
+    #
+    # @return [Array<Platform>] list of platforms.
+    #
+    def self.all
+      [ios, osx, watchos, tvos]
+    end
+
     # Checks if a platform is equivalent to another one or to a symbol
     # representation.
     #

data/lib/cocoapods-core/podfile.rb

@@ -45,7 +45,7 @@ module Pod
       @internal_hash = internal_hash
       if block
         default_target_def = TargetDefinition.new('Pods', self)
-        default_target_def.link_with_first_target = true
+        default_target_def.abstract = true
         @root_target_definitions = [default_target_def]
         @current_target_definition = default_target_def
         instance_eval(&block)
@@ -74,6 +74,8 @@ module Pod
       Hash[target_definition_list.map { |td| [td.name, td] }]
     end
 
+    # @return [Array<TargetDefinition>] all target definitions in the podfile.
+    #
     def target_definition_list
       root_target_definitions.map { |td| [td, td.recursive_children] }.flatten
     end
@@ -134,6 +136,14 @@ module Pod
       get_hash_value('set_arc_compatibility_flag')
     end
 
+    # @return [(String,Hash)] the installation strategy and installation options
+    #         to be used during installation.
+    #
+    def installation_method
+      get_hash_value('installation_method', 'name' => 'cocoapods', 'options' => {}).
+        values_at('name', 'options')
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -183,6 +193,7 @@ module Pod
     # @return [Array] The keys used by the hash representation of the Podfile.
     #
     HASH_KEYS = %w(
+      installation_method
       workspace
       sources
       plugins
@@ -348,7 +359,7 @@ module Pod
     # @param  [Object] value
     #         The value to store.
     #
-    # @raise  If the key is not recognized.
+    # @raise  [StandardError] If the key is not recognized.
     #
     # @return [void]
     #
@@ -364,15 +375,19 @@ module Pod
     # @param  [String] key
     #         The key for which the value is needed.
     #
-    # @raise  If the key is not recognized.
+    # @param  default
+    #         The default value to return if the internal hash has no entry for
+    #         the given `key`.
+    #
+    # @raise  [StandardError] If the key is not recognized.
     #
     # @return [Object] The value for the key.
     #
-    def get_hash_value(key)
+    def get_hash_value(key, default = nil)
       unless HASH_KEYS.include?(key)
         raise StandardError, "Unsupported hash key `#{key}`"
       end
-      internal_hash[key]
+      internal_hash.fetch(key, default)
     end
 
     # @return [TargetDefinition] The current target definition to which the DSL
@@ -380,19 +395,6 @@ module Pod
     #
     attr_accessor :current_target_definition
 
-    public
-
-    # @!group Deprecations
-    #-------------------------------------------------------------------------#
-
-    # @deprecated Deprecated in favour of the more succinct {#pod}. Remove for
-    #             CocoaPods 1.0.
-    #
-    def dependency(name = nil, *requirements, &block)
-      CoreUI.warn "[DEPRECATED] `dependency' is deprecated (use `pod')"
-      pod(name, *requirements, &block)
-    end
-
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods-core/podfile/dsl.rb

@@ -5,9 +5,7 @@ module Pod
     # CocoaPods/cocoapods.github.com.
 
     # The Podfile is a specification that describes the dependencies of the
-    # targets of one or more Xcode projects. The Podfile always creates an
-    # implicit target, named `default`, which links to the first target of the
-    # user project.
+    # targets of one or more Xcode projects.
     #
     # A Podfile can be very simple:
     #
@@ -15,19 +13,19 @@ module Pod
     #
     # An example of a more complex Podfile can be:
     #
-    #     source 'https://github.com/CocoaPods/Specs.git'
-    #
-    #     platform :ios, '6.0'
+    #     platform :ios, '9.0'
     #     inhibit_all_warnings!
     #
-    #     xcodeproj 'MyProject'
-    #
-    #     pod 'ObjectiveSugar', '~> 0.5'
+    #     target "MyApp" do
+    #       pod 'ObjectiveSugar', '~> 0.5'
     #
-    #     target :test do
-    #       pod 'OCMock', '~> 2.0.1'
+    #       target "MyAppTests" do
+    #         inherit! :search_paths
+    #         pod 'OCMock', '~> 2.0.1'
+    #       end
     #     end
     #
+    #
     #     post_install do |installer|
     #       installer.pods_project.targets.each do |target|
     #         puts "#{target.name}"
@@ -40,7 +38,7 @@ module Pod
       #
       #   * `pod` is the way to declare a specific dependency.
       #   * `podspec` provides an easy API for the creation of podspecs.
-      #   * `target` allows you to scope your dependencies to specific
+      #   * `target` is how you scope your dependencies to specific
       #   targets in your Xcode projects.
 
       #-----------------------------------------------------------------------#
@@ -82,13 +80,6 @@ module Pod
       # * [Semantic Versioning](http://semver.org)
       # * [RubyGems Versioning Policies](http://docs.rubygems.org/read/chapter/7)
       #
-      # Finally, instead of a version, you can specify the `:head` flag. This
-      # will use the spec of the newest available version in your spec repo(s),
-      # but force the download of the ‘bleeding edge’ version (HEAD). Use this
-      # with caution, as the spec _might_ not be compatible anymore.
-      #
-      #     pod 'Objection', :head
-      #
       # ------
       #
       # ### Build configurations
@@ -193,16 +184,9 @@ module Pod
       # @note       This method allow a nil name and the raises to be more
       #             informative.
       #
-      # @note       Support for inline podspecs has been deprecated.
-      #
       # @return     [void]
       #
-      def pod(name = nil, *requirements, &block)
-        if block
-          raise StandardError, 'Inline specifications are deprecated. ' \
-            'Please store the specification in a `podspec` file.'
-        end
-
+      def pod(name = nil, *requirements)
         unless name
           raise StandardError, 'A dependency requires a name.'
         end
@@ -210,9 +194,9 @@ module Pod
         current_target_definition.store_pod(name, *requirements)
       end
 
-      # Use the dependencies of a Pod defined in the given podspec file. If no
-      # arguments are passed the first podspec in the root of the Podfile is
-      # used. It is intended to be used by the project of a library. Note:
+      # Use just the dependencies of a Pod defined in the given podspec file.
+      # If no arguments are passed the first podspec in the root of the Podfile
+      # is used. It is intended to be used by the project of a library. Note:
       # this does not include the sources derived from the podspec just the
       # CocoaPods infrastructure.
       #
@@ -235,7 +219,7 @@ module Pod
       # @option   options [String] :name
       #           the name of the podspec
       #
-      # @note     This method uses the dependencies declared by the for the
+      # @note     This method uses the dependencies declared for the
       #           platform of the target definition.
       #
       #
@@ -248,57 +232,173 @@ module Pod
         current_target_definition.store_podspec(options)
       end
 
-      # Defines a new static library target and scopes dependencies defined
-      # from the given block. The target will by default include the
-      # dependencies defined outside of the block, unless the `:exclusive =>
-      # true` option is
-      # given.
-      #
-      # ---
-      #
-      # The Podfile creates a global target named `:default` which produces the
-      # `libPods.a` file. This target is linked with the first target of user
-      # project if not value is specified for the `link_with` attribute.
+      # Defines a CocoaPods target and scopes dependencies defined
+      # within the given block. A target should correspond to an Xcode target.
+      # By default the target includes the dependencies defined outside of
+      # the block, unless instructed not to `inherit!` them.
       #
       # @param    [Symbol, String] name
-      #           the name of the target definition.
-      #
-      # @option   options [Bool] :exclusive
-      #           whether the target should inherit the dependencies of its
-      #           parent. by default targets are inclusive.
+      #           the name of the target.
       #
       # @example  Defining a target
       #
-      #           target :ZipApp do
+      #           target "ZipApp" do
       #             pod 'SSZipArchive'
       #           end
       #
-      # @example  Defining an exclusive target
+      # @example  Defining a test target which can access SSZipArchive via Pods
+      #           for it's parent target.
       #
-      #           target :ZipApp do
+      #           target "ZipApp" do
       #             pod 'SSZipArchive'
-      #             target :test, :exclusive => true do
-      #               pod 'JSONKit'
+      #
+      #             target "ZipAppTests" do
+      #               inherit! :search_paths
+      #               pod 'Nimble'
+      #             end
+      #           end
+      #
+      # @example  Defining a target applies Pods to multiple targets via its
+      #           parent target
+      #
+      #           target "ShowsApp" do
+      #             pod 'ShowsKit'
+      #
+      #             # Has it's own copy of ShowsKit + ShowTVAuth
+      #             target "ShowsTV" do
+      #               pod "ShowTVAuth"
+      #             end
+      #
+      #             # Has it's own copy of Specta + Expecta
+      #             # and has access to ShowsKit via the app
+      #             # that the test target is bundled into
+      #
+      #             target "ShowsTests" do
+      #               inherit! :search_paths
+      #               pod 'Specta'
+      #               pod 'Expecta'
       #             end
       #           end
       #
       # @return   [void]
       #
-      def target(name, options = {})
-        if options && !options.keys.all? { |key| [:exclusive].include?(key) }
+      def target(name, options = nil)
+        if options
           raise Informative, "Unsupported options `#{options}` for " \
-            "target `#{name}`"
+            "target `#{name}`."
         end
 
         parent = current_target_definition
         definition = TargetDefinition.new(name, parent)
-        definition.exclusive = true if options[:exclusive]
         self.current_target_definition = definition
-        yield
+        yield if block_given?
       ensure
         self.current_target_definition = parent
       end
 
+      # Defines a new abstract target that can be used for convenient
+      # target dependency inheritance.
+      #
+      # @param    [Symbol, String] name
+      #           the name of the target.
+      #
+      # @example  Defining an abstract target
+      #
+      #           abstract_target 'Networking' do
+      #             pod 'AlamoFire'
+      #
+      #             target 'Networking App 1'
+      #             target 'Networking App 2'
+      #           end
+      #
+      # @example  Defining an abstract_target wrapping Pods to multiple targets
+      #
+      #           # There are no targets called "Shows" in any Xcode projects
+      #           abstract_target "Shows" do
+      #             pod 'ShowsKit'
+      #
+      #             # Has it's own copy of ShowsKit + ShowWebAuth
+      #             target "ShowsiOS" do
+      #               pod "ShowWebAuth"
+      #             end
+      #
+      #             # Has it's own copy of ShowsKit + ShowTVAuth
+      #             target "ShowsTV" do
+      #               pod "ShowTVAuth"
+      #             end
+      #
+      #             # Has it's own copy of Specta + Expecta
+      #             # and has access to ShowsKit via the app
+      #             # that the test target is bundled into
+      #
+      #             target "ShowsTests" do
+      #               inherit! :search_paths
+      #               pod 'Specta'
+      #               pod 'Expecta'
+      #             end
+      #           end
+      #
+      # @return   [void]
+      #
+      def abstract_target(name)
+        target(name) do
+          abstract!
+          yield if block_given?
+        end
+      end
+
+      # Denotes that the current target is abstract, and thus will not directly
+      # link against an Xcode target.
+      #
+      # @return [void]
+      #
+      def abstract!(abstract = true)
+        current_target_definition.abstract = abstract
+      end
+
+      # Sets the inheritance mode for the current target.
+      #
+      # @param   [:complete, :none, :search_paths] the inheritance mode to set.
+      #
+      # @example Inheriting only search paths
+      #
+      #          target 'App' do
+      #            target 'AppTests' do
+      #              inherit! :search_paths
+      #            end
+      #          end
+      #
+      # @return  [void]
+      #
+      def inherit!(inheritance)
+        current_target_definition.inheritance = inheritance
+      end
+
+      # Specifies the installation method to be used when CocoaPods installs
+      # this Podfile.
+      #
+      # @param   [String] installation_method
+      #          the name of the installation strategy.
+      #
+      # @param   [Hash] options
+      #          the installation options.
+      #
+      # @example Specifying custom CocoaPods installation options
+      #
+      #          install! 'cocoapods',
+      #                   :deterministic_uuids => false,
+      #                   :integrate_targets => false
+      #
+      # @return  [void]
+      #
+      def install!(installation_method, options = {})
+        unless current_target_definition.root?
+          raise Informative, 'The installation method can only be set at the root level of the Podfile.'
+        end
+
+        set_hash_value('installation_method', 'name' => installation_method, 'options' => options)
+      end
+
       #-----------------------------------------------------------------------#
 
       # @!group Target configuration
@@ -345,10 +445,9 @@ module Pod
       #
       # -----
       #
-      # If no explicit project is specified, it will use the Xcode project of
-      # the parent target. If none of the target definitions specify an
-      # explicit project and there is only **one** project in the same
-      # directory as the Podfile then that project will be used.
+      # If none of the target definitions specify an explicit project
+      # and there is only **one** project in the same directory as the Podfile
+      # then that project will be used.
       #
       # It is possible also to specify whether the build settings of your
       # custom build configurations should be modelled after the release or
@@ -369,20 +468,22 @@ module Pod
       #
       # @example  Specifying the user project
       #
-      #           # Look for target to link with in an Xcode project called
-      #           # `MyProject.xcodeproj`.
-      #           xcodeproj 'MyProject'
+      #           # This Target can be found in a Xcode project called `FastGPS`
+      #           target "MyGPSApp" do
+      #             xcodeproj 'FastGPS'
+      #             ...
+      #           end
       #
-      #           target :test do
-      #             # This Pods library links with a target in another project.
-      #             xcodeproj 'TestProject'
+      #           # Same Podfile, multiple Xcodeprojects
+      #           target "MyNotesApp" do
+      #             xcodeproj 'FastNotes'
+      #             ...
       #           end
       #
       # @example  Using custom build configurations
       #
       #           xcodeproj 'TestProject', 'Mac App Store' => :release, 'Test' => :debug
       #
-      #
       # @return   [void]
       #
       def xcodeproj(path, build_configurations = {})
@@ -390,30 +491,18 @@ module Pod
         current_target_definition.build_configurations = build_configurations
       end
 
-      # Specifies the target(s) in the user’s project that this Pods library
-      # should be linked in.
-      #
-      # -----
-      #
-      # If no explicit target is specified, then the Pods target will be linked
-      # with the first target in your project. So if you only have one target
-      # you do not need to specify the target to link with.
-      #
-      # @param    [String, Array<String>] targets
-      #           the target or the targets to link with.
+      # @!visibility private
       #
-      # @example  Link with a user project target
+      # @deprecated linking a single target with multiple Xcode targets is no
+      #             longer supported. Use an {#abstract_target} and target
+      #             inheritance instead.
       #
-      #           link_with 'MyApp'
-      #
-      # @example  Link with multiple user project targets
-      #
-      #           link_with 'MyApp', 'MyOtherApp'
-      #
-      # @return   [void]
+      # TODO: This method can be deleted once people have migrated to this 1.0
+      # DSL.
       #
-      def link_with(*targets)
-        current_target_definition.link_with = targets.flatten
+      def link_with(*)
+        raise Informative, 'The specification of `link_with` in the Podfile ' \
+          'is now unsupported, please use target blocks instead.'
       end
 
       # Inhibits **all** the warnings from the CocoaPods libraries.
@@ -589,7 +678,7 @@ module Pod
       # [`Pod::Installer`](http://rubydoc.info/gems/cocoapods/Pod/Installer/)
       # as its only argument.
       #
-      # @example  Defining a pre install hook in a Podfile.
+      # @example  Defining a pre-install hook in a Podfile.
       #
       #   pre_install do |installer|
       #     # Do something fancy!