From cd0d5241c8ab560718034cea9818dc97c6d3ae48 Mon Sep 17 00:00:00 2001 From: James Van-As Date: Fri, 14 Sep 2018 13:35:51 +0200 Subject: [PATCH 1/2] Make travis use XCode 10 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 765668b7..16ace350 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: objective-c -osx_image: xcode9 +osx_image: xcode10 before_install: - sudo easy_install cpp-coveralls - gem install xcpretty -N From 6883d8ecf1ddb67b81ee7d6fe1bcd7984fb9c9da Mon Sep 17 00:00:00 2001 From: James Van-As Date: Fri, 14 Sep 2018 13:43:10 +0200 Subject: [PATCH 2/2] fixes noescape warnings in XCode 10 --- Masonry/NSArray+MASAdditions.m | 6 +++--- Masonry/View+MASAdditions.m | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Masonry/NSArray+MASAdditions.m b/Masonry/NSArray+MASAdditions.m index 831d8cda..f31390ae 100644 --- a/Masonry/NSArray+MASAdditions.m +++ b/Masonry/NSArray+MASAdditions.m @@ -11,7 +11,7 @@ @implementation NSArray (MASAdditions) -- (NSArray *)mas_makeConstraints:(void(^)(MASConstraintMaker *make))block { +- (NSArray *)mas_makeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block { NSMutableArray *constraints = [NSMutableArray array]; for (MAS_VIEW *view in self) { NSAssert([view isKindOfClass:[MAS_VIEW class]], @"All objects in the array must be views"); @@ -20,7 +20,7 @@ - (NSArray *)mas_makeConstraints:(void(^)(MASConstraintMaker *make))block { return constraints; } -- (NSArray *)mas_updateConstraints:(void(^)(MASConstraintMaker *make))block { +- (NSArray *)mas_updateConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block { NSMutableArray *constraints = [NSMutableArray array]; for (MAS_VIEW *view in self) { NSAssert([view isKindOfClass:[MAS_VIEW class]], @"All objects in the array must be views"); @@ -29,7 +29,7 @@ - (NSArray *)mas_updateConstraints:(void(^)(MASConstraintMaker *make))block { return constraints; } -- (NSArray *)mas_remakeConstraints:(void(^)(MASConstraintMaker *make))block { +- (NSArray *)mas_remakeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block { NSMutableArray *constraints = [NSMutableArray array]; for (MAS_VIEW *view in self) { NSAssert([view isKindOfClass:[MAS_VIEW class]], @"All objects in the array must be views"); diff --git a/Masonry/View+MASAdditions.m b/Masonry/View+MASAdditions.m index b99316ad..bfc17cc5 100644 --- a/Masonry/View+MASAdditions.m +++ b/Masonry/View+MASAdditions.m @@ -11,14 +11,14 @@ @implementation MAS_VIEW (MASAdditions) -- (NSArray *)mas_makeConstraints:(void(^)(MASConstraintMaker *))block { +- (NSArray *)mas_makeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *))block { self.translatesAutoresizingMaskIntoConstraints = NO; MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self]; block(constraintMaker); return [constraintMaker install]; } -- (NSArray *)mas_updateConstraints:(void(^)(MASConstraintMaker *))block { +- (NSArray *)mas_updateConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *))block { self.translatesAutoresizingMaskIntoConstraints = NO; MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self]; constraintMaker.updateExisting = YES; @@ -26,7 +26,7 @@ - (NSArray *)mas_updateConstraints:(void(^)(MASConstraintMaker *))block { return [constraintMaker install]; } -- (NSArray *)mas_remakeConstraints:(void(^)(MASConstraintMaker *make))block { +- (NSArray *)mas_remakeConstraints:(void(NS_NOESCAPE ^)(MASConstraintMaker *make))block { self.translatesAutoresizingMaskIntoConstraints = NO; MASConstraintMaker *constraintMaker = [[MASConstraintMaker alloc] initWithView:self]; constraintMaker.removeExisting = YES;