cocoapods 1.0.0.beta.6 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82ef0fd2f13afd200f730d294d1e85d7aac49aba
-  data.tar.gz: c2b830bfc6c0edb7dd4e8ed8ab40409126825420
+  metadata.gz: 3dad1137b88db30433224f32beb6b05fda8a7520
+  data.tar.gz: 8dd9cf3861598c0cbf0edbd0ddddb48772a99980
 SHA512:
-  metadata.gz: e426d23e4284592fbdb93d1591d5a30d96b30dfc6b98b51a1da55476a0678075599892f82b9bf4d3d4885e5840f6d10efc986bcc52ba1e7d25889ccee0256b5f
-  data.tar.gz: 55d32672b07f933172d9e6cd3d90112a0fa4d0a863db32a3ea7747399312ffddc3ab6ee2b4df772a638d6abe12eee4aa84d48b2fef99755c9ea30cbebcecb068
+  metadata.gz: e4f0c3204e161850bbb8f28146aa44217341c3bf789447332b828a18920f8b3a26ffc0e96c8253de20c384beea82ec24eb9048adab11279dcdebda1d88088224
+  data.tar.gz: 6f5815cb525de8814396def649f642cf31745e2551935e9fa76795975217ccba909053e91cf63a928ef986f913948e920c66309b1187560244506ae7ac6b4001

data/CHANGELOG.md

