Skip to content

Commit 9871a59

Browse files
committed
Updates for Xcode 9 / v1.1.0
1 parent 1b78a15 commit 9871a59

32 files changed

+2736
-7752
lines changed

Examples/Masonry iOS Examples.xcodeproj/project.pbxproj

Lines changed: 514 additions & 1392 deletions
Large diffs are not rendered by default.

Examples/Masonry iOS Examples.xcodeproj/xcshareddata/xcschemes/Masonry iOS Examples.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES">
4445
<Testables>
4546
</Testables>
@@ -59,6 +60,7 @@
5960
buildConfiguration = "Debug"
6061
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6162
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
63+
language = ""
6264
launchStyle = "0"
6365
useCustomWorkingDirectory = "NO"
6466
ignoresPersistentStateOnLaunch = "NO"

Masonry.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'Masonry'
3-
s.version = '1.0.2'
3+
s.version = '1.1.0'
44
s.license = 'MIT'
55
s.summary = 'Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.'
66
s.homepage = 'https://github.com/cloudkite/Masonry'

Masonry.xcodeproj/project.pbxproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@
258258
3AED05AE1AD59FD40053CC65 /* Project object */ = {
259259
isa = PBXProject;
260260
attributes = {
261-
LastUpgradeCheck = 0810;
261+
LastUpgradeCheck = 0900;
262262
ORGANIZATIONNAME = "Jonas Budelmann";
263263
TargetAttributes = {
264264
3AED05B61AD59FD40053CC65 = {
@@ -348,14 +348,20 @@
348348
CLANG_CXX_LIBRARY = "libc++";
349349
CLANG_ENABLE_MODULES = YES;
350350
CLANG_ENABLE_OBJC_ARC = YES;
351+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
351352
CLANG_WARN_BOOL_CONVERSION = YES;
353+
CLANG_WARN_COMMA = YES;
352354
CLANG_WARN_CONSTANT_CONVERSION = YES;
353355
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
354356
CLANG_WARN_EMPTY_BODY = YES;
355357
CLANG_WARN_ENUM_CONVERSION = YES;
356358
CLANG_WARN_INFINITE_RECURSION = YES;
357359
CLANG_WARN_INT_CONVERSION = YES;
360+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
361+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
358362
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
363+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
364+
CLANG_WARN_STRICT_PROTOTYPES = YES;
359365
CLANG_WARN_SUSPICIOUS_MOVE = YES;
360366
CLANG_WARN_UNREACHABLE_CODE = YES;
361367
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -399,14 +405,20 @@
399405
CLANG_CXX_LIBRARY = "libc++";
400406
CLANG_ENABLE_MODULES = YES;
401407
CLANG_ENABLE_OBJC_ARC = YES;
408+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
402409
CLANG_WARN_BOOL_CONVERSION = YES;
410+
CLANG_WARN_COMMA = YES;
403411
CLANG_WARN_CONSTANT_CONVERSION = YES;
404412
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
405413
CLANG_WARN_EMPTY_BODY = YES;
406414
CLANG_WARN_ENUM_CONVERSION = YES;
407415
CLANG_WARN_INFINITE_RECURSION = YES;
408416
CLANG_WARN_INT_CONVERSION = YES;
417+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
418+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
409419
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
420+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
421+
CLANG_WARN_STRICT_PROTOTYPES = YES;
410422
CLANG_WARN_SUSPICIOUS_MOVE = YES;
411423
CLANG_WARN_UNREACHABLE_CODE = YES;
412424
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

Masonry.xcodeproj/xcshareddata/xcschemes/Masonry OSX.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

Masonry.xcodeproj/xcshareddata/xcschemes/Masonry iOS.xcscheme

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ DEPENDENCIES:
88

99
EXTERNAL SOURCES:
1010
Masonry:
11-
:path: "./"
11+
:path: ./
1212

1313
SPEC CHECKSUMS:
1414
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
1515
Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e
1616

1717
PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b
1818

19-
COCOAPODS: 1.0.1
19+
COCOAPODS: 1.3.0.beta.2

Pods/Manifest.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)