• Fabio Pelosin's avatar
    Merge branch 'disable-ALWAYS_SEARCH_USER_PATHS' · 0692c04f
    Fabio Pelosin authored
    * disable-ALWAYS_SEARCH_USER_PATHS:
      CHANGELOG
      Remove usage of deprecated ALWAYS_SEARCH_USER_PATHS build setting
    
    Conflicts:
    	spec/integration/install_add_pod/after/Pods/Pods-JSONKit-Private.xcconfig
    	spec/integration/install_add_pod/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_add_pod/after/Pods/Pods.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-Reachability-Private.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-Reachability-Private.xcconfig
    	spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2.xcconfig
    	spec/integration/install_external_source/after/Pods/Pods-PodTest-Private.xcconfig
    	spec/integration/install_external_source/after/Pods/Pods.xcconfig
    	spec/integration/install_local_source/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_local_source/after/Pods/Pods.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-JSONKit-Private.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-Reachability-Private.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-test-JSONKit-Private.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods-test.xcconfig
    	spec/integration/install_multiple_targets/after/Pods/Pods.xcconfig
    	spec/integration/install_new/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_new/after/Pods/Pods.xcconfig
    	spec/integration/install_podfile_callbacks/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_podfile_callbacks/after/Pods/Pods.xcconfig
    	spec/integration/install_podspec/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_podspec/after/Pods/Pods.xcconfig
    	spec/integration/install_remove_pod/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_remove_pod/after/Pods/Pods.xcconfig
    	spec/integration/install_spec_callbacks/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/install_spec_callbacks/after/Pods/Pods.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App-PodTest-Private.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods-OS X App.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App-PodTest-Private.xcconfig
    	spec/integration/install_subspecs/after/Pods/Pods-iOS App.xcconfig
    	spec/integration/update/after/Pods/Pods-Reachability-Private.xcconfig
    	spec/integration/update/after/Pods/Pods.xcconfig
    0692c04f
Pods-Reachability-Private.xcconfig 341 Bytes