@@ -4,6 +4,52 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.0.0.beta.7 (2016-04-15)
+
+##### Enhancements
+
+* When an unknown build configuration is mentioned in the Podfile, CocoaPods
+  will suggest the build configurations found in the user project.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5113](https://github.com/CocoaPods/CocoaPods/issues/5113)
+
+* Improved the error message when a matching spec cannot be found,
+  mentioning that now `pod repo update` is not implicit when running `pod
+  install`.  
+  [Orta Therox](https://github.com/orta)
+  [#5135](https://github.com/CocoaPods/CocoaPods/issues/5135)
+
+* Add support for sharded specs directories.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#5002](https://github.com/CocoaPods/CocoaPods/issues/5002)
+
+* Pass the build setting `OTHER_CODE_SIGN_FLAGS` to codesign for the generated
+  embed frameworks build phase's script, as Xcode does when signing natively.  
+  [Václav Slavík](https://github.com/vslavik)
+  [#5087](https://github.com/CocoaPods/CocoaPods/pull/5087)
+
+##### Bug Fixes
+
+* Sort files from `Dir.glob` explicitly to produce same result on case sensitive
+  file system as result on case insensitive file system.  
+  [Soutaro Matsumoto](https://github.com/soutaro)
+
+* Fix build path for resource bundles.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#5034](https://github.com/CocoaPods/CocoaPods/issues/5034)
+
+* Rely on `TARGET_BUILD_DIR` instead of `CONFIGURATION_BUILD_DIR` in the
+  generated embed resources build phase's script, so that UI test targets can
+  be run.  
+  [seaders](https://github.com/seaders)
+  [#5133](https://github.com/CocoaPods/CocoaPods/issues/5133)
+
+* Ensure that a `CFBundleVersion` is set for resource bundles' Info.plist
+  files.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4897](https://github.com/CocoaPods/CocoaPods/issues/4897)
+
+
 ## 1.0.0.beta.6 (2016-03-15)
 
 ##### Breaking

data/lib/cocoapods.rb

@@ -49,7 +49,6 @@ module Pod
   autoload :Project,                   'cocoapods/project'
   autoload :Resolver,                  'cocoapods/resolver'
   autoload :Sandbox,                   'cocoapods/sandbox'
-  autoload :SourcesManager,            'cocoapods/sources_manager'
   autoload :Target,                    'cocoapods/target'
   autoload :Validator,                 'cocoapods/validator'
 
@@ -68,4 +67,6 @@ module Pod
     autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'
   end
+
+  require 'cocoapods/core_overrides'
 end

data/lib/cocoapods/command.rb

@@ -93,7 +93,7 @@ module Pod
     # @return [void]
     #
     def ensure_master_spec_repo_exists!
-      unless SourcesManager.master_repo_functional?
+      unless config.sources_manager.master_repo_functional?
         Setup.new(CLAide::ARGV.new([])).run
       end
     end

data/lib/cocoapods/command/init.rb

@@ -34,8 +34,8 @@ module Pod
           help! "Xcode project at #{@project_path} does not exist" unless File.exist? @project_path
           project_path = @project_path
         else
-          raise Informative, 'No xcode project found, please specify one' unless @project_paths.length > 0
-          raise Informative, 'Multiple xcode projects found, please specify one' unless @project_paths.length == 1
+          raise Informative, 'No Xcode project found, please specify one' unless @project_paths.length > 0
+          raise Informative, 'Multiple Xcode projects found, please specify one' unless @project_paths.length == 1
           project_path = @project_paths.first
         end
         @xcode_project = Xcodeproj::Project.open(project_path)
@@ -54,10 +54,10 @@ module Pod
       #
       def podfile_template(project)
         podfile = ''
-        podfile << "xcodeproj '#{@project_path}'\n\n" if @project_path
+        podfile << "project '#{@project_path}'\n\n" if @project_path
         podfile << <<-PLATFORM.strip_heredoc
           # Uncomment this line to define a global platform for your project
-          # platform :ios, '8.0'
+          # platform :ios, '9.0'
           # Uncomment this line if you're using Swift
           # use_frameworks!
         PLATFORM

data/lib/cocoapods/command/install.rb

@@ -4,7 +4,7 @@ module Pod
       include RepoUpdate
       include ProjectDirectory
 
-      self.summary = 'Install project dependencies to Podfile.lock versions'
+      self.summary = 'Install project dependencies according to versions from a Podfile.lock'
 
       self.description = <<-DESC
         Downloads all dependencies defined in `Podfile` and creates an Xcode

data/lib/cocoapods/command/inter_process_communication.rb

@@ -81,7 +81,7 @@ module Pod
 
         def run
           require 'yaml'
-          sets = SourcesManager.aggregate.all_sets
+          sets = config.sources_manager.aggregate.all_sets
           result = {}
           sets.each do |set|
             begin
@@ -117,8 +117,8 @@ module Pod
         DESC
 
         def run
-          SourcesManager.updated_search_index
-          output_pipe.puts(SourcesManager.search_index_path)
+          config.sources_manager.updated_search_index
+          output_pipe.puts(config.sources_manager.search_index_path)
         end
       end
 

data/lib/cocoapods/command/list.rb

@@ -20,7 +20,7 @@ module Pod
       def run
         update_if_necessary!
 
-        sets = SourcesManager.aggregate.all_sets
+        sets = config.sources_manager.aggregate.all_sets
         sets.each { |set| UI.pod(set, :name_and_version) }
         UI.puts "\n#{sets.count} pods were found"
       end

data/lib/cocoapods/command/outdated.rb

@@ -8,7 +8,7 @@ module Pod
 
       self.description = <<-DESC
         Shows the outdated pods in the current Podfile.lock, but only those from
-        spec repos, not those from local/external sources or `:head` versions.
+        spec repos, not those from local/external sources.
       DESC
 
       # Run the command

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

@@ -40,7 +40,7 @@ module Pod
             create_repos_dir
             clone_repo
             checkout_branch
-            SourcesManager.check_version_information(dir)
+            config.sources_manager.sources([dir.basename.to_s]).each(&:verify_compatibility!)
           end
         end
 

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

@@ -36,19 +36,19 @@ module Pod
         def run
           sources = if @name
                       if File.exist?(@name)
-                        [Pathname.new(@name)]
+                        [Source.new(Pathname(@name))]
                       else
-                        SourcesManager.sources([@name]).map(&:repo)
+                        config.sources_manager.sources([@name])
                       end
                     else
-                      SourcesManager.aggregate.sources.map(&:repo)
+                      config.sources_manager.all
                     end
 
           sources.each do |source|
-            SourcesManager.check_version_information(source)
-            UI.puts "\nLinting spec repo `#{source.basename}`\n".yellow
+            source.verify_compatibility!
+            UI.puts "\nLinting spec repo `#{source.name}`\n".yellow
 
-            validator = Source::HealthReporter.new(source)
+            validator = Source::HealthReporter.new(source.repo)
             validator.pre_check do |_name, _version|
               UI.print '.'
             end

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

@@ -30,7 +30,7 @@ module Pod
         #          - path: /Users/lascorbe/.cocoapods/repos/test
         #
         def run
-          sources = SourcesManager.all
+          sources = config.sources_manager.all
           print_sources(sources) unless @count_only
           print_count_of_sources(sources)
         end
@@ -45,7 +45,7 @@ module Pod
         # @return [void]
         #
         def print_source(source)
-          if SourcesManager.git_repo?(source.repo)
+          if source.git?
             Dir.chdir(source.repo) do
               branch_name = `git name-rev --name-only HEAD 2>/dev/null`.strip
               branch_name = 'unknown' if branch_name.empty?

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

@@ -38,7 +38,8 @@ module Pod
           @allow_warnings = argv.flag?('allow-warnings')
           @local_only = argv.flag?('local-only')
           @repo = argv.shift_argument
-          @source_urls = argv.option('sources', SourcesManager.all.map(&:url).join(',')).split(',')
+          @source = config.sources_manager.sources([@repo]).first
+          @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).join(',')).split(',')
           @podspec = argv.shift_argument
           @use_frameworks = !argv.flag?('use-libraries')
           @private = argv.flag?('private', true)
@@ -48,8 +49,14 @@ module Pod
         end
 
         def validate!
-          super
           help! 'A spec-repo name is required.' unless @repo
+          unless @source.repo.directory?
+            raise Informative,
+                  "Unable to find the `#{@repo}` repo. " \
+                  'If it has not yet been cloned, add it via `pod repo add`.'
+          end
+
+          super
         end
 
         def run
@@ -161,12 +168,12 @@ module Pod
           UI.puts "\nAdding the #{'spec'.pluralize(count)} to the `#{@repo}' repo\n".yellow
           podspec_files.each do |spec_file|
             spec = Pod::Specification.from_file(spec_file)
-            output_path = File.join(repo_dir, spec.name, spec.version.to_s)
+            output_path = @source.pod_path(spec.name) + spec.version.to_s
             if @message && !@message.empty?
               message = @message
-            elsif Pathname.new(output_path).exist?
+            elsif output_path.exist?
               message = "[Fix] #{spec}"
-            elsif Pathname.new(File.join(repo_dir, spec.name)).exist?
+            elsif output_path.dirname.directory?
               message = "[Update] #{spec}"
             else
               message = "[Add] #{spec}"
@@ -205,16 +212,7 @@ module Pod
         # @return [Pathname] The directory of the repository.
         #
         def repo_dir
-          specs_dir = Pathname.new(File.join(config.repos_dir, @repo, 'Specs'))
-          dir = config.repos_dir + @repo
-          if specs_dir.exist?
-            dir = specs_dir
-          elsif dir.exist?
-            dir
-          else
-            raise Informative, "`#{@repo}` repo not found either in #{specs_dir} or #{dir}"
-          end
-          dir
+          @source.specs_dir
         end
 
         # @return [Array<Pathname>] The path of the specifications to push.

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

@@ -19,7 +19,7 @@ module Pod
         end
 
         def run
-          SourcesManager.update(@name, true)
+          config.sources_manager.update(@name, true)
         end
       end
     end

data/lib/cocoapods/command/setup.rb

@@ -59,7 +59,7 @@ module Pod
       # @return [void]
       #
       def update_master_repo
-        SourcesManager.update('master', true)
+        config.sources_manager.update('master', true)
       end
 
       # Sets the repo to the master branch.
@@ -95,7 +95,7 @@ module Pod
       # @return [Pathname] the directory of the master repo.
       #
       def master_repo_dir
-        SourcesManager.master_repo_dir
+        config.sources_manager.master_repo_dir
       end
     end
   end

data/lib/cocoapods/command/spec.rb

@@ -40,7 +40,7 @@ module Pod
       # @return [Pathname] the absolute path or paths of the given podspec
       #
       def get_path_of_spec(spec, show_all = false)
-        sets = SourcesManager.search_by_name(spec)
+        sets = config.sources_manager.search_by_name(spec)
 
         if sets.count == 1
           set = sets.first

data/lib/cocoapods/config.rb

@@ -130,6 +130,11 @@ module Pod
 
     attr_writer :repos_dir
 
+    def sources_manager
+      return @sources_manager if @sources_manager && @sources_manager.repos_dir == repos_dir
+      @sources_manager = Source::Manager.new(repos_dir)
+    end
+
     # @return [Pathname] the directory where the CocoaPods templates are stored.
     #
     def templates_dir

data/lib/cocoapods/core_overrides.rb

@@ -0,0 +1 @@
+require 'cocoapods/sources_manager'

data/lib/cocoapods/downloader.rb

@@ -67,7 +67,7 @@ module Pod
     #
     def self.download_request(request, target)
       result = Response.new
-      result.checkout_options = download_source(request.name, target, request.params, request.head?)
+      result.checkout_options = download_source(target, request.params)
       result.location = target
 
       if request.released_pod?
@@ -88,35 +88,22 @@ module Pod
 
     private
 
-    # Downloads a pod with the given `name` and `params` to `target`.
-    #
-    # @param  [String] name
+    # Downloads a pod with the given `params` to `target`.
     #
     # @param  [Pathname] target
     #
     # @param  [Hash<Symbol,String>] params
     #
-    # @param  [Boolean] head
-    #
     # @return [Hash] The checkout options required to re-download this exact
     #         same source.
     #
-    def self.download_source(name, target, params, head)
+    def self.download_source(target, params)
       FileUtils.rm_rf(target)
       downloader = Downloader.for_target(target, params)
-      if head
-        unless downloader.head_supported?
-          raise Informative, "The pod '#{name}' does not " \
-            "support the :head option, as it uses a #{downloader.name} " \
-            'source. Remove that option to use this pod.'
-        end
-        downloader.download_head
-      else
-        downloader.download
-      end
+      downloader.download
       target.mkpath
 
-      if downloader.options_specific? && !head
+      if downloader.options_specific?
         params
       else
         downloader.checkout_options

data/lib/cocoapods/downloader/request.rb

@@ -23,11 +23,6 @@ module Pod
       #
       attr_reader :params
 
-      # @return [Boolean] Whether the download request is for a head download.
-      #
-      attr_reader :head
-      alias_method :head?, :head
-
       # Initialize a new instance
       #
       # @param  [Specification,Nil] spec
@@ -42,15 +37,11 @@ module Pod
       # @param  [Hash<Symbol,String>,Nil] params
       #         see {#params}
       #
-      # @param  [Boolean] head
-      #         see {#head}
-      #
-      def initialize(spec: nil, released: false, name: nil, params: false, head: false)
+      def initialize(spec: nil, released: false, name: nil, params: false)
         @released_pod = released
         @spec = spec
         @params = spec ? (spec.source && spec.source.dup) : params
         @name = spec ? spec.name : name
-        @head = head
 
         validate!
       end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -97,7 +97,7 @@ module Pod
 #!/bin/sh
 set -e
 
-mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 
 RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt
 > "$RESOURCES_TO_COPY"
@@ -140,30 +140,30 @@ EOM
   fi
   case $RESOURCE_PATH in
     *\.storyboard)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS}
       ;;
     *\.xib)
-      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
-      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
+      echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT}"
+      ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \\"$RESOURCE_PATH\\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}"
       ;;
     *.framework)
-      echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      echo "rsync -av $RESOURCE_PATH ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
-      rsync -av "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
     *.xcdatamodel)
-      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\\""
-      xcrun momc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"
+      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\\""
+      xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom"
       ;;
     *.xcdatamodeld)
-      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\\""
-      xcrun momc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"
+      echo "xcrun momc \\"$RESOURCE_PATH\\" \\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\\""
+      xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd"
       ;;
     *.xcmappingmodel)
-      echo "xcrun mapc \\"$RESOURCE_PATH\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\\""
-      xcrun mapc "$RESOURCE_PATH" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
+      echo "xcrun mapc \\"$RESOURCE_PATH\\" \\"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\\""
+      xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
       ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
@@ -179,8 +179,8 @@ EOS
 
       RSYNC_CALL = <<EOS
 
-mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
   mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
   rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"