Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fixtures] Updated CommonBuildSettings with Xcode 8.3 #474

Merged
merged 2 commits into from Mar 29, 2017
Merged

[Fixtures] Updated CommonBuildSettings with Xcode 8.3 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
532c578
[Fixtures] Updated CommonBuildSettings with Xcode 8.3
louisdh Mar 28, 2017
fe3b98c
[Constants] PROJECT_DEFAULT_BUILD_SETTINGS ordering and indentation
Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 31 additions & 29 deletions lib/xcodeproj/constants.rb
View file
Open in desktop
Expand Up @@ -4,17 +4,17 @@ module Xcodeproj
module Constants
# @return [String] The last known iOS SDK (stable).
#
LAST_KNOWN_IOS_SDK = '10.2'
LAST_KNOWN_IOS_SDK = '10.3'

# @return [String] The last known OS X SDK (stable).
#
LAST_KNOWN_OSX_SDK = '10.12'

# @return [String] The last known tvOS SDK (stable).
LAST_KNOWN_TVOS_SDK = '10.1'
LAST_KNOWN_TVOS_SDK = '10.2'

# @return [String] The last known watchOS SDK (stable).
LAST_KNOWN_WATCHOS_SDK = '3.1'
LAST_KNOWN_WATCHOS_SDK = '3.2'

# @return [String] The last known archive version to Xcodeproj.
#
Expand All @@ -33,7 +33,7 @@ module Constants

# @return [String] The last known object version to Xcodeproj.
#
LAST_SWIFT_UPGRADE_CHECK = '0821'
LAST_SWIFT_UPGRADE_CHECK = '0830'

# @return [String] The version of `.xcscheme` files supported by Xcodeproj
#
Expand Down Expand Up @@ -273,6 +273,7 @@ module Constants
[:ios, :application] => {
'CODE_SIGN_IDENTITY[sdk=iphoneos*]' => 'iPhone Developer',
'LD_RUNPATH_SEARCH_PATHS' => ['$(inherited)', '@executable_path/Frameworks'],
'TARGETED_DEVICE_FAMILY' => '1,2',
}.freeze,
[:osx, :application] => {
'COMBINE_HIDPI_IMAGES' => 'YES',
Expand Down Expand Up @@ -312,31 +313,32 @@ module Constants
#
PROJECT_DEFAULT_BUILD_SETTINGS = {
:all => {
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
'CLANG_ANALYZER_NONNULL' => 'YES',
'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++0x',
'CLANG_CXX_LIBRARY' => 'libc++',
'CLANG_ENABLE_MODULES' => 'YES',
'CLANG_ENABLE_OBJC_ARC' => 'YES',
'CLANG_WARN__DUPLICATE_METHOD_MATCH' => 'YES',
'CLANG_WARN_BOOL_CONVERSION' => 'YES',
'CLANG_WARN_CONSTANT_CONVERSION' => 'YES',
'CLANG_WARN_DIRECT_OBJC_ISA_USAGE' => 'YES',
'CLANG_WARN_EMPTY_BODY' => 'YES',
'CLANG_WARN_ENUM_CONVERSION' => 'YES',
'CLANG_WARN_INT_CONVERSION' => 'YES',
'CLANG_WARN_OBJC_ROOT_CLASS' => 'YES',
'CLANG_WARN_UNREACHABLE_CODE' => 'YES',
'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'YES',
'CLANG_WARN_INFINITE_RECURSION' => 'YES',
'CLANG_WARN_SUSPICIOUS_MOVE' => 'YES',
'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
'GCC_WARN_UNDECLARED_SELECTOR' => 'YES',
'GCC_WARN_UNINITIALIZED_AUTOS' => 'YES',
'GCC_WARN_UNUSED_FUNCTION' => 'YES',
'GCC_WARN_UNUSED_VARIABLE' => 'YES',
'ALWAYS_SEARCH_USER_PATHS' => 'NO',
'CLANG_ANALYZER_NONNULL' => 'YES',
'CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION' => 'YES',
'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++0x',
'CLANG_CXX_LIBRARY' => 'libc++',
'CLANG_ENABLE_MODULES' => 'YES',
'CLANG_ENABLE_OBJC_ARC' => 'YES',
'CLANG_WARN__DUPLICATE_METHOD_MATCH' => 'YES',
'CLANG_WARN_BOOL_CONVERSION' => 'YES',
'CLANG_WARN_CONSTANT_CONVERSION' => 'YES',
'CLANG_WARN_DIRECT_OBJC_ISA_USAGE' => 'YES',
'CLANG_WARN_EMPTY_BODY' => 'YES',
'CLANG_WARN_ENUM_CONVERSION' => 'YES',
'CLANG_WARN_INT_CONVERSION' => 'YES',
'CLANG_WARN_OBJC_ROOT_CLASS' => 'YES',
'CLANG_WARN_UNREACHABLE_CODE' => 'YES',
'CLANG_WARN_DOCUMENTATION_COMMENTS' => 'YES',
'CLANG_WARN_INFINITE_RECURSION' => 'YES',
'CLANG_WARN_SUSPICIOUS_MOVE' => 'YES',
'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
'GCC_WARN_UNDECLARED_SELECTOR' => 'YES',
'GCC_WARN_UNINITIALIZED_AUTOS' => 'YES',
'GCC_WARN_UNUSED_FUNCTION' => 'YES',
'GCC_WARN_UNUSED_VARIABLE' => 'YES',
},
:release => {
'COPY_PHASE_STRIP' => 'YES',
Expand Down
55 changes: 55 additions & 0 deletions ...monBuildSettings/Project/Objc_iOS_Native/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
@@ -1,5 +1,15 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "20x20",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "29x29",
Expand Down Expand Up @@ -29,6 +39,51 @@
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "20x20",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "83.5x83.5",
"scale" : "2x"
}
],
"info" : {
Expand Down
7 changes: 7 additions & 0 deletions spec/fixtures/CommonBuildSettings/Project/Objc_iOS_Native/Info.plist
View file
Open in desktop
Expand Up @@ -44,5 +44,12 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion .../fixtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/InterfaceController.m
View file
Open in desktop
@@ -1,7 +1,7 @@
#import "InterfaceController.h"


@interface InterfaceController()
@interface InterfaceController ()

@end

Expand Down
2 changes: 1 addition & 1 deletion ...xtures/CommonBuildSettings/Project/Objc_watchOS_Native Extension/NotificationController.m
View file
Open in desktop
@@ -1,7 +1,7 @@
#import "NotificationController.h"


@interface NotificationController()
@interface NotificationController ()

@end

Expand Down