cocoapods 1.1.0.rc.2 → 1.1.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebcc4002b70feee0826ac1cbf41542ee77dc7fb
-  data.tar.gz: ec14f7a2ef3245902fbfbf8fb417d8ab934cee66
+  metadata.gz: 45edd0b5b0ad6bf88e868720fa0687caa2868670
+  data.tar.gz: 265395164853e3b9f4c665e54117a0452768eb0a
 SHA512:
-  metadata.gz: 0d31345327fe79582442d32038fcd9e514f5ec20baf9628c74e00c9bc3e1c0f80da70bb5b3e2ac07c59d518575a4a901e028610b7db7a09e1150374d7d3af3d1
-  data.tar.gz: 622983ea3bacabd5658dda55f5146bcbce917077d89dc338f472d6a1e3d539a7b61dcbe2d3e579a45ed2975c86c5133974e4cac0c2aa59594417e671ddde3113
+  metadata.gz: a253db5e9296fbaf7b49ef3fcf451c899d476e122bf2ca6f2f178f0cd0f2b3e4ac6f344e21ebd19d602e713efaa705aa717844a939014ed0417b67dd59a385fa
+  data.tar.gz: e1188063833e80370ade4fac40d14a5aa1a31f15e815e4bf63277157d16cdb4b72006a84ab8d0dd91e2739068b78d28336ea57d62f55b567c67608b342f6760e

data/CHANGELOG.md

