• Fabio Pelosin's avatar
    Merge branch 'master' into sandbox_reorganization_544 · e3cfdfd6
    Fabio Pelosin authored
    * master: (46 commits)
      [Command::Init] Update specs for recent changes
      [Command::Init] Add dependencies of the normal targets inside the target block
      [Command::Init] Add note about the configuration files to the description
      Update CHANGELOG for #1294
      [rake] Welcome to the real world, where envs don’t automagically work.
      [Installer] Add all the user's build configurations to the Pods project.
      [Analyzer] Resolve all user build configurations.
      Misc small changes.
      Rebuild integration specs.
      Update Xcodeproj to the latest master revision
      Use the build configurations from the Podfile for the Pods project
      Add test for STRIP_INSTALLED_PRODUCT = NO at project level
      Fix all callers of Pod::Project.new()
      Handle the build_configurations parameter in Xcodeproj::Project subclasses
      Pass the user build configurations to the Pods project
      Add link to Gemfile regarding local repos.
      Add that this is the MIT license.
      [CONTRIBUTING] Update CocoaPods.
      [Xcodeproj] Use Pod::UI for warnings and messages
      [Changelog]
      ...
    
    Conflicts:
    	spec/cocoapods-integration-specs
    e3cfdfd6
project_spec.rb 4.55 KB