1. 10 Jun, 2013 12 commits
    • Fabio Pelosin's avatar
      Merge branch 'master' into dedicated-targets · d7f9903d
      Fabio Pelosin authored
      * master:
        [Spec] Rebuild integration test fixtures.
        Use a different resources-to-copy.txt file for each target
        Grammar fix in CONTRIBUTING file
        Made SO link to our search query
        [CONTRIBUTING] Add back links to ML and SO. Thanks @secboffin.
        [CONTRIBUTING] Make it even clearer/simpler. Thanks to @Manfred.
        [CONTRIBUTING] Try to be as clear as possible about do's and don'ts.
      
      Conflicts:
      	spec/integration/install_add_pod/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_add_pod/after/execution_output.txt
      	spec/integration/install_custom_workspace/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_custom_workspace/after/execution_output.txt
      	spec/integration/install_external_source/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_external_source/after/SampleApp.xcodeproj.yaml
      	spec/integration/install_external_source/after/execution_output.txt
      	spec/integration/install_local_source/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_local_source/after/SampleApp.xcodeproj.yaml
      	spec/integration/install_multiple_targets/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_multiple_targets/after/SampleApp.xcodeproj.yaml
      	spec/integration/install_multiple_targets/after/execution_output.txt
      	spec/integration/install_new/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_new/after/execution_output.txt
      	spec/integration/install_podfile_callbacks/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_podfile_callbacks/after/execution_output.txt
      	spec/integration/install_podspec/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_podspec/after/execution_output.txt
      	spec/integration/install_remove_pod/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_spec_callbacks/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_spec_callbacks/after/execution_output.txt
      	spec/integration/install_subspecs/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/install_subspecs/after/SampleApp.xcodeproj.yaml
      	spec/integration/install_subspecs/after/execution_output.txt
      	spec/integration/update/after/Pods/Pods.xcodeproj.yaml
      	spec/integration/update/after/execution_output.txt
      d7f9903d
    • Fabio Pelosin's avatar
      17889326
    • Fabio Pelosin's avatar
      Delete files creating issues with git · e5d6c368
      Fabio Pelosin authored
      e5d6c368
    • Jeremy Slater's avatar
      Update integration test fixtures · 20f63b89
      Jeremy Slater authored
      20f63b89
    • Jeremy Slater's avatar
      4a2143fc
    • Jeremy Slater's avatar
      Update tests · ae4e411e
      Jeremy Slater authored
      ae4e411e
    • Jeremy Slater's avatar
      Move method below attributes · 2719a381
      Jeremy Slater authored
      2719a381
    • Jeremy Slater's avatar
      04769c88
    • Jeremy Slater's avatar
      Add default_ld_flags method · 5af5828e
      Jeremy Slater authored
      The -fobjc-arc flag should only be added when explicitly requested in 
      the Podfile and the spec requires arc.
      5af5828e
    • Jeremy Slater's avatar
      Fix developer framework path · 35c15847
      Jeremy Slater authored
      35c15847
    • Jeremy Slater's avatar
      Restore storing native target in target · 38422a4b
      Jeremy Slater authored
      38422a4b
    • Jeremy Slater's avatar
      86824467
  2. 07 Jun, 2013 3 commits
  3. 06 Jun, 2013 8 commits
    • Orta's avatar
      Merge pull request #1101 from iamleeg/patch-1 · e790554d
      Orta authored
      Grammar fix in CONTRIBUTING file
      e790554d
    • Graham Lee's avatar
      Grammar fix in CONTRIBUTING file · feaf9bbb
      Graham Lee authored
      feaf9bbb
    • Orta's avatar
      Made SO link to our search query · 3707d094
      Orta authored
      3707d094
    • Eloy Durán's avatar
    • Eloy Durán's avatar
    • Eloy Durán's avatar
    • Fabio Pelosin's avatar
      [Specs] Fix require paths · 64131879
      Fabio Pelosin authored
      64131879
    • Fabio Pelosin's avatar
      Merge branch 'master' into dedicated-targets · 0304d9d6
      Fabio Pelosin authored
      * master: (46 commits)
        Use Kicker from master
        [Changelog] Fixed crash due to Podfile.lock containing multiple version requirements.
        [Integration] Update fixtures
        * Truncating the resources-to-copy.txt file if it already exists.
        [Travis] Attempt to fix 1.9.3 Issues
        Remove Rake dependency
        [Specs] Remove old uneeded integration spec
        [Core] Update for recent changes
        [Bundler] Add Gemfile.lock to source control and update Bundler on release
        Remove Octokit dep 2
        [WIP] Remove Octokit dep
        Fix missing space in output.
        english fix for 'Podfile does not contain any dependency'
        Release 0.20.2
        [Sandbox] Allow sandbox-pod to execute any tool inside a rbenv prefix.
        Bump to 0.20.2
        [CHANGELOG] Cleanup.
        [Spec] Update integrations specs for 0.20.2
        [CHANGELOG] Update for 0.20.2
        [Sandbox] Allow any tool inside the Xcode.app bundle to be executed.
        ...
      
      Conflicts:
      	spec/integration/install_add_pod/after/Pods/Pods-resources.sh
      	spec/integration/install_custom_workspace/after/Podfile.lock
      	spec/integration/install_custom_workspace/after/Pods/Manifest.lock
      	spec/integration/install_external_source/after/Pods/Pods-resources.sh
      	spec/integration/install_local_source/after/Pods/Pods-resources.sh
      	spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
      	spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
      	spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
      	spec/integration/install_new/after/Pods/Pods-resources.sh
      	spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
      	spec/integration/install_podspec/after/Pods/Pods-resources.sh
      	spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
      	spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
      	spec/integration/install_subspecs/after/Podfile.lock
      	spec/integration/install_subspecs/after/Pods/Manifest.lock
      	spec/integration/update/after/Pods/Pods-resources.sh
      	spec/integration_spec.rb
      	spec/unit/installer_spec.rb
      0304d9d6
  4. 03 Jun, 2013 3 commits
  5. 31 May, 2013 12 commits
  6. 29 May, 2013 1 commit
  7. 27 May, 2013 1 commit