@@ -4,11 +4,71 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.1.0.rc.3 (2016-10-11)
+
+##### Enhancements
+
+* Cache result of inhibit_warnings and include_in_build_config to speed up pod install.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#5934](https://github.com/CocoaPods/CocoaPods/pull/5934)
+
+* Tell users about the .swift-version file on validation failures.  
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#5951](https://github.com/CocoaPods/CocoaPods/pull/5951)
+
+* Improve performance of PathList.read_file_system  
+  [Heath Borders](https://github.com/hborders)
+  [#5890](https://github.com/CocoaPods/CocoaPods/issues/5890)
+
+* Cache result of uses_swift and should_build to speed up pod install.  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#5837](https://github.com/CocoaPods/CocoaPods/pull/5837)
+
+* Remove uses of `cd` in generated scripts  
+  [Ben Asher](https://github.com/benasher44)
+  [#5959](https://github.com/CocoaPods/CocoaPods/pull/5959)
+
+* Error with helpful message when integrating a pod into targets that have mismatched Swift versions.  
+  [Ben Asher](https://github.com/benasher44)
+  [#5984](https://github.com/CocoaPods/CocoaPods/pull/5984)
+
+* Allow users to share pods between Objective-C and Swift targets.
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#5984](https://github.com/CocoaPods/CocoaPods/pull/5984)
+
+* Allow setting the linting Swift version via `--swift-version=VERSION`  
+  [Danielle Tomlinson](https://github.com/dantoml)
+  [#5989](https://github.com/CocoaPods/CocoaPods/pull/5989)
+
+* Greenify pod install success message  
+  [Stephen Hayes](https://github.com/schayes04)
+  [#5713](https://github.com/CocoaPods/CocoaPods/issues/5713)
+
+* Update EMBEDDED_CONTENT_CONTAINS_SWIFT flag behaviour based on xcode version.  
+  [codymoorhouse](https://github.com/codymoorhouse)
+  [#5732](https://github.com/CocoaPods/CocoaPods/issues/5732)
+
+##### Bug Fixes
+
+* Remove special handling for messages apps  
+  [Ben Asher](https://github.com/benasher44)
+  [#5860](https://github.com/CocoaPods/CocoaPods/issues/5860)
+
+* Ensure messages apps have an embed frameworks build phase  
+  [Ben Asher](https://github.com/benasher44)
+  [#5860](https://github.com/CocoaPods/CocoaPods/issues/5860)
+
+* Fix linting of private pods when using libraries.  
+  [Stefan Pühringer](https://github.com/b-ray)
+  [#5891](https://github.com/CocoaPods/CocoaPods/issues/5891)
+
+
 ## 1.1.0.rc.2 (2016-09-13)
 
 ##### Enhancements
 
-* Use the SWIFT_VERSION when linting pods.  
+* Use the SWIFT_VERSION when linting pods. To lint with Swift 3.0
+  add a Swift Version file. `echo "3.0" >> .swift-version`.   
   [Danielle Tomlinson](https://github.com/dantoml)
   [#5841](https://github.com/CocoaPods/CocoaPods/pull/5841)
 
@@ -27,6 +87,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ##### Bug Fixes
 
+* Wrap generated import headers with __OBJC__ to fix C only pods.   
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#5291](https://github.com/CocoaPods/CocoaPods/issues/5291)
+
 * Prevent crash when generating acknowledgements when license type is not specified.  
   [Marcelo Fabri](https://github.com/marcelofabri)
   [#5826](https://github.com/CocoaPods/CocoaPods/issues/5826)

data/lib/cocoapods/command/lib/lint.rb

@@ -21,6 +21,8 @@ module Pod
              '(defaults to https://github.com/CocoaPods/Specs.git). ' \
              'Multiple sources must be comma-delimited.'],
             ['--private', 'Lint skips checks that apply only to public specs'],
+            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+             'This takes precedence over a .swift-version file.'],
           ].concat(super)
         end
 
@@ -34,6 +36,7 @@ module Pod
           @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @private         = argv.flag?('private', false)
+          @swift_version   = argv.option('swift-version', nil)
           @podspecs_paths  = argv.arguments!
           super
         end
@@ -55,6 +58,7 @@ module Pod
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
             validator.ignore_public_only_results = @private
+            validator.swift_version = @swift_version
             validator.validate
 
             unless @clean

data/lib/cocoapods/command/spec/lint.rb

@@ -27,6 +27,8 @@ module Pod
              '(defaults to https://github.com/CocoaPods/Specs.git). ' \
              'Multiple sources must be comma-delimited.'],
             ['--private', 'Lint skips checks that apply only to public specs'],
+            ['--swift-version=VERSION', 'The SWIFT_VERSION that should be used to lint the spec. ' \
+             'This takes precedence over a .swift-version file.'],
           ].concat(super)
         end
 
@@ -40,6 +42,7 @@ module Pod
           @use_frameworks  = !argv.flag?('use-libraries')
           @source_urls     = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @private         = argv.flag?('private', false)
+          @swift_version   = argv.option('swift-version', nil)
           @podspecs_paths  = argv.arguments!
           super
         end
@@ -57,6 +60,7 @@ module Pod
             validator.only_subspec   = @only_subspec
             validator.use_frameworks = @use_frameworks
             validator.ignore_public_only_results = @private
+            validator.swift_version = @swift_version
             validator.validate
             failure_reasons << validator.failure_reason
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -119,12 +119,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
     ;;
 esac
 
-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
   if [[ "$1" = /* ]] ; then
@@ -166,7 +160,7 @@ EOM
       xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
       XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
       ;;
     *)
@@ -195,7 +189,7 @@ then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
   while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
       XCASSET_FILES+=("$line")
     fi
   done <<<"$OTHER_XCASSETS"

data/lib/cocoapods/generator/header.rb

@@ -40,8 +40,9 @@ module Pod
       #
       def generate
         result = ''
+        result << "#ifdef __OBJC__\n"
         result << generate_platform_import_header
-
+        result << "#endif\n"
         result << "\n"
 
         imports.each do |import|

data/lib/cocoapods/generator/prefix_header.rb

@@ -55,18 +55,6 @@ module Pod
 
         result
       end
-
-      protected
-
-      # Generates the contents of the header according to the platform.
-      #
-      # @return [String]
-      #
-      def generate_platform_import_header
-        result =  "#ifdef __OBJC__\n"
-        result << super
-        result << "#endif\n"
-      end
     end
   end
 end

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

@@ -60,20 +60,8 @@ module Pod
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
             'LIBRARY_SEARCH_PATHS' => '$(inherited) ',
-          }
-          # For embedded targets, which live in a host target, CocoaPods
-          # copies all of the embedded target's pod_targets its host
-          # target. Therefore, this check will properly require the Swift
-          # libs in the host target, if the embedded target has any pod targets
-          # that use Swift. Setting this for the embedded target would
-          # cause an App Store rejection because frameworks cannot be embedded
-          # in embedded targets.
-          if !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
-            config['EMBEDDED_CONTENT_CONTAINS_SWIFT'] = 'YES'
-            config['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'YES'
-          else
-            config['ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES'] = 'NO'
-          end
+          }.merge(embedded_content_settings)
+
           @xcconfig = Xcodeproj::Config.new(config)
 
           @xcconfig.merge!(merged_user_target_xcconfigs)
@@ -100,6 +88,41 @@ module Pod
 
         protected
 
+        def target_swift_version
+          settings = target.native_target.resolved_build_setting('SWIFT_VERSION') unless target.native_target.nil?
+          settings.values.compact.uniq.first unless settings.nil?
+        end
+
+        EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION = Gem::Version.new('2.3')
+
+        # @return [Hash<String, String>] the build settings necessary for Swift
+        #  targets to be correctly embedded in their host.
+        #
+        def embedded_content_settings
+          # For embedded targets, which live in a host target, CocoaPods
+          # copies all of the embedded target's pod_targets its host
+          # target. Therefore, this check will properly require the Swift
+          # libs in the host target, if the embedded target has any pod targets
+          # that use Swift. Setting this for the embedded target would
+          # cause an App Store rejection because frameworks cannot be embedded
+          # in embedded targets.
+
+          swift_version = Gem::Version.new(target_swift_version)
+          should_embed = !target.requires_host_target? && pod_targets.any?(&:uses_swift?)
+          embed_value = should_embed ? 'YES' : 'NO'
+
+          config = {
+            'ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES' => embed_value,
+            'EMBEDDED_CONTENT_CONTAINS_SWIFT' => embed_value,
+          }
+
+          if swift_version >= EMBED_STANDARD_LIBRARIES_MINIMUM_VERSION || !should_embed
+            config.delete('EMBEDDED_CONTENT_CONTAINS_SWIFT')
+          end
+
+          config
+        end
+
         # @return [Hash<String, String>] the build settings necessary to import
         #         the pod targets.
         #

data/lib/cocoapods/installer.rb

@@ -478,10 +478,12 @@ module Pod
     def print_post_install_message
       podfile_dependencies = podfile.dependencies.uniq.size
       pods_installed = root_specs.size
-      UI.info('Pod installation complete! ' \
-              "There #{podfile_dependencies == 1 ? 'is' : 'are'} #{podfile_dependencies} " \
-              "#{'dependency'.pluralize(podfile_dependencies)} from the Podfile " \
-              "and #{pods_installed} total #{'pod'.pluralize(pods_installed)} installed.")
+      title_options = { :verbose_prefix => '-> '.green }
+      UI.titled_section('Pod installation complete! ' \
+                        "There #{podfile_dependencies == 1 ? 'is' : 'are'} #{podfile_dependencies} " \
+                        "#{'dependency'.pluralize(podfile_dependencies)} from the Podfile " \
+                        "and #{pods_installed} total #{'pod'.pluralize(pods_installed)} installed.".green,
+                        title_options)
     end
 
     # Runs the registered callbacks for the plugins post install hooks.

data/lib/cocoapods/installer/analyzer.rb

@@ -281,11 +281,7 @@ module Pod
         embedded_aggregate_targets.each do |target|
           host_uuids = []
           aggregate_target_user_projects.product(target.user_targets).each do |user_project, user_target|
-            host_targets = user_project.host_targets_for_embedded_target(user_target)
-            host_targets.map(&:symbol_type).each do |product_type|
-              target.add_host_target_product_type(product_type)
-            end
-            host_uuids += host_targets.map(&:uuid)
+            host_uuids += user_project.host_targets_for_embedded_target(user_target).map(&:uuid)
           end
           # For each host, keep track of its embedded target definitions
           # to later verify each embedded target's compatiblity with its host,
@@ -353,6 +349,7 @@ module Pod
       #
       def generate_targets
         specs_by_target = result.specs_by_target.reject { |td, _| td.abstract? }
+        check_pod_target_swift_versions(specs_by_target)
         pod_targets = generate_pod_targets(specs_by_target)
         aggregate_targets = specs_by_target.keys.map do |target_definition|
           generate_target(target_definition, pod_targets)
@@ -410,6 +407,39 @@ module Pod
         target
       end
 
+      # Verify that targets using a pod have the same swift version
+      #
+      # @param  [Hash{Podfile::TargetDefinition => Array<Specification>}] specs_by_target
+      #         the resolved specifications grouped by target.
+      #
+      # @note raises Informative if targets using a pod do not have
+      #       the same swift version
+      #
+      def check_pod_target_swift_versions(specs_by_target)
+        targets_by_spec = {}
+        specs_by_target.each do |target, specs|
+          specs.each do |spec|
+            (targets_by_spec[spec] ||= []) << target
+          end
+        end
+
+        error_message_for_target = lambda do |target|
+          "#{target.name} (Swift #{target.swift_version})"
+        end
+
+        error_messages = targets_by_spec.map do |spec, targets|
+          swift_targets = targets.reject { |target| target.swift_version.blank? }
+          next if swift_targets.empty? || swift_targets.uniq(&:swift_version).count == 1
+          target_errors = swift_targets.map(&error_message_for_target).join(', ')
+          "- #{spec.name} required by #{target_errors}"
+        end.compact
+
+        unless error_messages.empty?
+          raise Informative, 'The following pods are integrated into targets ' \
+            "that do not have the same Swift version:\n\n#{error_messages.join("\n")}"
+        end
+      end
+
       # Setup the pod targets for an aggregate target. Deduplicates resulting
       # targets by grouping by platform and subspec by their root
       # to create a {PodTarget} for each spec.
@@ -424,7 +454,7 @@ module Pod
           distinct_targets = specs_by_target.each_with_object({}) do |dependency, hash|
             target_definition, dependent_specs = *dependency
             dependent_specs.group_by(&:root).each do |root_spec, specs|
-              pod_variant = PodVariant.new(specs, target_definition.platform, target_definition.uses_frameworks?, target_definition.swift_version)
+              pod_variant = PodVariant.new(specs, target_definition.platform, target_definition.uses_frameworks?)
               hash[root_spec] ||= {}
               (hash[root_spec][pod_variant] ||= []) << target_definition
             end

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

@@ -16,10 +16,6 @@ module Pod
         attr_accessor :requires_frameworks
         alias_method :requires_frameworks?, :requires_frameworks
 
-        # @return [String] the Swift version
-        #
-        attr_accessor :swift_version
-
         # @return [Specification] the root specification
         #
         def root_spec
@@ -32,11 +28,10 @@ module Pod
         # @param [Platform] platform         @see #platform
         # @param [Bool] requires_frameworks  @see #requires_frameworks?
         #
-        def initialize(specs, platform, requires_frameworks = false, swift_version = nil)
+        def initialize(specs, platform, requires_frameworks = false)
           self.specs = specs
           self.platform = platform
           self.requires_frameworks = requires_frameworks
-          self.swift_version = swift_version
         end
 
         # @return [Bool] whether the {PodVariant} is equal to another taking all
@@ -46,8 +41,7 @@ module Pod
           self.class == other.class &&
             specs == other.specs &&
             platform == other.platform &&
-            requires_frameworks == other.requires_frameworks &&
-            swift_version == other.swift_version
+            requires_frameworks == other.requires_frameworks
         end
         alias_method :eql?, :==
 
@@ -57,7 +51,7 @@ module Pod
         #
         # @!visibility private
         def hash
-          [specs, platform, requires_frameworks, swift_version].hash
+          [specs, platform, requires_frameworks].hash
         end
       end
     end

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

@@ -25,7 +25,7 @@ module Pod
         # For messages extensions, this only applies if it's embedded in a messages
         # application.
         #
-        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle, :ui_test_bundle, :watch2_extension, :messages_extension].freeze
+        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle, :ui_test_bundle, :watch2_extension, :messages_application].freeze
 
         # @return [String] the name of the embed frameworks phase
         #

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

@@ -241,9 +241,9 @@ module Pod
 
             build_phase = native_target.new_shell_script_build_phase('Create Symlinks to Header Folders')
             build_phase.shell_script = <<-eos.strip_heredoc
-          cd "$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME"
-          ln -fs ${PUBLIC_HEADERS_FOLDER_PATH\#$WRAPPER_NAME/} ${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
-          ln -fs ${PRIVATE_HEADERS_FOLDER_PATH\#\$WRAPPER_NAME/} ${PRIVATE_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
+          base="$CONFIGURATION_BUILD_DIR/$WRAPPER_NAME"
+          ln -fs $base/${PUBLIC_HEADERS_FOLDER_PATH\#$WRAPPER_NAME/} $base/${PUBLIC_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
+          ln -fs $base/${PRIVATE_HEADERS_FOLDER_PATH\#\$WRAPPER_NAME/} $base/${PRIVATE_HEADERS_FOLDER_PATH\#\$CONTENTS_FOLDER_PATH/}
             eos
           end
 

data/lib/cocoapods/sandbox/headers_store.rb

@@ -72,11 +72,11 @@ module Pod
       #
       def add_files(namespace, relative_header_paths)
         relative_header_paths.map do |relative_header_path|
-          add_file(namespace, relative_header_path, relative_header_path.basename)
+          add_file(namespace, relative_header_path)
         end
       end
 
-      # Adds a header to the directory under different name.
+      # Adds a header to the directory.
       #
       # @param  [Pathname] namespace
       #         the path where the header file should be stored relative to the
@@ -86,23 +86,17 @@ module Pod
       #         the path of the header file relative to the Pods project
       #         (`PODS_ROOT` variable of the xcconfigs).
       #
-      # @param  [String] final_name
-      #         the name under which the file should be available in the
-      #         headers directory.
-      #
       # @note   This method does _not_ add the file to the search paths.
       #
       # @return [Pathname]
       #
-      def add_file(namespace, relative_header_path, final_name)
+      def add_file(namespace, relative_header_path)
         namespaced_path = root + namespace
         namespaced_path.mkpath unless File.exist?(namespaced_path)
 
         absolute_source = (sandbox.root + relative_header_path)
         source = absolute_source.relative_path_from(namespaced_path)
-        Dir.chdir(namespaced_path) do
-          FileUtils.ln_sf(source, final_name)
-        end
+        FileUtils.ln_sf(source, namespaced_path)
         namespaced_path + relative_header_path.basename
       end
 

data/lib/cocoapods/sandbox/path_list.rb

@@ -51,11 +51,22 @@ module Pod
           raise Informative, "Attempt to read non existent folder `#{root}`."
         end
         escaped_root = escape_path_for_glob(root)
-        absolute_paths = Pathname.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
+
+        absolute_paths = Pathname.glob(escaped_root + '**/*', File::FNM_DOTMATCH).lazy
         dirs_and_files = absolute_paths.reject { |path| path.basename.to_s =~ /^\.\.?$/ }
-        relative_paths = dirs_and_files.map { |path| path.relative_path_from(root) }
-        sorted_paths = relative_paths.map(&:to_s).sort_by(&:upcase)
-        @dirs, @files = sorted_paths.partition { |path| File.directory?(root + path) }
+        dirs, files = dirs_and_files.partition { |path| File.directory?(path) }
+
+        root_length = root.cleanpath.to_s.length + File::SEPARATOR.length
+        sorted_relative_paths_from_full_paths = lambda do |paths|
+          relative_paths = paths.lazy.map do |path|
+            path_string = path.to_s
+            path_string.slice(root_length, path_string.length - root_length)
+          end
+          relative_paths.sort_by(&:upcase)
+        end
+
+        @dirs = sorted_relative_paths_from_full_paths.call(dirs)
+        @files = sorted_relative_paths_from_full_paths.call(files)
         @glob_cache = {}
       end
 

data/lib/cocoapods/target/aggregate_target.rb

@@ -9,8 +9,6 @@ module Pod
 
     # Product types where the product's frameworks must be embedded in a host target
     #
-    # @note :messages_extension only applies when it is embedded in an app (as opposed to a messages app)
-    #
     EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :messages_extension, :watch_extension].freeze
 
     # Initialize a new instance
@@ -27,21 +25,6 @@ module Pod
       @search_paths_aggregate_targets = []
       @file_accessors = []
       @xcconfigs = {}
-      @host_target_types = Set.new # Product types of the host target, if this target is embedded
-    end
-
-    # Adds product type to the list of product types for the host
-    # targets, in which this target will be embedded
-    #
-    # @param [Symbol] product_type Product type (symbol representation)
-    #        of a host, in which this target will be embedded
-    #
-    # @note This is important for messages extensions, since a messages
-    #       extension has its frameworks embedded in its host when
-    #       its host is an app but not when it's a messages app
-    #
-    def add_host_target_product_type(product_type)
-      @host_target_types << product_type
     end
 
     # @return [Boolean] True if the user_target's pods are
@@ -57,7 +40,7 @@ module Pod
       return false if user_project.nil?
       symbol_types = user_targets.map(&:symbol_type).uniq
       raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}." unless symbol_types.count == 1
-      EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include?(symbol_types[0]) && !@host_target_types.include?(:messages_application)
+      EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include?(symbol_types[0])
     end
 
     # @return [String] the label for the target.

data/lib/cocoapods/target/pod_target.rb

@@ -47,6 +47,7 @@ module Pod
       @file_accessors = []
       @resource_bundle_targets = []
       @dependent_targets = []
+      @build_config_cache = {}
     end
 
     # @param [Hash{Array => PodTarget}] cache
@@ -141,9 +142,12 @@ module Pod
     # A target should not be build if it has no source files.
     #
     def should_build?
-      source_files = file_accessors.flat_map(&:source_files)
-      source_files -= file_accessors.flat_map(&:headers)
-      !source_files.empty?
+      return @should_build if defined? @should_build
+      @should_build = begin
+        source_files = file_accessors.flat_map(&:source_files)
+        source_files -= file_accessors.flat_map(&:headers)
+        !source_files.empty?
+      end
     end
 
     # @return [Array<Specification::Consumer>] the specification consumers for
@@ -156,8 +160,11 @@ module Pod
     # @return [Boolean] Whether the target uses Swift code
     #
     def uses_swift?
-      file_accessors.any? do |file_accessor|
-        file_accessor.source_files.any? { |sf| sf.extname == '.swift' }
+      return @uses_swift if defined? @uses_swift
+      @uses_swift = begin
+        file_accessors.any? do |file_accessor|
+          file_accessor.source_files.any? { |sf| sf.extname == '.swift' }
+        end
       end
     end
 
@@ -216,13 +223,20 @@ module Pod
     #         The name of the build configuration.
     #
     def include_in_build_config?(target_definition, configuration_name)
+      key = [target_definition.label, configuration_name]
+      if @build_config_cache.key?(key)
+        return @build_config_cache[key]
+      end
+
       whitelists = target_definition_dependencies(target_definition).map do |dependency|
         target_definition.pod_whitelisted_for_configuration?(dependency.name, configuration_name)
       end.uniq
 
       if whitelists.empty?
+        @build_config_cache[key] = true
         return true
       elsif whitelists.count == 1
+        @build_config_cache[key] = whitelists.first
         whitelists.first
       else
         raise Informative, "The subspecs of `#{pod_name}` are linked to " \
@@ -237,13 +251,16 @@ module Pod
     # @return [Bool]
     #
     def inhibit_warnings?
+      return @inhibit_warnings if defined? @inhibit_warnings
       whitelists = target_definitions.map do |target_definition|
         target_definition.inhibits_warnings_for_pod?(root_spec.name)
       end.uniq
 
       if whitelists.empty?
+        @inhibit_warnings = false
         return false
       elsif whitelists.count == 1
+        @inhibit_warnings = whitelists.first
         whitelists.first
       else
         UI.warn "The pod `#{pod_name}` is linked to different targets " \

data/lib/cocoapods/validator.rb

@@ -142,7 +142,15 @@ module Pod
         reasons << 'all results apply only to public specs, but you can use ' \
                    '`--private` to ignore them if linting the specification for a private pod'
       end
-      reasons.to_sentence
+      if dot_swift_version.nil?
+        reasons.to_sentence + ".\n[!] The validator for Swift projects uses " \
+          'Swift 2.3 by default, if you are using a different version of ' \
+          'swift you can use a `.swift-version` file to set the version for ' \
+          "your Pod. For example to use Swift 3.0, run: \n" \
+          '    `echo "3.0" > .swift-version`'
+      else
+        reasons.to_sentence
+      end
     end
 
     #-------------------------------------------------------------------------#
@@ -243,6 +251,10 @@ module Pod
       @swift_version ||= dot_swift_version || '2.3'
     end
 
+    # Set the SWIFT_VERSION that should be used to validate the pod.
+    #
+    attr_writer :swift_version
+
     # @return [String] the SWIFT_VERSION in the .swift-version file or nil.
     #
     def dot_swift_version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc.2
+  version: 1.1.0.rc.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,21 +19,21 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc.2
+        version: 1.1.0.rc.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc.2
+        version: 1.1.0.rc.3
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -151,22 +151,16 @@ dependencies:
   name: cocoapods-trunk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.1.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.1.0.beta.1
 - !ruby/object:Gem::Dependency
   name: cocoapods-try
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +201,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +211,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -275,14 +269,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: gh_inspector
   requirement: !ruby/object:Gem::Requirement