ios / Masonry · Commits

Go to a project

Authored by Robert Payne
Commit 5e72da6772d5eb93d03aea729a6e61121c44f110 1 parent bf560758

Tidy up constraints for less crashers and less issues in Xcode 9

Inline Side-by-side
Showing 12 changed files with 64 additions and 109 deletions
@@ -134,13 +134,9 @@ @@ -134,13 +134,9 @@
134 - (MASConstraint *)centerY; 134 - (MASConstraint *)centerY;
135 - (MASConstraint *)baseline; 135 - (MASConstraint *)baseline;
136 136
137 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
138 -  
139 - (MASConstraint *)firstBaseline; 137 - (MASConstraint *)firstBaseline;
140 - (MASConstraint *)lastBaseline; 138 - (MASConstraint *)lastBaseline;
141 139
142 -#endif  
143 -  
144 #if TARGET_OS_IPHONE || TARGET_OS_TV 140 #if TARGET_OS_IPHONE || TARGET_OS_TV
145 141
146 - (MASConstraint *)leftMargin; 142 - (MASConstraint *)leftMargin;
@@ -215,8 +215,6 @@ @@ -215,8 +215,6 @@
215 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline]; 215 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline];
216 } 216 }
217 217
218 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
219 -  
220 - (MASConstraint *)firstBaseline { 218 - (MASConstraint *)firstBaseline {
221 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline]; 219 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline];
222 } 220 }
@@ -224,8 +222,6 @@ @@ -224,8 +222,6 @@
224 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline]; 222 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline];
225 } 223 }
226 224
227 -#endif  
228 -  
229 #if TARGET_OS_IPHONE || TARGET_OS_TV 225 #if TARGET_OS_IPHONE || TARGET_OS_TV
230 226
231 - (MASConstraint *)leftMargin { 227 - (MASConstraint *)leftMargin {
@@ -22,13 +22,9 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) { @@ -22,13 +22,9 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
22 MASAttributeCenterY = 1 << NSLayoutAttributeCenterY, 22 MASAttributeCenterY = 1 << NSLayoutAttributeCenterY,
23 MASAttributeBaseline = 1 << NSLayoutAttributeBaseline, 23 MASAttributeBaseline = 1 << NSLayoutAttributeBaseline,
24 24
25 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
26 -  
27 MASAttributeFirstBaseline = 1 << NSLayoutAttributeFirstBaseline, 25 MASAttributeFirstBaseline = 1 << NSLayoutAttributeFirstBaseline,
28 MASAttributeLastBaseline = 1 << NSLayoutAttributeLastBaseline, 26 MASAttributeLastBaseline = 1 << NSLayoutAttributeLastBaseline,
29 27
30 -#endif  
31 -  
32 #if TARGET_OS_IPHONE || TARGET_OS_TV 28 #if TARGET_OS_IPHONE || TARGET_OS_TV
33 29
34 MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin, 30 MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin,
@@ -67,13 +63,9 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) { @@ -67,13 +63,9 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
67 @property (nonatomic, strong, readonly) MASConstraint *centerY; 63 @property (nonatomic, strong, readonly) MASConstraint *centerY;
68 @property (nonatomic, strong, readonly) MASConstraint *baseline; 64 @property (nonatomic, strong, readonly) MASConstraint *baseline;
69 65
70 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
71 -  
72 @property (nonatomic, strong, readonly) MASConstraint *firstBaseline; 66 @property (nonatomic, strong, readonly) MASConstraint *firstBaseline;
73 @property (nonatomic, strong, readonly) MASConstraint *lastBaseline; 67 @property (nonatomic, strong, readonly) MASConstraint *lastBaseline;
74 68
75 -#endif  
76 -  
77 #if TARGET_OS_IPHONE || TARGET_OS_TV 69 #if TARGET_OS_IPHONE || TARGET_OS_TV
78 70
79 @property (nonatomic, strong, readonly) MASConstraint *leftMargin; 71 @property (nonatomic, strong, readonly) MASConstraint *leftMargin;
@@ -78,9 +78,7 @@ @@ -78,9 +78,7 @@
78 __unused MASAttribute anyAttribute = (MASAttributeLeft | MASAttributeRight | MASAttributeTop | MASAttributeBottom | MASAttributeLeading 78 __unused MASAttribute anyAttribute = (MASAttributeLeft | MASAttributeRight | MASAttributeTop | MASAttributeBottom | MASAttributeLeading
79 | MASAttributeTrailing | MASAttributeWidth | MASAttributeHeight | MASAttributeCenterX 79 | MASAttributeTrailing | MASAttributeWidth | MASAttributeHeight | MASAttributeCenterX
80 | MASAttributeCenterY | MASAttributeBaseline 80 | MASAttributeCenterY | MASAttributeBaseline
81 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
82 | MASAttributeFirstBaseline | MASAttributeLastBaseline 81 | MASAttributeFirstBaseline | MASAttributeLastBaseline
83 -#endif  
84 #if TARGET_OS_IPHONE || TARGET_OS_TV 82 #if TARGET_OS_IPHONE || TARGET_OS_TV
85 | MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin 83 | MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin
86 | MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins 84 | MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins
@@ -103,14 +101,9 @@ @@ -103,14 +101,9 @@
103 if (attrs & MASAttributeCenterX) [attributes addObject:self.view.mas_centerX]; 101 if (attrs & MASAttributeCenterX) [attributes addObject:self.view.mas_centerX];
104 if (attrs & MASAttributeCenterY) [attributes addObject:self.view.mas_centerY]; 102 if (attrs & MASAttributeCenterY) [attributes addObject:self.view.mas_centerY];
105 if (attrs & MASAttributeBaseline) [attributes addObject:self.view.mas_baseline]; 103 if (attrs & MASAttributeBaseline) [attributes addObject:self.view.mas_baseline];
106 -  
107 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
108 -  
109 if (attrs & MASAttributeFirstBaseline) [attributes addObject:self.view.mas_firstBaseline]; 104 if (attrs & MASAttributeFirstBaseline) [attributes addObject:self.view.mas_firstBaseline];
110 if (attrs & MASAttributeLastBaseline) [attributes addObject:self.view.mas_lastBaseline]; 105 if (attrs & MASAttributeLastBaseline) [attributes addObject:self.view.mas_lastBaseline];
111 106
112 -#endif  
113 -  
114 #if TARGET_OS_IPHONE || TARGET_OS_TV 107 #if TARGET_OS_IPHONE || TARGET_OS_TV
115 108
116 if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin]; 109 if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin];
@@ -192,8 +185,6 @@ @@ -192,8 +185,6 @@
192 }; 185 };
193 } 186 }
194 187
195 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
196 -  
197 - (MASConstraint *)firstBaseline { 188 - (MASConstraint *)firstBaseline {
198 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline]; 189 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeFirstBaseline];
199 } 190 }
@@ -202,9 +193,6 @@ @@ -202,9 +193,6 @@
202 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline]; 193 return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline];
203 } 194 }
204 195
205 -#endif  
206 -  
207 -  
208 #if TARGET_OS_IPHONE || TARGET_OS_TV 196 #if TARGET_OS_IPHONE || TARGET_OS_TV
209 197
210 - (MASConstraint *)leftMargin { 198 - (MASConstraint *)leftMargin {
@@ -43,11 +43,8 @@ @@ -43,11 +43,8 @@
43 @(NSLayoutAttributeCenterX) : @"centerX", 43 @(NSLayoutAttributeCenterX) : @"centerX",
44 @(NSLayoutAttributeCenterY) : @"centerY", 44 @(NSLayoutAttributeCenterY) : @"centerY",
45 @(NSLayoutAttributeBaseline) : @"baseline", 45 @(NSLayoutAttributeBaseline) : @"baseline",
46 -  
47 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
48 @(NSLayoutAttributeFirstBaseline) : @"firstBaseline", 46 @(NSLayoutAttributeFirstBaseline) : @"firstBaseline",
49 @(NSLayoutAttributeLastBaseline) : @"lastBaseline", 47 @(NSLayoutAttributeLastBaseline) : @"lastBaseline",
50 -#endif  
51 48
52 #if TARGET_OS_IPHONE || TARGET_OS_TV 49 #if TARGET_OS_IPHONE || TARGET_OS_TV
53 @(NSLayoutAttributeLeftMargin) : @"leftMargin", 50 @(NSLayoutAttributeLeftMargin) : @"leftMargin",
@@ -32,13 +32,9 @@ @@ -32,13 +32,9 @@
32 @property (nonatomic, strong, readonly) MASViewAttribute *mas_baseline; 32 @property (nonatomic, strong, readonly) MASViewAttribute *mas_baseline;
33 @property (nonatomic, strong, readonly) MASViewAttribute *(^mas_attribute)(NSLayoutAttribute attr); 33 @property (nonatomic, strong, readonly) MASViewAttribute *(^mas_attribute)(NSLayoutAttribute attr);
34 34
35 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
36 -  
37 @property (nonatomic, strong, readonly) MASViewAttribute *mas_firstBaseline; 35 @property (nonatomic, strong, readonly) MASViewAttribute *mas_firstBaseline;
38 @property (nonatomic, strong, readonly) MASViewAttribute *mas_lastBaseline; 36 @property (nonatomic, strong, readonly) MASViewAttribute *mas_lastBaseline;
39 37
40 -#endif  
41 -  
42 #if TARGET_OS_IPHONE || TARGET_OS_TV 38 #if TARGET_OS_IPHONE || TARGET_OS_TV
43 39
44 @property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin; 40 @property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin;
@@ -50,22 +46,17 @@ @@ -50,22 +46,17 @@
50 @property (nonatomic, strong, readonly) MASViewAttribute *mas_centerXWithinMargins; 46 @property (nonatomic, strong, readonly) MASViewAttribute *mas_centerXWithinMargins;
51 @property (nonatomic, strong, readonly) MASViewAttribute *mas_centerYWithinMargins; 47 @property (nonatomic, strong, readonly) MASViewAttribute *mas_centerYWithinMargins;
52 48
53 -#endif  
54 -  
55 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000)  
56 -  
57 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuide;  
58 -  
59 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeading;  
60 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTrailing;  
61 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeft;  
62 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideRight;  
63 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTop;  
64 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideBottom;  
65 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideWidth;  
66 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideHeight;  
67 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterX;  
68 -@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterY; 49 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuide NS_AVAILABLE_IOS(11.0);
  50 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeading NS_AVAILABLE_IOS(11.0);
  51 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTrailing NS_AVAILABLE_IOS(11.0);
  52 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideLeft NS_AVAILABLE_IOS(11.0);
  53 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideRight NS_AVAILABLE_IOS(11.0);
  54 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideTop NS_AVAILABLE_IOS(11.0);
  55 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideBottom NS_AVAILABLE_IOS(11.0);
  56 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideWidth NS_AVAILABLE_IOS(11.0);
  57 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideHeight NS_AVAILABLE_IOS(11.0);
  58 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterX NS_AVAILABLE_IOS(11.0);
  59 +@property (nonatomic, strong, readonly) MASViewAttribute *mas_safeAreaLayoutGuideCenterY NS_AVAILABLE_IOS(11.0);
69 60
70 #endif 61 #endif
71 62
@@ -87,8 +87,6 @@ @@ -87,8 +87,6 @@
87 }; 87 };
88 } 88 }
89 89
90 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
91 -  
92 - (MASViewAttribute *)mas_firstBaseline { 90 - (MASViewAttribute *)mas_firstBaseline {
93 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeFirstBaseline]; 91 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeFirstBaseline];
94 } 92 }
@@ -96,8 +94,6 @@ @@ -96,8 +94,6 @@
96 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLastBaseline]; 94 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLastBaseline];
97 } 95 }
98 96
99 -#endif  
100 -  
101 #if TARGET_OS_IPHONE || TARGET_OS_TV 97 #if TARGET_OS_IPHONE || TARGET_OS_TV
102 98
103 - (MASViewAttribute *)mas_leftMargin { 99 - (MASViewAttribute *)mas_leftMargin {
@@ -132,10 +128,6 @@ @@ -132,10 +128,6 @@
132 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeCenterYWithinMargins]; 128 return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeCenterYWithinMargins];
133 } 129 }
134 130
135 -#endif  
136 -  
137 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000)  
138 -  
139 - (MASViewAttribute *)mas_safeAreaLayoutGuide { 131 - (MASViewAttribute *)mas_safeAreaLayoutGuide {
140 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeNotAnAttribute]; 132 return [[MASViewAttribute alloc] initWithView:self item:self.safeAreaLayoutGuide layoutAttribute:NSLayoutAttributeNotAnAttribute];
141 } 133 }
@@ -29,13 +29,9 @@ @@ -29,13 +29,9 @@
29 @property (nonatomic, strong, readonly) MASViewAttribute *baseline; 29 @property (nonatomic, strong, readonly) MASViewAttribute *baseline;
30 @property (nonatomic, strong, readonly) MASViewAttribute *(^attribute)(NSLayoutAttribute attr); 30 @property (nonatomic, strong, readonly) MASViewAttribute *(^attribute)(NSLayoutAttribute attr);
31 31
32 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
33 -  
34 @property (nonatomic, strong, readonly) MASViewAttribute *firstBaseline; 32 @property (nonatomic, strong, readonly) MASViewAttribute *firstBaseline;
35 @property (nonatomic, strong, readonly) MASViewAttribute *lastBaseline; 33 @property (nonatomic, strong, readonly) MASViewAttribute *lastBaseline;
36 34
37 -#endif  
38 -  
39 #if TARGET_OS_IPHONE || TARGET_OS_TV 35 #if TARGET_OS_IPHONE || TARGET_OS_TV
40 36
41 @property (nonatomic, strong, readonly) MASViewAttribute *leftMargin; 37 @property (nonatomic, strong, readonly) MASViewAttribute *leftMargin;
@@ -49,12 +45,18 @@ @@ -49,12 +45,18 @@
49 45
50 #endif 46 #endif
51 47
52 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000) 48 +#if TARGET_OS_IPHONE || TARGET_OS_TV
53 49
54 -@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideTop;  
55 -@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideBottom;  
56 -@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideLeft;  
57 -@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideRight; 50 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideLeading NS_AVAILABLE_IOS(11.0);
  51 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideTrailing NS_AVAILABLE_IOS(11.0);
  52 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideLeft NS_AVAILABLE_IOS(11.0);
  53 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideRight NS_AVAILABLE_IOS(11.0);
  54 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideTop NS_AVAILABLE_IOS(11.0);
  55 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideBottom NS_AVAILABLE_IOS(11.0);
  56 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideWidth NS_AVAILABLE_IOS(11.0);
  57 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideHeight NS_AVAILABLE_IOS(11.0);
  58 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideCenterX NS_AVAILABLE_IOS(11.0);
  59 +@property (nonatomic, strong, readonly) MASViewAttribute *safeAreaLayoutGuideCenterY NS_AVAILABLE_IOS(11.0);
