Skip to content

Commit bf56075

Browse files
committed
Revert "Set deployment target constraints for margins"
This reverts commit 7528f5b. # Conflicts: # Examples/Masonry iOS Examples.xcodeproj/xcshareddata/xcschemes/Masonry iOS Examples.xcscheme # Masonry.xcodeproj/project.pbxproj # Masonry.xcodeproj/xcshareddata/xcschemes/Masonry OSX.xcscheme # Masonry.xcodeproj/xcshareddata/xcschemes/Masonry iOS.xcscheme # Tests/Masonry Tests.xcodeproj/xcshareddata/xcschemes/Masonry iOS Tests.xcscheme
1 parent ba96e71 commit bf56075

8 files changed

Lines changed: 12 additions & 12 deletions

Masonry/MASConstraint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141

142142
#endif
143143

144-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
144+
#if TARGET_OS_IPHONE || TARGET_OS_TV
145145

146146
- (MASConstraint *)leftMargin;
147147
- (MASConstraint *)rightMargin;

Masonry/MASConstraint.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ - (MASConstraint *)lastBaseline {
226226

227227
#endif
228228

229-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
229+
#if TARGET_OS_IPHONE || TARGET_OS_TV
230230

231231
- (MASConstraint *)leftMargin {
232232
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];

Masonry/MASConstraintMaker.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
2929

3030
#endif
3131

32-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
32+
#if TARGET_OS_IPHONE || TARGET_OS_TV
3333

3434
MASAttributeLeftMargin = 1 << NSLayoutAttributeLeftMargin,
3535
MASAttributeRightMargin = 1 << NSLayoutAttributeRightMargin,
@@ -74,7 +74,7 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
7474

7575
#endif
7676

77-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
77+
#if TARGET_OS_IPHONE || TARGET_OS_TV
7878

7979
@property (nonatomic, strong, readonly) MASConstraint *leftMargin;
8080
@property (nonatomic, strong, readonly) MASConstraint *rightMargin;

Masonry/MASConstraintMaker.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs {
8181
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
8282
| MASAttributeFirstBaseline | MASAttributeLastBaseline
8383
#endif
84-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
84+
#if TARGET_OS_IPHONE || TARGET_OS_TV
8585
| MASAttributeLeftMargin | MASAttributeRightMargin | MASAttributeTopMargin | MASAttributeBottomMargin
8686
| MASAttributeLeadingMargin | MASAttributeTrailingMargin | MASAttributeCenterXWithinMargins
8787
| MASAttributeCenterYWithinMargins
@@ -111,7 +111,7 @@ - (MASConstraint *)addConstraintWithAttributes:(MASAttribute)attrs {
111111

112112
#endif
113113

114-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
114+
#if TARGET_OS_IPHONE || TARGET_OS_TV
115115

116116
if (attrs & MASAttributeLeftMargin) [attributes addObject:self.view.mas_leftMargin];
117117
if (attrs & MASAttributeRightMargin) [attributes addObject:self.view.mas_rightMargin];
@@ -205,7 +205,7 @@ - (MASConstraint *)lastBaseline {
205205
#endif
206206

207207

208-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
208+
#if TARGET_OS_IPHONE || TARGET_OS_TV
209209

210210
- (MASConstraint *)leftMargin {
211211
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLeftMargin];

Masonry/NSLayoutConstraint+MASDebugAdditions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ + (NSDictionary *)layoutAttributeDescriptionsByValue {
4949
@(NSLayoutAttributeLastBaseline) : @"lastBaseline",
5050
#endif
5151

52-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
52+
#if TARGET_OS_IPHONE || TARGET_OS_TV
5353
@(NSLayoutAttributeLeftMargin) : @"leftMargin",
5454
@(NSLayoutAttributeRightMargin) : @"rightMargin",
5555
@(NSLayoutAttributeTopMargin) : @"topMargin",

Masonry/View+MASAdditions.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#endif
4141

42-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
42+
#if TARGET_OS_IPHONE || TARGET_OS_TV
4343

4444
@property (nonatomic, strong, readonly) MASViewAttribute *mas_leftMargin;
4545
@property (nonatomic, strong, readonly) MASViewAttribute *mas_rightMargin;

Masonry/View+MASAdditions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ - (MASViewAttribute *)mas_lastBaseline {
9898

9999
#endif
100100

101-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
101+
#if TARGET_OS_IPHONE || TARGET_OS_TV
102102

103103
- (MASViewAttribute *)mas_leftMargin {
104104
return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLeftMargin];

Masonry/View+MASShorthandAdditions.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
#endif
3838

39-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
39+
#if TARGET_OS_IPHONE || TARGET_OS_TV
4040

4141
@property (nonatomic, strong, readonly) MASViewAttribute *leftMargin;
4242
@property (nonatomic, strong, readonly) MASViewAttribute *rightMargin;
@@ -90,7 +90,7 @@ MAS_ATTR_FORWARD(lastBaseline);
9090

9191
#endif
9292

93-
#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
93+
#if TARGET_OS_IPHONE || TARGET_OS_TV
9494

9595
MAS_ATTR_FORWARD(leftMargin);
9696
MAS_ATTR_FORWARD(rightMargin);

0 commit comments

Comments
 (0)