Skip to content

Commit b59824e

Browse files
cntrumpcntrump
committed
add tvos deployment target
1 parent 7cf6452 commit b59824e

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

‎Masonry.podspec

Lines changed: 2 additions & 2 deletions
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.1.1'
3+
s.version = '1.2.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/SnapKit/Masonry'
@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
3232
s.osx.frameworks = 'Foundation', 'AppKit'
3333

3434
s.ios.deployment_target = '9.0' # minimum SDK with autolayout
35-
s.osx.deployment_target = '10.9' # minimum SDK with autolayout
35+
s.osx.deployment_target = '10.11' # minimum SDK with autolayout
3636
s.tvos.deployment_target = '9.0' # minimum SDK with autolayout
3737
s.requires_arc = true
3838
end

‎Masonry.xcodeproj/project.pbxproj

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
3AED05AE1AD59FD40053CC65 /* Project object */ = {
192192
isa = PBXProject;
193193
attributes = {
194-
LastUpgradeCheck = 0900;
194+
LastUpgradeCheck = 1250;
195195
ORGANIZATIONNAME = "Jonas Budelmann";
196196
TargetAttributes = {
197197
3AED05B61AD59FD40053CC65 = {
@@ -262,14 +262,17 @@
262262
CLANG_WARN_BOOL_CONVERSION = YES;
263263
CLANG_WARN_COMMA = YES;
264264
CLANG_WARN_CONSTANT_CONVERSION = YES;
265+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
265266
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
266267
CLANG_WARN_EMPTY_BODY = YES;
267268
CLANG_WARN_ENUM_CONVERSION = YES;
268269
CLANG_WARN_INFINITE_RECURSION = YES;
269270
CLANG_WARN_INT_CONVERSION = YES;
270271
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
272+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
271273
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
272274
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
275+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
273276
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
274277
CLANG_WARN_STRICT_PROTOTYPES = YES;
275278
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -297,12 +300,14 @@
297300
GCC_WARN_UNUSED_FUNCTION = YES;
298301
GCC_WARN_UNUSED_VARIABLE = YES;
299302
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
300-
MACOSX_DEPLOYMENT_TARGET = 10.9;
303+
MACOSX_DEPLOYMENT_TARGET = 10.11;
301304
MTL_ENABLE_DEBUG_INFO = YES;
302305
ONLY_ACTIVE_ARCH = YES;
303306
TARGETED_DEVICE_FAMILY = "1,2";
307+
TVOS_DEPLOYMENT_TARGET = 9.0;
304308
VERSIONING_SYSTEM = "apple-generic";
305309
VERSION_INFO_PREFIX = "";
310+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
306311
};
307312
name = Debug;
308313
};
@@ -319,14 +324,17 @@
319324
CLANG_WARN_BOOL_CONVERSION = YES;
320325
CLANG_WARN_COMMA = YES;
321326
CLANG_WARN_CONSTANT_CONVERSION = YES;
327+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
322328
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
323329
CLANG_WARN_EMPTY_BODY = YES;
324330
CLANG_WARN_ENUM_CONVERSION = YES;
325331
CLANG_WARN_INFINITE_RECURSION = YES;
326332
CLANG_WARN_INT_CONVERSION = YES;
327333
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
334+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
328335
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
329336
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
337+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
330338
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
331339
CLANG_WARN_STRICT_PROTOTYPES = YES;
332340
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -347,12 +355,14 @@
347355
GCC_WARN_UNUSED_FUNCTION = YES;
348356
GCC_WARN_UNUSED_VARIABLE = YES;
349357
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
350-
MACOSX_DEPLOYMENT_TARGET = 10.9;
358+
MACOSX_DEPLOYMENT_TARGET = 10.11;
351359
MTL_ENABLE_DEBUG_INFO = NO;
352360
TARGETED_DEVICE_FAMILY = "1,2";
361+
TVOS_DEPLOYMENT_TARGET = 9.0;
353362
VALIDATE_PRODUCT = YES;
354363
VERSIONING_SYSTEM = "apple-generic";
355364
VERSION_INFO_PREFIX = "";
365+
WATCHOS_DEPLOYMENT_TARGET = 2.0;
356366
};
357367
name = Release;
358368
};
@@ -371,7 +381,8 @@
371381
PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)";
372382
PRODUCT_NAME = Masonry;
373383
SKIP_INSTALL = YES;
374-
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
384+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
385+
TARGETED_DEVICE_FAMILY = "1,2,3,6";
375386
};
376387
name = Debug;
377388
};
@@ -390,7 +401,8 @@
390401
PRODUCT_BUNDLE_IDENTIFIER = "com.cloudling.$(PRODUCT_NAME:rfc1034identifier)";
391402
PRODUCT_NAME = Masonry;
392403
SKIP_INSTALL = YES;
393-
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
404+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator";
405+
TARGETED_DEVICE_FAMILY = "1,2,3,6";
394406
};
395407
name = Release;
396408
};