58 60
59 #endif 61 #endif
60 62
@@ -69,6 +71,11 @@ @@ -69,6 +71,11 @@
69 return [self mas_##attr]; \ 71 return [self mas_##attr]; \
70 } 72 }
71 73
  74 +#define MAS_ATTR_FORWARD_AVAILABLE(attr, available) \
  75 +- (MASViewAttribute *)attr available { \
  76 + return [self mas_##attr]; \
  77 +}
  78 +
72 @implementation MAS_VIEW (MASShorthandAdditions) 79 @implementation MAS_VIEW (MASShorthandAdditions)
73 80
74 MAS_ATTR_FORWARD(top); 81 MAS_ATTR_FORWARD(top);
@@ -83,13 +90,9 @@ MAS_ATTR_FORWARD(centerX); @@ -83,13 +90,9 @@ MAS_ATTR_FORWARD(centerX);
83 MAS_ATTR_FORWARD(centerY); 90 MAS_ATTR_FORWARD(centerY);
84 MAS_ATTR_FORWARD(baseline); 91 MAS_ATTR_FORWARD(baseline);
85 92
86 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)  
87 -  
88 MAS_ATTR_FORWARD(firstBaseline); 93 MAS_ATTR_FORWARD(firstBaseline);
89 MAS_ATTR_FORWARD(lastBaseline); 94 MAS_ATTR_FORWARD(lastBaseline);
90 95
91 -#endif  
92 -  
93 #if TARGET_OS_IPHONE || TARGET_OS_TV 96 #if TARGET_OS_IPHONE || TARGET_OS_TV
94 97
95 MAS_ATTR_FORWARD(leftMargin); 98 MAS_ATTR_FORWARD(leftMargin);
@@ -101,14 +104,16 @@ MAS_ATTR_FORWARD(trailingMargin); @@ -101,14 +104,16 @@ MAS_ATTR_FORWARD(trailingMargin);
101 MAS_ATTR_FORWARD(centerXWithinMargins); 104 MAS_ATTR_FORWARD(centerXWithinMargins);
102 MAS_ATTR_FORWARD(centerYWithinMargins); 105 MAS_ATTR_FORWARD(centerYWithinMargins);
103 106
104 -#endif  
105 -  
106 -#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (__TV_OS_VERSION_MIN_REQUIRED >= 110000)  
107 -  
108 -MAS_ATTR_FORWARD(safeAreaLayoutGuideTop);  
109 -MAS_ATTR_FORWARD(safeAreaLayoutGuideBottom);  
110 -MAS_ATTR_FORWARD(safeAreaLayoutGuideLeft);  
111 -MAS_ATTR_FORWARD(safeAreaLayoutGuideRight); 107 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideLeading, NS_AVAILABLE_IOS(11.0));
  108 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideTrailing, NS_AVAILABLE_IOS(11.0));
  109 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideLeft, NS_AVAILABLE_IOS(11.0));
  110 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideRight, NS_AVAILABLE_IOS(11.0));
  111 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideTop, NS_AVAILABLE_IOS(11.0));
  112 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideBottom, NS_AVAILABLE_IOS(11.0));
  113 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideWidth, NS_AVAILABLE_IOS(11.0));
  114 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideHeight, NS_AVAILABLE_IOS(11.0));
  115 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideCenterX, NS_AVAILABLE_IOS(11.0));
  116 +MAS_ATTR_FORWARD_AVAILABLE(safeAreaLayoutGuideCenterY, NS_AVAILABLE_IOS(11.0));
