cocoapods 1.4.0.beta.2 → 1.4.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435d85f5f3ea7e2924e657bc8a5511dc477ea0be
-  data.tar.gz: 880a615bf2c28d75295a0e1b6117e1451c696724
+  metadata.gz: 3fb1486e8a7724cc9a1ef5a1121aec8cc3b88801
+  data.tar.gz: 4f61dc7de59a46d9407f427239761da95b4cd72f
 SHA512:
-  metadata.gz: 72ed25c0b7a5faab93b0f6576f82db05981206cdeda385f00751bbe4011f512cb1a57be9d9f927211a4833bd641601b3e199fb28dda834fe11db270cdbbcf9ce
-  data.tar.gz: 086ff09352aa6face50b22e8a8910a22c34c38141a7dc11d6e426bc749876082951d5d07ac4675f8d9ca8e85f74febe128ca63c19aa0b6a7b9d5912673778f91
+  metadata.gz: 5b81780a945ded8208719682bea1db9de648a1b0373b3df6454ea1e57e2bc32e561e7bfd3c4170f343d058f949225cf995168db790dd5713e11d734335b2e587
+  data.tar.gz: 2f1f5de875bc175d019b6ec3f5312d72571708d1c380e19c6326db83071597673993a0f3bce777718eec66b5a3779b435a920ec5de8170f7e9ddeadafb7b898d

data/CHANGELOG.md