‎Masonry/MASConstraint.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ - (MASConstraint *)centerY {
212212
}
213213

214214
- (MASConstraint *)baseline {
215-
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline];
215+
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline];
216216
}
217217

218218
- (MASConstraint *)firstBaseline {

‎Masonry/MASConstraintMaker.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ typedef NS_OPTIONS(NSInteger, MASAttribute) {
2020
MASAttributeHeight = 1 << NSLayoutAttributeHeight,
2121
MASAttributeCenterX = 1 << NSLayoutAttributeCenterX,
2222
MASAttributeCenterY = 1 << NSLayoutAttributeCenterY,
23-
MASAttributeBaseline = 1 << NSLayoutAttributeBaseline,
2423

2524
MASAttributeFirstBaseline = 1 << NSLayoutAttributeFirstBaseline,
2625
MASAttributeLastBaseline = 1 << NSLayoutAttributeLastBaseline,
26+
27+
MASAttributeBaseline = MASAttributeLastBaseline,
2728

2829
#if TARGET_OS_IPHONE || TARGET_OS_TV
2930

‎Masonry/MASConstraintMaker.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
@interface MASConstraintMaker () <MASConstraintDelegate>
1818

1919
@property (nonatomic, weak) MAS_VIEW *view;
20-
@property (nonatomic, weak) MASLayoutGuide *item;
20+
@property (nonatomic, weak) id item;
2121
@property (nonatomic, strong) NSMutableArray *constraints;
2222

2323
@end
@@ -185,7 +185,7 @@ - (MASConstraint *)centerY {
185185
}
186186

187187
- (MASConstraint *)baseline {
188-
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeBaseline];
188+
return [self addConstraintWithLayoutAttribute:NSLayoutAttributeLastBaseline];
189189
}
190190

191191
- (MASConstraint *(^)(MASAttribute))attributes {

‎Masonry/NSLayoutConstraint+MASDebugAdditions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ + (NSDictionary *)layoutAttributeDescriptionsByValue {
4242
@(NSLayoutAttributeHeight) : @"height",
4343
@(NSLayoutAttributeCenterX) : @"centerX",
4444
@(NSLayoutAttributeCenterY) : @"centerY",
45-
@(NSLayoutAttributeBaseline) : @"baseline",
45+
4646
@(NSLayoutAttributeFirstBaseline) : @"firstBaseline",
4747
@(NSLayoutAttributeLastBaseline) : @"lastBaseline",
4848

‎Masonry/View+MASAdditions.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ - (MASViewAttribute *)mas_centerY {
7777
}
7878

7979
- (MASViewAttribute *)mas_baseline {
80-
return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeBaseline];
80+
return [[MASViewAttribute alloc] initWithView:self layoutAttribute:NSLayoutAttributeLastBaseline];
8181
}
8282

8383
- (MASViewAttribute *(^)(NSLayoutAttribute))mas_attribute

0 commit comments

Comments
 (0)