112 117
113 #endif 118 #endif
114 119
1 PODS: 1 PODS:
2 - Expecta (1.0.5) 2 - Expecta (1.0.5)
3 - - Masonry (1.0.2) 3 + - Masonry (1.1.0)
4 4
5 DEPENDENCIES: 5 DEPENDENCIES:
6 - Expecta 6 - Expecta
@@ -12,7 +12,7 @@ EXTERNAL SOURCES: @@ -12,7 +12,7 @@ EXTERNAL SOURCES:
12 12
13 SPEC CHECKSUMS: 13 SPEC CHECKSUMS:
14 Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe 14 Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
15 - Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e 15 + Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
16 16
17 PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b 17 PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b
18 18
1 { 1 {
2 "name": "Masonry", 2 "name": "Masonry",
3 - "version": "1.0.2", 3 + "version": "1.1.0",
4 "license": "MIT", 4 "license": "MIT",
5 "summary": "Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.", 5 "summary": "Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.",
6 "homepage": "https://github.com/cloudkite/Masonry", 6 "homepage": "https://github.com/cloudkite/Masonry",
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 "social_media_url": "http://twitter.com/cloudkite", 10 "social_media_url": "http://twitter.com/cloudkite",
11 "source": { 11 "source": {
12 "git": "https://github.com/cloudkite/Masonry.git", 12 "git": "https://github.com/cloudkite/Masonry.git",
13 - "tag": "v1.0.2" 13 + "tag": "v1.1.0"
14 }, 14 },
15 "description": "Masonry is a light-weight layout framework which wraps AutoLayout with a nicer syntax.\nMasonry has its own layout DSL which provides a chainable way of describing your\nNSLayoutConstraints which results in layout code which is more concise and readable.\n Masonry supports iOS and Mac OSX.", 15 "description": "Masonry is a light-weight layout framework which wraps AutoLayout with a nicer syntax.\nMasonry has its own layout DSL which provides a chainable way of describing your\nNSLayoutConstraints which results in layout code which is more concise and readable.\n Masonry supports iOS and Mac OSX.",
16 "source_files": "Masonry/*.{h,m}", 16 "source_files": "Masonry/*.{h,m}",
1 PODS: 1 PODS:
2 - Expecta (1.0.5) 2 - Expecta (1.0.5)
3 - - Masonry (1.0.2) 3 + - Masonry (1.1.0)
4 4
5 DEPENDENCIES: 5 DEPENDENCIES:
6 - Expecta 6 - Expecta
@@ -12,7 +12,7 @@ EXTERNAL SOURCES: @@ -12,7 +12,7 @@ EXTERNAL SOURCES:
12 12
13 SPEC CHECKSUMS: 13 SPEC CHECKSUMS:
14 Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe 14 Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
15 - Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e 15 + Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
16 16
17 PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b 17 PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b
18 18
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 0AAF8809A7BBA8A694825848A7EF07D2 /* EXPMatchers+beTruthy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beTruthy.h"; path = "Expecta/Matchers/EXPMatchers+beTruthy.h"; sourceTree = "<group>"; }; 155 0AAF8809A7BBA8A694825848A7EF07D2 /* EXPMatchers+beTruthy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beTruthy.h"; path = "Expecta/Matchers/EXPMatchers+beTruthy.h"; sourceTree = "<group>"; };
156 0F2DF08BADAA0D595D88E9A5F2F4AE8F /* Pods-Masonry iOS Examples-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Masonry iOS Examples-dummy.m"; sourceTree = "<group>"; }; 156 0F2DF08BADAA0D595D88E9A5F2F4AE8F /* Pods-Masonry iOS Examples-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Masonry iOS Examples-dummy.m"; sourceTree = "<group>"; };
157 10904D53FD27FC7E59BF92201687D517 /* EXPMatchers+beInTheRangeOf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beInTheRangeOf.h"; path = "Expecta/Matchers/EXPMatchers+beInTheRangeOf.h"; sourceTree = "<group>"; }; 157 10904D53FD27FC7E59BF92201687D517 /* EXPMatchers+beInTheRangeOf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beInTheRangeOf.h"; path = "Expecta/Matchers/EXPMatchers+beInTheRangeOf.h"; sourceTree = "<group>"; };
158 - 10A477660D2D97AEF58A6795020511A9 /* libPods-Masonry iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Masonry iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 158 + 10A477660D2D97AEF58A6795020511A9 /* libPods-Masonry iOS Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-Masonry iOS Tests.a"; path = "libPods-Masonry iOS Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
159 10F0627165FE862DA384F755B45FD6A7 /* EXPMatchers+raise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+raise.h"; path = "Expecta/Matchers/EXPMatchers+raise.h"; sourceTree = "<group>"; }; 159 10F0627165FE862DA384F755B45FD6A7 /* EXPMatchers+raise.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+raise.h"; path = "Expecta/Matchers/EXPMatchers+raise.h"; sourceTree = "<group>"; };
160 10F25824C22E66EAFBAA5C0F62629D84 /* EXPMatchers+match.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+match.m"; path = "Expecta/Matchers/EXPMatchers+match.m"; sourceTree = "<group>"; }; 160 10F25824C22E66EAFBAA5C0F62629D84 /* EXPMatchers+match.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+match.m"; path = "Expecta/Matchers/EXPMatchers+match.m"; sourceTree = "<group>"; };
161 122F547802BB911D1B9F0D52C33B568D /* EXPMatchers+beLessThanOrEqualTo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beLessThanOrEqualTo.h"; path = "Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h"; sourceTree = "<group>"; }; 161 122F547802BB911D1B9F0D52C33B568D /* EXPMatchers+beLessThanOrEqualTo.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beLessThanOrEqualTo.h"; path = "Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h"; sourceTree = "<group>"; };
@@ -174,8 +174,8 @@ @@ -174,8 +174,8 @@
174 228937A58D5E1EF34C595366A42C018E /* EXPMatchers+raiseWithReason.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+raiseWithReason.m"; path = "Expecta/Matchers/EXPMatchers+raiseWithReason.m"; sourceTree = "<group>"; }; 174 228937A58D5E1EF34C595366A42C018E /* EXPMatchers+raiseWithReason.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+raiseWithReason.m"; path = "Expecta/Matchers/EXPMatchers+raiseWithReason.m"; sourceTree = "<group>"; };
175 2547652506D61F49D4B0882ED6B64B16 /* EXPMatchers+beFalsy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beFalsy.m"; path = "Expecta/Matchers/EXPMatchers+beFalsy.m"; sourceTree = "<group>"; }; 175 2547652506D61F49D4B0882ED6B64B16 /* EXPMatchers+beFalsy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beFalsy.m"; path = "Expecta/Matchers/EXPMatchers+beFalsy.m"; sourceTree = "<group>"; };
176 2A31938A554F154B402756FCBFE7167B /* NSArray+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSArray+MASAdditions.m"; sourceTree = "<group>"; }; 176 2A31938A554F154B402756FCBFE7167B /* NSArray+MASAdditions.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "NSArray+MASAdditions.m"; sourceTree = "<group>"; };
177 - 2A7DB9040882B1058689C275628BAD96 /* libExpecta.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libExpecta.a; sourceTree = BUILT_PRODUCTS_DIR; };  
178 - 2B6A8C9B5A40329ADEFB0567ED8489DC /* libMasonry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMasonry.a; sourceTree = BUILT_PRODUCTS_DIR; }; 177 + 2A7DB9040882B1058689C275628BAD96 /* libExpecta.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libExpecta.a; path = libExpecta.a; sourceTree = BUILT_PRODUCTS_DIR; };
  178 + 2B6A8C9B5A40329ADEFB0567ED8489DC /* libMasonry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libMasonry.a; path = libMasonry.a; sourceTree = BUILT_PRODUCTS_DIR; };
179 2B80588779A2286A5E054DE4D0DDC03A /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "View+MASShorthandAdditions.h"; sourceTree = "<group>"; }; 179 2B80588779A2286A5E054DE4D0DDC03A /* View+MASShorthandAdditions.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "View+MASShorthandAdditions.h"; sourceTree = "<group>"; };
180 2C5D45C77F469660C6D6155EA159784F /* EXPMatchers+postNotification.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+postNotification.h"; path = "Expecta/Matchers/EXPMatchers+postNotification.h"; sourceTree = "<group>"; }; 180 2C5D45C77F469660C6D6155EA159784F /* EXPMatchers+postNotification.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+postNotification.h"; path = "Expecta/Matchers/EXPMatchers+postNotification.h"; sourceTree = "<group>"; };
181 2F3869A1E846595FC8A567E9EF91600E /* EXPMatchers+beSupersetOf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beSupersetOf.h"; path = "Expecta/Matchers/EXPMatchers+beSupersetOf.h"; sourceTree = "<group>"; }; 181 2F3869A1E846595FC8A567E9EF91600E /* EXPMatchers+beSupersetOf.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+beSupersetOf.h"; path = "Expecta/Matchers/EXPMatchers+beSupersetOf.h"; sourceTree = "<group>"; };
@@ -234,9 +234,9 @@ @@ -234,9 +234,9 @@
234 8524B32277BDB7E1A36FB5F3EB3BAC6B /* MASCompositeConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MASCompositeConstraint.m; sourceTree = "<group>"; }; 234 8524B32277BDB7E1A36FB5F3EB3BAC6B /* MASCompositeConstraint.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = MASCompositeConstraint.m; sourceTree = "<group>"; };
235 8780C4CC76E68DD8EA97F0E4B3287D64 /* EXPMatchers+equal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+equal.h"; path = "Expecta/Matchers/EXPMatchers+equal.h"; sourceTree = "<group>"; }; 235 8780C4CC76E68DD8EA97F0E4B3287D64 /* EXPMatchers+equal.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+equal.h"; path = "Expecta/Matchers/EXPMatchers+equal.h"; sourceTree = "<group>"; };
236 88907F8AEA4C9B20AEB63E2047F54502 /* EXPMatchers+match.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+match.h"; path = "Expecta/Matchers/EXPMatchers+match.h"; sourceTree = "<group>"; }; 236 88907F8AEA4C9B20AEB63E2047F54502 /* EXPMatchers+match.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "EXPMatchers+match.h"; path = "Expecta/Matchers/EXPMatchers+match.h"; sourceTree = "<group>"; };
237 - 8B4562385452B8EF12C3E0EFC2E07D12 /* libPods-Masonry iOS Examples.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Masonry iOS Examples.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 237 + 8B4562385452B8EF12C3E0EFC2E07D12 /* libPods-Masonry iOS Examples.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-Masonry iOS Examples.a"; path = "libPods-Masonry iOS Examples.a"; sourceTree = BUILT_PRODUCTS_DIR; };
238 8F3B66464C8F4DC1EDFFEA58A98F9B5C /* EXPMatcher.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EXPMatcher.h; path = Expecta/EXPMatcher.h; sourceTree = "<group>"; }; 238 8F3B66464C8F4DC1EDFFEA58A98F9B5C /* EXPMatcher.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = EXPMatcher.h; path = Expecta/EXPMatcher.h; sourceTree = "<group>"; };
239 - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 239 + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
240 9616A699420336DD8F227A5C41E36432 /* EXPMatchers+respondTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+respondTo.m"; path = "Expecta/Matchers/EXPMatchers+respondTo.m"; sourceTree = "<group>"; }; 240 9616A699420336DD8F227A5C41E36432 /* EXPMatchers+respondTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+respondTo.m"; path = "Expecta/Matchers/EXPMatchers+respondTo.m"; sourceTree = "<group>"; };
241 98AFDA78C0BA149C8976CF3889419AA7 /* EXPMatchers+beSubclassOf.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beSubclassOf.m"; path = "Expecta/Matchers/EXPMatchers+beSubclassOf.m"; sourceTree = "<group>"; }; 241 98AFDA78C0BA149C8976CF3889419AA7 /* EXPMatchers+beSubclassOf.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beSubclassOf.m"; path = "Expecta/Matchers/EXPMatchers+beSubclassOf.m"; sourceTree = "<group>"; };
242 9D1DE5A0855C3142FCDE4471717B4C92 /* EXPMatchers+raise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+raise.m"; path = "Expecta/Matchers/EXPMatchers+raise.m"; sourceTree = "<group>"; }; 242 9D1DE5A0855C3142FCDE4471717B4C92 /* EXPMatchers+raise.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+raise.m"; path = "Expecta/Matchers/EXPMatchers+raise.m"; sourceTree = "<group>"; };
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
253 BFE37A3BBF6AEB4B7163AAE1BD655CDD /* EXPMatchers+equal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+equal.m"; path = "Expecta/Matchers/EXPMatchers+equal.m"; sourceTree = "<group>"; }; 253 BFE37A3BBF6AEB4B7163AAE1BD655CDD /* EXPMatchers+equal.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+equal.m"; path = "Expecta/Matchers/EXPMatchers+equal.m"; sourceTree = "<group>"; };
254 C0F0C9DE4D36C0025D1A49B0106644A4 /* NSObject+Expecta.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+Expecta.h"; path = "Expecta/NSObject+Expecta.h"; sourceTree = "<group>"; }; 254 C0F0C9DE4D36C0025D1A49B0106644A4 /* NSObject+Expecta.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSObject+Expecta.h"; path = "Expecta/NSObject+Expecta.h"; sourceTree = "<group>"; };
255 C3EDF7B170EC221838CC2A773B0CDC59 /* EXPMatchers+beCloseTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beCloseTo.m"; path = "Expecta/Matchers/EXPMatchers+beCloseTo.m"; sourceTree = "<group>"; }; 255 C3EDF7B170EC221838CC2A773B0CDC59 /* EXPMatchers+beCloseTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+beCloseTo.m"; path = "Expecta/Matchers/EXPMatchers+beCloseTo.m"; sourceTree = "<group>"; };
256 - C4EC8E6D70CF2CC9E094524A6560BC80 /* libPods-MasonryTestsLoader.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MasonryTestsLoader.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 256 + C4EC8E6D70CF2CC9E094524A6560BC80 /* libPods-MasonryTestsLoader.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-MasonryTestsLoader.a"; path = "libPods-MasonryTestsLoader.a"; sourceTree = BUILT_PRODUCTS_DIR; };
257 C565C77B7F3AC98E871994970653A958 /* EXPMatchers+conformTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+conformTo.m"; path = "Expecta/Matchers/EXPMatchers+conformTo.m"; sourceTree = "<group>"; }; 257 C565C77B7F3AC98E871994970653A958 /* EXPMatchers+conformTo.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = "EXPMatchers+conformTo.m"; path = "Expecta/Matchers/EXPMatchers+conformTo.m"; sourceTree = "<group>"; };
258 C5ABB1C6CB3F9F99597CCF6727731A7B /* Pods-Masonry iOS Examples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Masonry iOS Examples.debug.xcconfig"; sourceTree = "<group>"; }; 258 C5ABB1C6CB3F9F99597CCF6727731A7B /* Pods-Masonry iOS Examples.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Masonry iOS Examples.debug.xcconfig"; sourceTree = "<group>"; };
259 C7004C5DD5811F3431B3C72C3ED02D96 /* Pods-MasonryTestsLoader-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MasonryTestsLoader-frameworks.sh"; sourceTree = "<group>"; }; 259 C7004C5DD5811F3431B3C72C3ED02D96 /* Pods-MasonryTestsLoader-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-MasonryTestsLoader-frameworks.sh"; sourceTree = "<group>"; };
@@ -500,6 +500,7 @@ @@ -500,6 +500,7 @@
500 6F83FB50741120EF2F5F9723A76C9099 /* ViewController+MASAdditions.h */, 500 6F83FB50741120EF2F5F9723A76C9099 /* ViewController+MASAdditions.h */,
501 5A30D7435201DE311E06A35CEA390581 /* ViewController+MASAdditions.m */, 501 5A30D7435201DE311E06A35CEA390581 /* ViewController+MASAdditions.m */,
502 ); 502 );
  503 + name = Masonry;