@@ -4,6 +4,101 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.4.0.rc.1 (2017-12-16)
+
+##### Enhancements
+
+* Integrate `swift_version` DSL support into pod targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7134](https://github.com/CocoaPods/CocoaPods/issues/7134)
+
+* Add color indication to output of `pod outdated`  
+  [iv-mexx](https://github.com/iv-mexx)
+  [#7204](https://github.com/CocoaPods/CocoaPods/pull/7204)
+
+* Set syntax of podspecs from development pods to Ruby when appropriate  
+  [Eric Amorde](https://github.com/amorde)
+  [#7278](https://github.com/CocoaPods/CocoaPods/pull/7278)
+
+* Add support for editing the podspec, license, README, license, and docs of local development pods  
+  [Eric Amorde](https://github.com/amorde)
+  [#7093](https://github.com/CocoaPods/CocoaPods/pull/7093)
+
+* Show warning when SDK provider tries to push a version with an unencrypted HTTP source  
+  [KrauseFx](https://github.com/KrauseFx)
+  [#7250](https://github.com/CocoaPods/CocoaPods/pull/7250)
+
+##### Bug Fixes
+
+* Deduplicate output path file names for resources and frameworks  
+  [Eric Amorde](https://github.com/amorde)
+  [#7259](https://github.com/CocoaPods/CocoaPods/issues/7259)
+
+* Allow installation of a pod with its own Swift version on multiple targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7261](https://github.com/CocoaPods/CocoaPods/pull/7261)
+
+* Quote framework names in OTHER_LDFLAGS  
+  [Tyler Stromberg](https://github.com/AquaGeek)
+  [#7185](https://github.com/CocoaPods/CocoaPods/issues/7185)
+
+* Fix static framework archive regression from #7187  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7225](https://github.com/CocoaPods/CocoaPods/issues/7225)
+
+* Install resource bundles and embed frameworks for every test target's configuration  
+  [Nickolay Tarbayev](https://github.com/tarbayev)
+  [#7012](https://github.com/CocoaPods/CocoaPods/issues/7012)
+
+* Set `SWIFT_VERSION` to test native targets during validation  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7216](https://github.com/CocoaPods/CocoaPods/pull/7216)
+
+* Add copied resources' paths to "Copy Pods Resources" output file list  
+  [igor-makarov](https://github.com/igor-makarov)
+  [#6936](https://github.com/CocoaPods/CocoaPods/issues/6936)
+
+* Do not link system frameworks of test specs to library targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7205](https://github.com/CocoaPods/CocoaPods/pull/7205)
+
+* Be more lenient when stripping frameworks and dSYMs for non fat binaries  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7196](https://github.com/CocoaPods/CocoaPods/issues/7196)
+  [#5854](https://github.com/CocoaPods/CocoaPods/issues/5854)
+
+* Do not display script phases warnings multiple times per platform  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7193](https://github.com/CocoaPods/CocoaPods/pull/7193)
+
+* Fix unnecessary whole project recompilation with static frameworks  
+  [Vladimir Gorbenko](https://github.com/volodg)
+  [#7187](https://github.com/CocoaPods/CocoaPods/issues/7187)
+
+* Prevent passing empty string to git when running `pod repo update --silent`  
+  [Jon Sorrells](https://github.com/jonsorrells)
+  [#7176](https://github.com/CocoaPods/CocoaPods/issues/7176)
+
+* Do not propagate test spec frameworks and libraries into pod target xcconfig  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7172](https://github.com/CocoaPods/CocoaPods/issues/7172)
+
+* Set language to Swift for test native targets if any dependencies use Swift  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7170](https://github.com/CocoaPods/CocoaPods/issues/7170)
+  
+* Prevent multiple script phases from stripping vendored dSYM  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7166](https://github.com/CocoaPods/CocoaPods/pull/7166)
+
+* Static library headers should all be `Project` in Xcode header build phase  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#4496](https://github.com/CocoaPods/CocoaPods/issues/4496)
+
+* Fix archiving apps with static frameworks  
+  [Paul Beusterien](https://github.com/paulb777)
+  [#7158](https://github.com/CocoaPods/CocoaPods/issues/7158)
+
 ## 1.4.0.beta.2 (2017-10-24)
 
 ##### Enhancements
@@ -67,7 +162,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#7104](https://github.com/CocoaPods/CocoaPods/pull/7104)
 
-* Do not set a `CODE_SIGN_IDENTITY` for macOS app hosts or xctest bundles
+* Do not set a `CODE_SIGN_IDENTITY` for macOS app hosts or xctest bundles  
   [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
   [#7103](https://github.com/CocoaPods/CocoaPods/pull/7103)
 

data/lib/cocoapods/command/outdated.rb

@@ -22,10 +22,24 @@ module Pod
         if updates.empty?
           UI.puts 'No pod updates are available.'.yellow
         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 "#{'<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)|
-              UI.puts "- #{name} #{from_version} -> #{matching_version} " \
-                "(latest version #{to_version})"
+              color = :yellow
+              if matching_version == to_version
+                color = :green
+              elsif from_version == matching_version
+                color = :red
+              end
+              # For the specs, its necessary that to_s is called here even though it is redundant
+              # https://github.com/CocoaPods/CocoaPods/pull/7204#issuecomment-342512015
+              UI.puts "- #{name} #{from_version.to_s.send(color)} -> #{matching_version.to_s.send(color)} " \
+              "(latest version #{to_version.to_s})" # rubocop:disable Lint/StringConversionInInterpolation
             end
           end
         end

data/lib/cocoapods/external_sources/path_source.rb

@@ -16,7 +16,7 @@ module Pod
           end
           store_podspec(sandbox, podspec, podspec.extname == '.json')
           is_absolute = absolute?(declared_path)
-          sandbox.store_local_path(name, podspec.dirname, is_absolute)
+          sandbox.store_local_path(name, podspec, is_absolute)
           sandbox.remove_checkout_source(name)
         end
       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.beta.2'.freeze unless defined? Pod::VERSION
+  VERSION = '1.4.0.rc.1'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -43,10 +43,14 @@ module Pod
 
           SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
 
+          # Used as a return value for each invocation of `strip_invalid_archs` function.
+          STRIP_BINARY_RETVAL=0
+
           # This protects against multiple targets copying the same framework dependency at the same time. The solution
           # was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
           RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
 
+          # Copies and strips a vendored framework
           install_framework()
           {
             if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
@@ -95,21 +99,31 @@ module Pod
             fi
           }
 
-          # Copies the dSYM of a vendored framework
+          # Copies and strips a vendored dSYM
           install_dsym() {
             local source="$1"
             if [ -r "$source" ]; then
-              echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
-              rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
-            fi
+              # Copy the dSYM into a the targets temp dir.
+              echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${source}\\" \\"${DERIVED_FILES_DIR}\\""
+              rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
 
-            local basename
-            basename="$(basename -s .framework.dSYM "$source")"
-            binary="${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
+              local basename
+              basename="$(basename -s .framework.dSYM "$source")"
+              binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
 
-            # Strip invalid architectures so "fat" simulator / device frameworks work on device
-            if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
-              strip_invalid_archs "$binary"
+              # Strip invalid architectures so "fat" simulator / device frameworks work on device
+              if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
+                strip_invalid_archs "$binary"
+              fi
+
+              if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
+                # Move the stripped file into its final destination.
+                echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \\"- CVS/\\" --filter \\"- .svn/\\" --filter \\"- .git/\\" --filter \\"- .hg/\\" --filter \\"- Headers\\" --filter \\"- PrivateHeaders\\" --filter \\"- Modules\\" \\"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\\" \\"${DWARF_DSYM_FOLDER_PATH}\\""
+                rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
+              else
+                # The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
+                touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
+              fi
             fi
           }
 
@@ -131,10 +145,18 @@ module Pod
           # Strip invalid architectures
           strip_invalid_archs() {
             binary="$1"
-            # Get architectures for current file
-            archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
+            # Get architectures for current target binary
+            binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
+            # Intersect them with the architectures we are building for
+            intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\\n' | sort | uniq -d)"
+            # If there are no archs supported by this binary then warn the user
+            if [[ -z "$intersected_archs" ]]; then
+              echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
+              STRIP_BINARY_RETVAL=0
+              return
+            fi
             stripped=""
-            for arch in $archs; do
+            for arch in $binary_archs; do
               if ! [[ "${ARCHS}" == *"$arch"* ]]; then
                 # Strip non-valid architectures in-place
                 lipo -remove "$arch" -output "$binary" "$binary" || exit 1
@@ -144,6 +166,7 @@ module Pod
             if [[ "$stripped" ]]; then
               echo "Stripped $binary of architectures:$stripped"
             fi
+            STRIP_BINARY_RETVAL=1
           }
 
         SH

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

@@ -64,18 +64,18 @@ module Pod
 
           @xcconfig = Xcodeproj::Config.new(config)
 
-          XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig)
+          XCConfigHelper.add_settings_for_file_accessors_of_target(nil, target, @xcconfig, true, @test_xcconfig)
           target.file_accessors.each do |file_accessor|
             @xcconfig.merge!(file_accessor.spec_consumer.pod_target_xcconfig) if @test_xcconfig == file_accessor.spec.test_specification?
           end
           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) if target.requires_frameworks?
+          XCConfigHelper.generate_vendored_build_settings(target, recursive_dependent_targets, @xcconfig, false, @test_xcconfig) if target.requires_frameworks?
           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)
-            XCConfigHelper.generate_vendored_build_settings(nil, target.all_test_dependent_targets, @xcconfig)
+            XCConfigHelper.generate_vendored_build_settings(nil, target.all_test_dependent_targets, @xcconfig, true, @test_xcconfig)
             XCConfigHelper.generate_other_ld_flags(nil, target.all_test_dependent_targets, @xcconfig)
             XCConfigHelper.generate_ld_runpath_search_paths(target, false, true, @xcconfig)
           end

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

@@ -75,19 +75,24 @@ module Pod
         # @param  [Boolean] include_ld_flags
         #         Indicates whether or not to generate ld flags in addition to compile flags
         #
+        # @param  [Boolean] test_xcconfig
+        #         Whether the settings for dependent targets are being generated for a test xcconfig or not.
+        #
         # @return [void]
         #
-        def self.add_settings_for_file_accessors_of_target(target, pod_target, xcconfig, include_ld_flags = true)
-          pod_target.file_accessors.each do |file_accessor|
+        def self.add_settings_for_file_accessors_of_target(target, pod_target, xcconfig, include_ld_flags = true, test_xcconfig = false)
+          file_accessors = pod_target.file_accessors
+          file_accessors = file_accessors.reject { |f| f.spec.test_specification? } unless test_xcconfig
+          file_accessors.each do |file_accessor|
             if target.nil? || !file_accessor.spec.test_specification?
               XCConfigHelper.add_spec_build_settings_to_xcconfig(file_accessor.spec_consumer, xcconfig) if include_ld_flags
               XCConfigHelper.add_static_dependency_build_settings(target, pod_target, xcconfig, file_accessor, include_ld_flags)
             end
           end
-          XCConfigHelper.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags)
+          XCConfigHelper.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags, test_xcconfig)
           if pod_target.requires_frameworks?
             pod_target.dependent_targets.each do |dependent_target|
-              XCConfigHelper.add_dynamic_dependency_build_settings(target, dependent_target, xcconfig, include_ld_flags)
+              XCConfigHelper.add_dynamic_dependency_build_settings(target, dependent_target, xcconfig, include_ld_flags, test_xcconfig)
             end
           end
         end
@@ -153,10 +158,15 @@ module Pod
         # @param  [Boolean] include_ld_flags
         #         Indicates whether or not to generate ld flags in addition to compile flags
         #
+        # @param  [Boolean] test_xcconfig
+        #         Whether the settings for dependent targets are being generated for a test xcconfig or not.
+        #
         # @return [void]
         #
-        def self.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags)
-          pod_target.file_accessors.each do |file_accessor|
+        def self.add_dynamic_dependency_build_settings(target, pod_target, xcconfig, include_ld_flags, test_xcconfig)
+          file_accessors = pod_target.file_accessors
+          file_accessors = file_accessors.reject { |f| f.spec.test_specification? } unless test_xcconfig
+          file_accessors.each do |file_accessor|
             if target.nil? || !file_accessor.spec.test_specification?
               file_accessor.vendored_dynamic_frameworks.each do |vendored_dynamic_framework|
                 XCConfigHelper.add_framework_build_settings(vendored_dynamic_framework, xcconfig, pod_target.sandbox.root, include_ld_flags)
@@ -209,7 +219,7 @@ module Pod
           build_settings = {
             'FRAMEWORK_SEARCH_PATHS' => quote([dirname]),
           }
-          build_settings['OTHER_LDFLAGS'] = "-framework #{name}" if include_ld_flags
+          build_settings['OTHER_LDFLAGS'] = "-framework \"#{name}\"" if include_ld_flags
           xcconfig.merge!(build_settings)
         end
 
@@ -237,7 +247,7 @@ module Pod
           build_settings = {
             'LIBRARY_SEARCH_PATHS' => quote([dirname]),
           }
-          build_settings['OTHER_LDFLAGS'] = "-l#{name}" if include_ld_flags
+          build_settings['OTHER_LDFLAGS'] = "-l\"#{name}\"" if include_ld_flags
           xcconfig.merge!(build_settings)
         end
 
@@ -376,16 +386,19 @@ module Pod
         # @param  [Boolean] include_ld_flags
         #         Indicates whether or not to generate ld flags in addition to compile flags
         #
+        # @param  [Boolean] test_xcconfig
+        #         Indicates whether or not the generated ld flags are for a test xcconfig or not
+        #
         # @note
         #   In case of generated pod targets, which require frameworks, the
         #   vendored frameworks and libraries are already linked statically
         #   into the framework binary and must not be linked again to the
         #   user target.
         #
-        def self.generate_vendored_build_settings(target, dep_targets, xcconfig, include_ld_flags = true)
+        def self.generate_vendored_build_settings(target, dep_targets, xcconfig, include_ld_flags = true, test_xcconfig = false)
           dep_targets.each do |dep_target|
             unless dep_target.should_build? && dep_target.requires_frameworks? && !dep_target.static_framework?
-              XCConfigHelper.add_settings_for_file_accessors_of_target(target, dep_target, xcconfig, include_ld_flags)
+              XCConfigHelper.add_settings_for_file_accessors_of_target(target, dep_target, xcconfig, include_ld_flags, test_xcconfig)
             end
           end
         end

data/lib/cocoapods/installer.rb

@@ -530,12 +530,11 @@ module Pod
     #
     def warn_for_installed_script_phases
       pods_to_install = sandbox_state.added | sandbox_state.changed
-      pod_targets.each do |pod_target|
-        spec = pod_target.root_spec
-        if pods_to_install.include?(spec.name)
-          script_phase_count = pod_target.script_phases.count
+      pod_targets.group_by(&:pod_name).each do |name, pod_targets|
+        if pods_to_install.include?(name)
+          script_phase_count = pod_targets.inject(0) { |sum, target| sum + target.script_phases.count }
           unless script_phase_count.zero?
-            UI.warn "#{spec.name} has added #{pod_target.script_phases.count} #{'script phase'.pluralize(script_phase_count)}. " \
+            UI.warn "#{name} has added #{script_phase_count} #{'script phase'.pluralize(script_phase_count)}. " \
               'Please inspect before executing a build. See `https://guides.cocoapods.org/syntax/podspec.html#script_phases` for more information.'
           end
         end

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

@@ -190,6 +190,23 @@ module Pod
               end
             end
           end
+
+          # Returns an extension in the target that corresponds to the
+          # resource's input extension.
+          #
+          # @return [String] The output extension.
+          #
+          def output_extension_for_resource(input_extension)
+            case input_extension
+            when '.storyboard'        then '.storyboardc'
+            when '.xib'               then '.nib'
+            when '.framework'         then '.framework'
+            when '.xcdatamodel'       then '.mom'
+            when '.xcdatamodeld'      then '.momd'
+            when '.xcmappingmodel'    then '.cdm'
+            else                      input_extension
+            end
+          end
         end
 
         # Integrates the user project targets. Only the targets that do **not**
@@ -263,8 +280,14 @@ module Pod
             input_paths = []
             output_paths = []
             unless resource_paths_by_config.values.all?(&:empty?)
-              input_paths = [target.copy_resources_script_relative_path, *resource_paths_by_config.values.flatten.uniq]
-              output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+              resource_paths_flattened = resource_paths_by_config.values.flatten.uniq
+              input_paths = [target.copy_resources_script_relative_path, *resource_paths_flattened]
+              # convert input paths to output paths according to extensions
+              output_paths = resource_paths_flattened.map do |input_path|
+                base_path = '${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}'
+                output_extension = TargetIntegrator.output_extension_for_resource(File.extname(input_path))
+                File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
+              end.uniq
             end
             TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end
@@ -297,7 +320,7 @@ module Pod
             output_paths = []
             unless framework_paths_by_config.all?(&:empty?)
               input_paths = [target.embed_frameworks_script_relative_path, *framework_paths_by_config.map { |fw| [fw[:input_path], fw[:dsym_input_path]] }.flatten.compact]
-              output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact
+              output_paths = framework_paths_by_config.map { |fw| [fw[:output_path], fw[:dsym_output_path]] }.flatten.compact.uniq
             end
             TargetIntegrator.add_embed_frameworks_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end

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

@@ -192,13 +192,14 @@ module Pod
 
         def add_system_framework_dependencies
           # @TODO: Add Specs
-          pod_targets.sort_by(&:name).each do |pod_target|
-            pod_target.file_accessors.each do |file_accessor|
-              file_accessor.spec_consumer.frameworks.each do |framework|
-                if pod_target.should_build?
-                  pod_target.native_target.add_system_framework(framework)
-                end
-              end
+          pod_targets.select(&:should_build?).sort_by(&:name).each do |pod_target|
+            test_file_accessors, file_accessors = pod_target.file_accessors.partition { |fa| fa.spec.test_specification? }
+            file_accessors.each do |file_accessor|
+              add_system_frameworks_to_native_target(file_accessor, pod_target.native_target)
+            end
+            test_file_accessors.each do |test_file_accessor|
+              native_target = pod_target.native_target_for_spec(test_file_accessor.spec)
+              add_system_frameworks_to_native_target(test_file_accessor, native_target)
             end
           end
         end
@@ -315,6 +316,12 @@ module Pod
           end
         end
 
+        def add_system_frameworks_to_native_target(file_accessor, native_target)
+          file_accessor.spec_consumer.frameworks.each do |framework|
+            native_target.add_system_framework(framework)
+          end
+        end
+
         def add_resource_bundles_to_native_target(dependent_target, native_target)
           resource_bundle_targets = dependent_target.resource_bundle_targets + dependent_target.test_resource_bundle_targets
           resource_bundle_targets.each do |resource_bundle_target|

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

@@ -40,6 +40,7 @@ module Pod
             add_frameworks_bundles
             add_vendored_libraries
             add_resources
+            add_developer_files unless sandbox.development_pods.empty?
             link_headers
           end
 
@@ -109,6 +110,24 @@ module Pod
             end
           end
 
+          def add_developer_files
+            UI.message '- Adding development pod helper files to Pods project' do
+              file_accessors.each do |file_accessor|
+                pod_name = file_accessor.spec.name
+                next unless sandbox.local?(pod_name)
+                root_name = Specification.root_name(pod_name)
+                paths = file_accessor.developer_files
+                paths.each do |path|
+                  group = pods_project.group_for_spec(root_name, :developer)
+                  ref = pods_project.add_file_reference(path, group, false)
+                  if path.extname == '.podspec'
+                    pods_project.mark_ruby_file_ref(ref)
+                  end
+                end
+              end
+            end
+          end
+
           # Creates the link to the headers of the Pod in the sandbox.
           #
           # @return [void]
@@ -184,7 +203,7 @@ module Pod
               paths = allowable_project_paths(paths)
               base_path = local ? common_path(paths) : nil
               paths.each do |path|
-                group = pods_project.group_for_spec(file_accessor.spec.name, group_key)
+                group = pods_project.group_for_spec(pod_name, group_key)
                 pods_project.add_file_reference(path, group, local && reflect_file_system_structure_for_development, base_path)
               end
             end

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

@@ -242,7 +242,7 @@ module Pod
               product_type = target.product_type_for_test_type(test_type)
               name = target.test_target_label(test_type)
               platform_name = target.platform.name
-              language = target.uses_swift? ? :swift : :objc
+              language = target.all_test_dependent_targets.any?(&:uses_swift?) ? :swift : :objc
               native_test_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language)
               native_test_target.product_reference.name = name
 
@@ -402,7 +402,9 @@ module Pod
           def create_test_target_copy_resources_script(test_type)
             path = target.copy_resources_script_path_for_test_type(test_type)
             pod_targets = target.all_test_dependent_targets
-            resource_paths_by_config = { 'Debug' => pod_targets.flat_map(&:resource_paths) }
+            resource_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
+              resources_by_config[config] = pod_targets.flat_map(&:resource_paths)
+            end
             generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
             update_changed_file(generator, path)
             add_file_to_support_group(path)
@@ -418,7 +420,9 @@ module Pod
           def create_test_target_embed_frameworks_script(test_type)
             path = target.embed_frameworks_script_path_for_test_type(test_type)
             pod_targets = target.all_test_dependent_targets
-            framework_paths_by_config = { 'Debug' => pod_targets.flat_map(&:framework_paths) }
+            framework_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, paths_by_config|
+              paths_by_config[config] = pod_targets.flat_map(&:framework_paths)
+            end
             generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
             update_changed_file(generator, path)
             add_file_to_support_group(path)
@@ -431,7 +435,7 @@ module Pod
           #
           def test_target_swift_debug_hack(test_target_bc)
             return unless test_target_bc.debug?
-            return unless [target, *target.recursive_dependent_targets].any?(&:uses_swift?)
+            return unless target.all_test_dependent_targets.any?(&:uses_swift?)
             ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= '$(inherited)'
             ldflags << ' -lswiftSwiftOnoneSupport'
           end
@@ -456,7 +460,7 @@ module Pod
             eos
           end
 
-          # Creates a build phase to put the static framework archive in the appropriate framework location
+          # Creates a build phase to put the static framework in the appropriate framework location
           # Since Xcode does not provide template support for static library frameworks, we've built a static library
           # of the form lib{LibraryName}.a. We need to move that to the framework location -
           # {LibraryName}.framework/{LibraryName}.
@@ -464,13 +468,17 @@ module Pod
           # @return [void]
           #
           def create_build_phase_to_move_static_framework_archive
-            build_phase = native_target.new_shell_script_build_phase('Setup Static Framework Archive')
+            build_phase = native_target.new_shell_script_build_phase('Setup Static Framework')
             build_phase.shell_script = <<-eos.strip_heredoc
           mkdir -p "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules"
-          cp "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
-          cp "${MODULEMAP_FILE}" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/module.modulemap"
+          # The fat library archive is at a file symbolic link when archiving, so use -L option
+          rsync -tL "${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/${PRODUCT_NAME}"
+          rsync -t "${MODULEMAP_FILE}" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/module.modulemap"
           # If there's a .swiftmodule, copy it into the framework's Modules folder
-          cp -r "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}".swiftmodule "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/" 2>/dev/null || :
+          rsync -tr "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}".swiftmodule "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/Modules/" 2>/dev/null || :
+          # If archiving, Headers copy is needed
+          rsync -tr "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.framework/Headers" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/" 2>/dev/null || :
+          rsync -tr "${TARGET_BUILD_DIR}/${PRODUCT_NAME}.framework/PrivateHeaders" "${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.framework/" 2>/dev/null || :
             eos
           end
 
@@ -628,7 +636,9 @@ module Pod
 
           def add_header(build_file, public_headers, private_headers, native_target)
             file_ref = build_file.file_ref
-            acl = if public_headers.include?(file_ref.real_path)
+            acl = if !target.requires_frameworks? # Headers are already rooted at ${PODS_ROOT}/Headers/P*/[pod]/...
+                    'Project'
+                  elsif public_headers.include?(file_ref.real_path)
                     'Public'
                   elsif private_headers.include?(file_ref.real_path)
                     'Private'

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

@@ -56,8 +56,13 @@ module Pod
             input_paths = []
             output_paths = []
             unless resource_paths.empty?
-              input_paths = [script_path, *resource_paths.flatten.uniq]
-              output_paths = ['${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}']
+              resource_paths_flattened = resource_paths.flatten.uniq
+              input_paths = [script_path, *resource_paths_flattened]
+              output_paths = resource_paths_flattened.map do |input_path|
+                base_path = '${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}'
+                output_extension = UserProjectIntegrator::TargetIntegrator.output_extension_for_resource(File.extname(input_path))
+                File.join(base_path, File.basename(input_path, File.extname(input_path)) + output_extension)
+              end
             end
             UserProjectIntegrator::TargetIntegrator.add_copy_resources_script_phase_to_target(native_target, script_path, input_paths, output_paths)
           end

data/lib/cocoapods/installer/xcode/target_validator.rb

@@ -91,6 +91,7 @@ module Pod
           end
           swift_pod_targets = pod_targets.select(&:uses_swift?)
           error_messages = swift_pod_targets.map do |pod_target|
+            next unless pod_target.spec_swift_version.nil?
             swift_target_definitions = pod_target.target_definitions.reject { |target| target.swift_version.blank? }
             next if swift_target_definitions.empty? || swift_target_definitions.uniq(&:swift_version).count == 1
             target_errors = swift_target_definitions.map(&error_message_for_target).join(', ')

data/lib/cocoapods/project.rb

@@ -113,6 +113,7 @@ module Pod
     SPEC_SUBGROUPS = {
       :resources  => 'Resources',
       :frameworks => 'Frameworks',
+      :developer  => 'Pod',
     }
 
     # Returns the group for the specification with the give name creating it if
@@ -220,12 +221,22 @@ module Pod
     #
     def add_podfile(podfile_path)
       new_file(podfile_path, :project).tap do |podfile_ref|
-        podfile_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
-        podfile_ref.explicit_file_type = 'text.script.ruby'
-        podfile_ref.last_known_file_type = 'text'
+        mark_ruby_file_ref(podfile_ref)
       end
     end
 
+    # Sets the syntax of the provided file reference to be Ruby, in the case that
+    # the file does not already have a ".rb" file extension (ex. the Podfile)
+    #
+    # @param  [PBXFileReference] file_ref
+    #         The file reference to change
+    #
+    def mark_ruby_file_ref(file_ref)
+      file_ref.xc_language_specification_identifier = 'xcode.lang.ruby'
+      file_ref.explicit_file_type = 'text.script.ruby'
+      file_ref.last_known_file_type = 'text'
+    end
+
     # Adds a new build configuration to the project and populates it with
     # default settings according to the provided type.
     #

data/lib/cocoapods/sandbox.rb

@@ -152,7 +152,7 @@ module Pod
     def pod_dir(name)
       root_name = Specification.root_name(name)
       if local?(root_name)
-        Pathname.new(development_pods[root_name])
+        Pathname.new(development_pods[root_name].dirname)
       else
         sources_root + root_name
       end
@@ -211,7 +211,7 @@ module Pod
     def specification(name)
       if file = specification_path(name)
         original_path = development_pods[name]
-        Dir.chdir(original_path || Dir.pwd) { Specification.from_file(file) }
+        Specification.from_file(original_path || file)
       end
     end
 
@@ -239,8 +239,8 @@ module Pod
 
     # Stores a specification in the `Local Podspecs` folder.
     #
-    # @param  [Sandbox] sandbox
-    #         the sandbox where the podspec should be stored.
+    # @param  [String] name
+    #         the name of the pod
     #
     # @param  [String, Pathname] podspec
     #         The contents of the specification (String) or the path to a
@@ -248,8 +248,6 @@ module Pod
     #
     # @return [void]
     #
-    # @todo   Store all the specifications (including those not originating
-    #         from external sources) so users can check them.
     #
     def store_podspec(name, podspec, _external_source = false, json = false)
       file_name = json ? "#{name}.podspec.json" : "#{name}.podspec"
@@ -351,8 +349,8 @@ module Pod
     # @param  [String] name
     #         The name of the Pod.
     #
-    # @param  [#to_s] path
-    #         The local path where the Pod is stored.
+    # @param  [Pathname, String] path
+    #         The path to the local Podspec
     #
     # @param  [Bool] was_absolute
     #         True if the specified local path was absolute.
@@ -361,11 +359,12 @@ module Pod
     #
     def store_local_path(name, path, was_absolute = false)
       root_name = Specification.root_name(name)
-      development_pods[root_name] = path.to_s
+      path = Pathname.new(path) unless path.is_a?(Pathname)
+      development_pods[root_name] = path
       @pods_with_absolute_path << root_name if was_absolute
     end
 
-    # @return [Hash{String=>String}] The path of the Pods with a local source
+    # @return [Hash{String=>Pathname}] The path of the Pods' podspecs with a local source
     #         grouped by their root name.
     #
     # @todo   Rename (e.g. `pods_with_local_path`)
@@ -380,8 +379,19 @@ module Pod
     # @return [Bool] Whether the Pod is locally sourced.
     #
     def local?(name)
+      !local_podspec(name).nil?
+    end
+
+    # @param  [String] name
+    #         The name of a locally specified Pod
+    #
+    # @return [Pathname] Path to the local Podspec of the Pod
+    #
+    def local_podspec(name)
       root_name = Specification.root_name(name)
-      !development_pods[root_name].nil?
+      if path = development_pods[root_name]
+        Pathname.new(path)
+      end
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -17,6 +17,8 @@ module Pod
         :license             => 'licen{c,s}e{*,.*}'.freeze,
         :source_files        => "*{#{SOURCE_FILE_EXTENSIONS.join(',')}}".freeze,
         :public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
+        :podspecs            => '*.{podspec,podspec.json}'.freeze,
+        :docs                => 'doc{s}{*,.*}/**/*'.freeze,
       }.freeze
 
       # @return [Sandbox::PathList] the directory where the source of the Pod
@@ -291,6 +293,34 @@ module Pod
         end
       end
 
+      # @return [Array<Pathname>] The paths of auto-detected podspecs
+      #
+      def specs
+        path_list.glob([GLOB_PATTERNS[:podspecs]])
+      end
+
+      # @return [Array<Pathname>] The paths of auto-detected docs
+      #
+      def docs
+        path_list.glob([GLOB_PATTERNS[:docs]])
+      end
+
+      # @return [Array<Pathname>] Paths to include for local pods to assist in development
+      #
+      def developer_files
+        podspecs = specs
+        result = [module_map, prefix_header]
+        if podspecs.size <= 1
+          result += [license, readme, podspecs, docs]
+        else
+          result << podspec_file
+          if file = spec_consumer.license[:file]
+            result << root + file
+          end
+        end
+        result.compact.flatten.sort
+      end
+
       #-----------------------------------------------------------------------#
 
       private
@@ -311,6 +341,12 @@ module Pod
         paths_for_attribute(:private_header_files)
       end
 
+      # @return [Pathname] The path of the podspec matching @spec
+      #
+      def podspec_file
+        specs.lazy.select { |p| File.basename(p.to_s, '.*') == spec.name }.first
+      end
+
       #-----------------------------------------------------------------------#
 
       private

data/lib/cocoapods/sources_manager.rb

@@ -104,7 +104,9 @@ module Pod
 
     def update_git_repo(show_output = false)
       Config.instance.with_changes(:verbose => show_output) do
-        git!(%W(-C #{repo} fetch origin #{show_output ? '--progress' : ''}))
+        args = %W(-C #{repo} fetch origin)
+        args.push('--progress') if show_output
+        git!(args)
         current_branch = git!(%W(-C #{repo} rev-parse --abbrev-ref HEAD)).strip
         git!(%W(-C #{repo} reset --hard origin/#{current_branch}))
       end

data/lib/cocoapods/target/pod_target.rb

@@ -95,10 +95,18 @@ module Pod
       end
     end
 
-    # @return [String] the Swift version for the target.
+    # @return [String] the Swift version for the target. If the pod author has provided a swift version
+    #                  then that is the one returned, otherwise the Swift version is determined by the user
+    #                  targets that include this pod target.
     #
     def swift_version
-      target_definitions.map(&:swift_version).compact.uniq.first
+      spec_swift_version || target_definitions.map(&:swift_version).compact.uniq.first
+    end
+
+    # @return [String] the Swift version within the root spec. Might be `nil` if none is set.
+    #
+    def spec_swift_version
+      root_spec.swift_version
     end
 
     # @note   The deployment target for the pod target is the maximum of all

data/lib/cocoapods/validator.rb

@@ -257,8 +257,8 @@ module Pod
     #
     def swift_version
       return @swift_version unless @swift_version.nil?
-      if version = dot_swift_version
-        @swift_version = version
+      if (version = spec.swift_version) || (version = dot_swift_version)
+        @swift_version = version.to_s
       else
         DEFAULT_SWIFT_VERSION
       end
@@ -307,6 +307,7 @@ module Pod
       validate_screenshots(spec)
       validate_social_media_url(spec)
       validate_documentation_url(spec)
+      validate_source_url(spec)
 
       valid = spec.available_platforms.send(fail_fast ? :all? : :each) do |platform|
         UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
@@ -393,21 +394,50 @@ module Pod
       validate_url(spec.documentation_url) if spec.documentation_url
     end
 
+    # Performs validations related to the `source` -> `http` attribute (if exists)
+    #
+    def validate_source_url(spec)
+      return if spec.source.nil? || spec.source[:http].nil?
+      url = spec.source[:http]
+      return if url.downcase.start_with?('https://')
+      warning('http', "The URL (`#{url}`) doesn't use the encrypted HTTPs protocol. " \
+              'It is crucial for Pods to be transferred over a secure protocol to protect your users from man-in-the-middle attacks. '\
+              'This will be an error in future releases. Please update the URL to use https.')
+    end
+
     # Performs validation for which version of Swift is used during validation.
     #
+    # An error will be displayed if the user has provided a `swift_version` attribute within the podspec but is also
+    # using either  `--swift-version` parameter or a `.swift-version with a different Swift version.
+    #
     # The user will be warned that the default version of Swift was used if the following things are true:
     #   - The project uses Swift at all
     #   - The user did not supply a Swift version via a parameter
+    #   - There is no `swift_version` attribute set within the specification
     #   - There is no `.swift-version` file present either.
     #
     def validate_swift_version
-      if uses_swift? && @swift_version.nil? && dot_swift_version.nil?
-        warning(:swift_version,
+      return unless uses_swift?
+      spec_swift_version = spec.swift_version
+      unless spec_swift_version.nil?
+        message = nil
+        if !dot_swift_version.nil? && dot_swift_version != spec_swift_version.to_s
+          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one present in your `.swift-version` file (`#{dot_swift_version}`). " \
+                    'Please remove the `.swift-version` file which is now deprecated and only use the `swift_version` attribute within your podspec.'
+        elsif !@swift_version.nil? && @swift_version != spec_swift_version.to_s
+          message = "Specification `#{spec.name}` specifies an inconsistent `swift_version` (`#{spec_swift_version}`) compared to the one passed during lint (`#{@swift_version}`)."
+        end
+        unless message.nil?
+          error('swift', message)
+          return
+        end
+      end
+      if @swift_version.nil? && spec_swift_version.nil? && dot_swift_version.nil?
+        warning('swift',
                 'The validator used ' \
                 "Swift #{DEFAULT_SWIFT_VERSION} by default because no Swift version was specified. " \
-                'If you want to use a different version of Swift during validation, then either use the `--swift-version` parameter ' \
-                'or use a `.swift-version` file to set the version of Swift to use for ' \
-                'your Pod. For example to use Swift 4.0, run: `echo "4.0" > .swift-version`.')
+                'To specify a Swift version during validation, add the `swift_version` attribute in your podspec. ' \
+                'Note that usage of the `--swift-version` parameter or a `.swift-version` file is now deprecated.')
       end
     end
 
@@ -471,12 +501,24 @@ module Pod
          perform_post_install_actions).each { |m| @installer.send(m) }
 
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      @installer.aggregate_targets.each do |target|
+      configure_pod_targets(@installer.aggregate_targets, deployment_target)
+      @installer.pods_project.save
+    end
+
+    def configure_pod_targets(targets, deployment_target)
+      targets.each do |target|
         target.pod_targets.each do |pod_target|
           next unless (native_target = pod_target.native_target)
           native_target.build_configuration_list.build_configurations.each do |build_configuration|
             (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
-            build_configuration.build_settings['SWIFT_VERSION'] = swift_version if pod_target.uses_swift?
+            build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
+          end
+          if pod_target.uses_swift?
+            pod_target.test_native_targets.each do |test_native_target|
+              test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
+                build_configuration.build_settings['SWIFT_VERSION'] = swift_version
+              end
+            end
           end
         end
         if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
@@ -485,7 +527,6 @@ module Pod
           error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.') unless uses_xctest
         end
       end
-      @installer.pods_project.save
     end
 
     def validate_vendored_dynamic_frameworks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta.2
+  version: 1.4.0.rc.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-12-16 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.4.0.beta.2
+        version: 1.4.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.beta.2
+        version: 1.4.0.rc.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -193,21 +193,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.5.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'