Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CocoaPods/Xcodeproj
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.2.1
Choose a base ref
...
head repository: CocoaPods/Xcodeproj
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.2.2
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Jun 27, 2012

  1. [Configuration] Don't overwrite warnings defaults.

    @fabiopelosin
    fabiopelosin committed Jun 27, 2012
    Copy the full SHA
    7558deb View commit details

Commits on Jul 3, 2012

  1. Merge pull request #19 from CocoaPods/warnings 

    [Configuration] Don't overwrite warnings defaults.
    @fabiopelosin
    fabiopelosin committed Jul 3, 2012
    Copy the full SHA
    c41f423 View commit details

Commits on Jul 4, 2012

  1. Fix syntax of YARD documentation for #build_configurations

    @kastiglione
    kastiglione committed Jul 4, 2012
    Copy the full SHA
    53a45ff View commit details

Commits on Jul 5, 2012

  1. Merge pull request #20 from kastiglione/fix-build_configurations-yard… 

    …oc-sytax

Fix syntax of YARD documentation for #build_configurations
    @alloy
    alloy committed Jul 5, 2012
    Copy the full SHA
    a827965 View commit details

Commits on Jul 6, 2012

  1. Merge branch 'develop' 

    * develop:
  [Configuration] Don't overwrite warnings defaults.
    @fabiopelosin
    fabiopelosin committed Jul 6, 2012
    Copy the full SHA
    afe6d8b View commit details

  2. Release 0.2.2

    @fabiopelosin
    fabiopelosin committed Jul 6, 2012
    Copy the full SHA
    afbbabf View commit details
Showing with 4 additions and 8 deletions.
  1. +2 −2 lib/xcodeproj.rb
  2. +2 −2 lib/xcodeproj/project.rb
  3. +0 −4 lib/xcodeproj/project/object/configuration.rb
4 changes: 2 additions & 2 deletions lib/xcodeproj.rb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Xcodeproj
VERSION = '0.2.1'
VERSION = '0.2.2'

autoload :Config, 'xcodeproj/config'
autoload :Project, 'xcodeproj/project'
autoload :Workspace, 'xcodeproj/workspace'
4 changes: 2 additions & 2 deletions lib/xcodeproj/project.rb
View file
Original file line number Diff line number Diff line change
@@ -180,8 +180,8 @@ def add_system_framework(name)
end
end

# @return [PBXObjectList<XCBuildConfiguration] A list of project wide
# build configurations.
# @return [PBXObjectList<XCBuildConfiguration>] A list of project wide
# build configurations.
def build_configurations
root_object.build_configuration_list.build_configurations
end
4 changes: 0 additions & 4 deletions lib/xcodeproj/project/object/configuration.rb
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,6 @@ class XCBuildConfiguration < AbstractPBXObject
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)",
'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES',
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
'GCC_WARN_UNUSED_VARIABLE' => 'YES',
'OTHER_LDFLAGS' => '',
'COPY_PHASE_STRIP' => 'YES',
}.freeze,
@@ -35,7 +32,6 @@ class XCBuildConfiguration < AbstractPBXObject
:osx => {
'ARCHS' => "$(ARCHS_STANDARD_64_BIT)",
'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES',
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
'MACOSX_DEPLOYMENT_TARGET' => '10.7',
'SDKROOT' => 'macosx',