503 path = Masonry; 504 path = Masonry;
504 sourceTree = "<group>"; 505 sourceTree = "<group>";
505 }; 506 };
@@ -581,6 +582,7 @@ @@ -581,6 +582,7 @@
581 ADBF0443B4181A4D41268AB9F62AA73C /* NSValue+Expecta.m */, 582 ADBF0443B4181A4D41268AB9F62AA73C /* NSValue+Expecta.m */,
582 C934D5D64F7FA6AE026CB137FBAD29E5 /* Support Files */, 583 C934D5D64F7FA6AE026CB137FBAD29E5 /* Support Files */,
583 ); 584 );
  585 + name = Expecta;
584 path = Expecta; 586 path = Expecta;
585 sourceTree = "<group>"; 587 sourceTree = "<group>";
586 }; 588 };
@@ -751,7 +753,7 @@ @@ -751,7 +753,7 @@
751 isa = PBXProject; 753 isa = PBXProject;
752 attributes = { 754 attributes = {
753 LastSwiftUpdateCheck = 0830; 755 LastSwiftUpdateCheck = 0830;
754 - LastUpgradeCheck = 0900; 756 + LastUpgradeCheck = 0700;
755 }; 757 };
756 buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; 758 buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */;
757 compatibilityVersion = "Xcode 3.2"; 759 compatibilityVersion = "Xcode 3.2";
@@ -912,6 +914,7 @@ @@ -912,6 +914,7 @@
912 ENABLE_STRICT_OBJC_MSGSEND = YES; 914 ENABLE_STRICT_OBJC_MSGSEND = YES;
913 GCC_NO_COMMON_BLOCKS = YES; 915 GCC_NO_COMMON_BLOCKS = YES;
914 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch"; 916 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch";
  917 + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
915 MTL_ENABLE_DEBUG_INFO = YES; 918 MTL_ENABLE_DEBUG_INFO = YES;
916 OTHER_LDFLAGS = ""; 919 OTHER_LDFLAGS = "";
917 OTHER_LIBTOOLFLAGS = ""; 920 OTHER_LIBTOOLFLAGS = "";
@@ -936,6 +939,7 @@ @@ -936,6 +939,7 @@
936 GCC_GENERATE_TEST_COVERAGE_FILES = YES; 939 GCC_GENERATE_TEST_COVERAGE_FILES = YES;
937 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; 940 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
938 GCC_NO_COMMON_BLOCKS = YES; 941 GCC_NO_COMMON_BLOCKS = YES;
  942 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
939 MACH_O_TYPE = staticlib; 943 MACH_O_TYPE = staticlib;
940 MTL_ENABLE_DEBUG_INFO = NO; 944 MTL_ENABLE_DEBUG_INFO = NO;
941 OTHER_LDFLAGS = ""; 945 OTHER_LDFLAGS = "";
@@ -958,9 +962,7 @@ @@ -958,9 +962,7 @@
958 CLANG_CXX_LIBRARY = "libc++"; 962 CLANG_CXX_LIBRARY = "libc++";
959 CLANG_ENABLE_MODULES = YES; 963 CLANG_ENABLE_MODULES = YES;
960 CLANG_ENABLE_OBJC_ARC = YES; 964 CLANG_ENABLE_OBJC_ARC = YES;
961 - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;  
962 CLANG_WARN_BOOL_CONVERSION = YES; 965 CLANG_WARN_BOOL_CONVERSION = YES;
963 - CLANG_WARN_COMMA = YES;  
964 CLANG_WARN_CONSTANT_CONVERSION = YES; 966 CLANG_WARN_CONSTANT_CONVERSION = YES;
965 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; 967 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
966 CLANG_WARN_DOCUMENTATION_COMMENTS = YES; 968 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -968,21 +970,15 @@ @@ -968,21 +970,15 @@
968 CLANG_WARN_ENUM_CONVERSION = YES; 970 CLANG_WARN_ENUM_CONVERSION = YES;
969 CLANG_WARN_INFINITE_RECURSION = YES; 971 CLANG_WARN_INFINITE_RECURSION = YES;
970 CLANG_WARN_INT_CONVERSION = YES; 972 CLANG_WARN_INT_CONVERSION = YES;
971 - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;  
972 - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  
973 CLANG_WARN_OBJC_ROOT_CLASS = YES; 973 CLANG_WARN_OBJC_ROOT_CLASS = YES;
974 - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  
975 - CLANG_WARN_STRICT_PROTOTYPES = YES;  
976 CLANG_WARN_SUSPICIOUS_MOVE = YES; 974 CLANG_WARN_SUSPICIOUS_MOVE = YES;
977 CLANG_WARN_UNREACHABLE_CODE = YES; 975 CLANG_WARN_UNREACHABLE_CODE = YES;
978 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 976 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
979 CODE_SIGNING_REQUIRED = NO; 977 CODE_SIGNING_REQUIRED = NO;
980 COPY_PHASE_STRIP = NO; 978 COPY_PHASE_STRIP = NO;
981 - ENABLE_STRICT_OBJC_MSGSEND = YES;  
982 ENABLE_TESTABILITY = YES; 979 ENABLE_TESTABILITY = YES;
983 GCC_C_LANGUAGE_STANDARD = gnu99; 980 GCC_C_LANGUAGE_STANDARD = gnu99;
984 GCC_DYNAMIC_NO_PIC = NO; 981 GCC_DYNAMIC_NO_PIC = NO;
985 - GCC_NO_COMMON_BLOCKS = YES;  
986 GCC_OPTIMIZATION_LEVEL = 0; 982 GCC_OPTIMIZATION_LEVEL = 0;
987 GCC_PREPROCESSOR_DEFINITIONS = ( 983 GCC_PREPROCESSOR_DEFINITIONS = (
988 "POD_CONFIGURATION_DEBUG=1", 984 "POD_CONFIGURATION_DEBUG=1",
@@ -996,6 +992,7 @@ @@ -996,6 +992,7 @@
996 GCC_WARN_UNINITIALIZED_AUTOS = YES; 992 GCC_WARN_UNINITIALIZED_AUTOS = YES;
997 GCC_WARN_UNUSED_FUNCTION = YES; 993 GCC_WARN_UNUSED_FUNCTION = YES;
998 GCC_WARN_UNUSED_VARIABLE = YES; 994 GCC_WARN_UNUSED_VARIABLE = YES;
  995 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
999 ONLY_ACTIVE_ARCH = YES; 996 ONLY_ACTIVE_ARCH = YES;
1000 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; 997 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
1001 STRIP_INSTALLED_PRODUCT = NO; 998 STRIP_INSTALLED_PRODUCT = NO;
@@ -1014,9 +1011,7 @@ @@ -1014,9 +1011,7 @@
1014 CLANG_CXX_LIBRARY = "libc++"; 1011 CLANG_CXX_LIBRARY = "libc++";
1015 CLANG_ENABLE_MODULES = YES; 1012 CLANG_ENABLE_MODULES = YES;
1016 CLANG_ENABLE_OBJC_ARC = YES; 1013 CLANG_ENABLE_OBJC_ARC = YES;
1017 - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;  
1018 CLANG_WARN_BOOL_CONVERSION = YES; 1014 CLANG_WARN_BOOL_CONVERSION = YES;
1019 - CLANG_WARN_COMMA = YES;  
1020 CLANG_WARN_CONSTANT_CONVERSION = YES; 1015 CLANG_WARN_CONSTANT_CONVERSION = YES;
1021 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES; 1016 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES;
1022 CLANG_WARN_DOCUMENTATION_COMMENTS = YES; 1017 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -1024,20 +1019,14 @@ @@ -1024,20 +1019,14 @@
1024 CLANG_WARN_ENUM_CONVERSION = YES; 1019 CLANG_WARN_ENUM_CONVERSION = YES;
1025 CLANG_WARN_INFINITE_RECURSION = YES; 1020 CLANG_WARN_INFINITE_RECURSION = YES;
1026 CLANG_WARN_INT_CONVERSION = YES; 1021 CLANG_WARN_INT_CONVERSION = YES;
1027 - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;  
1028 - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;  
1029 CLANG_WARN_OBJC_ROOT_CLASS = YES; 1022 CLANG_WARN_OBJC_ROOT_CLASS = YES;
1030 - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;  
1031 - CLANG_WARN_STRICT_PROTOTYPES = YES;  
1032 CLANG_WARN_SUSPICIOUS_MOVE = YES; 1023 CLANG_WARN_SUSPICIOUS_MOVE = YES;
1033 CLANG_WARN_UNREACHABLE_CODE = YES; 1024 CLANG_WARN_UNREACHABLE_CODE = YES;
1034 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 1025 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1035 CODE_SIGNING_REQUIRED = NO; 1026 CODE_SIGNING_REQUIRED = NO;
1036 COPY_PHASE_STRIP = YES; 1027 COPY_PHASE_STRIP = YES;
1037 ENABLE_NS_ASSERTIONS = NO; 1028 ENABLE_NS_ASSERTIONS = NO;
1038 - ENABLE_STRICT_OBJC_MSGSEND = YES;  
1039 GCC_C_LANGUAGE_STANDARD = gnu99; 1029 GCC_C_LANGUAGE_STANDARD = gnu99;
1040 - GCC_NO_COMMON_BLOCKS = YES;  
1041 GCC_PREPROCESSOR_DEFINITIONS = ( 1030 GCC_PREPROCESSOR_DEFINITIONS = (
1042 "POD_CONFIGURATION_RELEASE=1", 1031 "POD_CONFIGURATION_RELEASE=1",
1043 "$(inherited)", 1032 "$(inherited)",
@@ -1048,6 +1037,7 @@ @@ -1048,6 +1037,7 @@
1048 GCC_WARN_UNINITIALIZED_AUTOS = YES; 1037 GCC_WARN_UNINITIALIZED_AUTOS = YES;
1049 GCC_WARN_UNUSED_FUNCTION = YES; 1038 GCC_WARN_UNUSED_FUNCTION = YES;
1050 GCC_WARN_UNUSED_VARIABLE = YES; 1039 GCC_WARN_UNUSED_VARIABLE = YES;
  1040 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1051 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/; 1041 PROVISIONING_PROFILE_SPECIFIER = NO_SIGNING/;
1052 STRIP_INSTALLED_PRODUCT = NO; 1042 STRIP_INSTALLED_PRODUCT = NO;
1053 SYMROOT = "${SRCROOT}/../build"; 1043 SYMROOT = "${SRCROOT}/../build";
@@ -1066,6 +1056,7 @@ @@ -1066,6 +1056,7 @@
1066 ENABLE_STRICT_OBJC_MSGSEND = YES; 1056 ENABLE_STRICT_OBJC_MSGSEND = YES;
1067 GCC_NO_COMMON_BLOCKS = YES; 1057 GCC_NO_COMMON_BLOCKS = YES;
1068 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; 1058 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
  1059 + IPHONEOS_DEPLOYMENT_TARGET = 6.0;
1069 MTL_ENABLE_DEBUG_INFO = NO; 1060 MTL_ENABLE_DEBUG_INFO = NO;
1070 OTHER_LDFLAGS = ""; 1061 OTHER_LDFLAGS = "";
1071 OTHER_LIBTOOLFLAGS = ""; 1062 OTHER_LIBTOOLFLAGS = "";
@@ -1089,6 +1080,7 @@ @@ -1089,6 +1080,7 @@
1089 ENABLE_STRICT_OBJC_MSGSEND = YES; 1080 ENABLE_STRICT_OBJC_MSGSEND = YES;
1090 GCC_NO_COMMON_BLOCKS = YES; 1081 GCC_NO_COMMON_BLOCKS = YES;
1091 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch"; 1082 GCC_PREFIX_HEADER = "Target Support Files/Expecta/Expecta-prefix.pch";
  1083 + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
1092 MTL_ENABLE_DEBUG_INFO = NO; 1084 MTL_ENABLE_DEBUG_INFO = NO;
1093 OTHER_LDFLAGS = ""; 1085 OTHER_LDFLAGS = "";
1094 OTHER_LIBTOOLFLAGS = ""; 1086 OTHER_LIBTOOLFLAGS = "";
@@ -1112,6 +1104,7 @@ @@ -1112,6 +1104,7 @@
1112 ENABLE_STRICT_OBJC_MSGSEND = YES; 1104 ENABLE_STRICT_OBJC_MSGSEND = YES;
1113 GCC_NO_COMMON_BLOCKS = YES; 1105 GCC_NO_COMMON_BLOCKS = YES;
1114 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch"; 1106 GCC_PREFIX_HEADER = "Target Support Files/Masonry/Masonry-prefix.pch";
  1107 + IPHONEOS_DEPLOYMENT_TARGET = 6.0;
1115 MTL_ENABLE_DEBUG_INFO = YES; 1108 MTL_ENABLE_DEBUG_INFO = YES;
1116 OTHER_LDFLAGS = ""; 1109 OTHER_LDFLAGS = "";
1117 OTHER_LIBTOOLFLAGS = ""; 1110 OTHER_LIBTOOLFLAGS = "";
@@ -1134,6 +1127,7 @@ @@ -1134,6 +1127,7 @@
1134 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 1127 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1135 ENABLE_STRICT_OBJC_MSGSEND = YES; 1128 ENABLE_STRICT_OBJC_MSGSEND = YES;
1136 GCC_NO_COMMON_BLOCKS = YES; 1129 GCC_NO_COMMON_BLOCKS = YES;
  1130 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1137 MACH_O_TYPE = staticlib; 1131 MACH_O_TYPE = staticlib;
1138 MTL_ENABLE_DEBUG_INFO = NO; 1132 MTL_ENABLE_DEBUG_INFO = NO;
1139 OTHER_LDFLAGS = ""; 1133 OTHER_LDFLAGS = "";
@@ -1156,6 +1150,7 @@ @@ -1156,6 +1150,7 @@
1156 DEBUG_INFORMATION_FORMAT = dwarf; 1150 DEBUG_INFORMATION_FORMAT = dwarf;
1157 ENABLE_STRICT_OBJC_MSGSEND = YES; 1151 ENABLE_STRICT_OBJC_MSGSEND = YES;
1158 GCC_NO_COMMON_BLOCKS = YES; 1152 GCC_NO_COMMON_BLOCKS = YES;
  1153 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1159 MACH_O_TYPE = staticlib; 1154 MACH_O_TYPE = staticlib;
1160 MTL_ENABLE_DEBUG_INFO = YES; 1155 MTL_ENABLE_DEBUG_INFO = YES;
1161 OTHER_LDFLAGS = ""; 1156 OTHER_LDFLAGS = "";
@@ -1180,6 +1175,7 @@ @@ -1180,6 +1175,7 @@
1180 GCC_GENERATE_TEST_COVERAGE_FILES = YES; 1175 GCC_GENERATE_TEST_COVERAGE_FILES = YES;
1181 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; 1176 GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
1182 GCC_NO_COMMON_BLOCKS = YES; 1177 GCC_NO_COMMON_BLOCKS = YES;
  1178 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1183 MACH_O_TYPE = staticlib; 1179 MACH_O_TYPE = staticlib;
1184 MTL_ENABLE_DEBUG_INFO = YES; 1180 MTL_ENABLE_DEBUG_INFO = YES;
1185 OTHER_LDFLAGS = ""; 1181 OTHER_LDFLAGS = "";
@@ -1202,6 +1198,7 @@ @@ -1202,6 +1198,7 @@
1202 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 1198 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
1203 ENABLE_STRICT_OBJC_MSGSEND = YES; 1199 ENABLE_STRICT_OBJC_MSGSEND = YES;
1204 GCC_NO_COMMON_BLOCKS = YES; 1200 GCC_NO_COMMON_BLOCKS = YES;
  1201 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1205 MACH_O_TYPE = staticlib; 1202 MACH_O_TYPE = staticlib;
1206 MTL_ENABLE_DEBUG_INFO = NO; 1203 MTL_ENABLE_DEBUG_INFO = NO;
1207 OTHER_LDFLAGS = ""; 1204 OTHER_LDFLAGS = "";
@@ -1224,6 +1221,7 @@ @@ -1224,6 +1221,7 @@
1224 DEBUG_INFORMATION_FORMAT = dwarf; 1221 DEBUG_INFORMATION_FORMAT = dwarf;
1225 ENABLE_STRICT_OBJC_MSGSEND = YES; 1222 ENABLE_STRICT_OBJC_MSGSEND = YES;
1226 GCC_NO_COMMON_BLOCKS = YES; 1223 GCC_NO_COMMON_BLOCKS = YES;
  1224 + IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1227 MACH_O_TYPE = staticlib; 1225 MACH_O_TYPE = staticlib;
1228 MTL_ENABLE_DEBUG_INFO = YES; 1226 MTL_ENABLE_DEBUG_INFO = YES;
1229 OTHER_LDFLAGS = ""; 1227 OTHER_LDFLAGS = "";