From 446c6b8abb3101063f0da27e20c820f02d3d9f54 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 16 Sep 2016 10:45:46 +0200 Subject: [PATCH 1/8] Rename defaine __NSMutableArray_of into PL__NSMutableArray_of; --- PureLayout/PureLayout/ALView+PureLayout.m | 14 +++++++------- PureLayout/PureLayout/NSArray+PureLayout.m | 16 ++++++++-------- .../PureLayout/NSLayoutConstraint+PureLayout.m | 18 +++++++++--------- PureLayout/PureLayout/PureLayout+Internal.h | 4 ++-- .../PureLayoutTests/PureLayoutBatchTests.m | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/PureLayout/PureLayout/ALView+PureLayout.m b/PureLayout/PureLayout/ALView+PureLayout.m index 15d01b5..2e94662 100755 --- a/PureLayout/PureLayout/ALView+PureLayout.m +++ b/PureLayout/PureLayout/ALView+PureLayout.m @@ -80,7 +80,7 @@ - (instancetype)configureForAutoLayout */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoCenterInSuperview { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObject:[self autoAlignAxisToSuperviewAxis:ALAxisHorizontal]]; [constraints addObject:[self autoAlignAxisToSuperviewAxis:ALAxisVertical]]; return constraints; @@ -109,7 +109,7 @@ - (NSLayoutConstraint *)autoAlignAxisToSuperviewAxis:(ALAxis)axis */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoCenterInSuperviewMargins { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObject:[self autoAlignAxisToSuperviewMarginAxis:ALAxisHorizontal]]; [constraints addObject:[self autoAlignAxisToSuperviewMarginAxis:ALAxisVertical]]; return constraints; @@ -202,7 +202,7 @@ - (NSLayoutConstraint *)autoPinEdgeToSuperviewEdge:(ALEdge)edge withInset:(CGFlo */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoPinEdgesToSuperviewEdgesWithInsets:(ALEdgeInsets)insets { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObject:[self autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:insets.top]]; [constraints addObject:[self autoPinEdgeToSuperviewEdge:ALEdgeLeading withInset:insets.left]]; [constraints addObject:[self autoPinEdgeToSuperviewEdge:ALEdgeBottom withInset:insets.bottom]]; @@ -221,7 +221,7 @@ - (NSLayoutConstraint *)autoPinEdgeToSuperviewEdge:(ALEdge)edge withInset:(CGFlo */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoPinEdgesToSuperviewEdgesWithInsets:(ALEdgeInsets)insets excludingEdge:(ALEdge)edge { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; if (edge != ALEdgeTop) { [constraints addObject:[self autoPinEdgeToSuperviewEdge:ALEdgeTop withInset:insets.top]]; } @@ -281,7 +281,7 @@ - (NSLayoutConstraint *)autoPinEdgeToSuperviewMargin:(ALEdge)edge relation:(NSLa */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoPinEdgesToSuperviewMargins { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObject:[self autoPinEdgeToSuperviewMargin:ALEdgeTop]]; [constraints addObject:[self autoPinEdgeToSuperviewMargin:ALEdgeLeading]]; [constraints addObject:[self autoPinEdgeToSuperviewMargin:ALEdgeBottom]]; @@ -297,7 +297,7 @@ - (NSLayoutConstraint *)autoPinEdgeToSuperviewMargin:(ALEdge)edge relation:(NSLa */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoPinEdgesToSuperviewMarginsExcludingEdge:(ALEdge)edge { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; if (edge != ALEdgeTop) { [constraints addObject:[self autoPinEdgeToSuperviewMargin:ALEdgeTop]]; } @@ -486,7 +486,7 @@ - (NSLayoutConstraint *)autoMatchDimension:(ALDimension)dimension toDimension:(A */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoSetDimensionsToSize:(CGSize)size { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObject:[self autoSetDimension:ALDimensionWidth toSize:size.width]]; [constraints addObject:[self autoSetDimension:ALDimensionHeight toSize:size.height]]; return constraints; diff --git a/PureLayout/PureLayout/NSArray+PureLayout.m b/PureLayout/PureLayout/NSArray+PureLayout.m index 0f8aba4..2010630 100755 --- a/PureLayout/PureLayout/NSArray+PureLayout.m +++ b/PureLayout/PureLayout/NSArray+PureLayout.m @@ -121,7 +121,7 @@ - (instancetype)autoIdentifyConstraints:(NSString *)identifier - (PL__NSArray_of(NSLayoutConstraint *) *)autoAlignViewsToEdge:(ALEdge)edge { NSAssert([self al_containsMinimumNumberOfViews:2], @"This array must contain at least 2 views."); - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; ALView *previousView = nil; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { @@ -146,7 +146,7 @@ - (instancetype)autoIdentifyConstraints:(NSString *)identifier - (PL__NSArray_of(NSLayoutConstraint *) *)autoAlignViewsToAxis:(ALAxis)axis { NSAssert([self al_containsMinimumNumberOfViews:2], @"This array must contain at least 2 views."); - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; ALView *previousView = nil; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { @@ -171,7 +171,7 @@ - (instancetype)autoIdentifyConstraints:(NSString *)identifier - (PL__NSArray_of(NSLayoutConstraint *) *)autoMatchViewsDimension:(ALDimension)dimension { NSAssert([self al_containsMinimumNumberOfViews:2], @"This array must contain at least 2 views."); - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; ALView *previousView = nil; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { @@ -197,7 +197,7 @@ - (instancetype)autoIdentifyConstraints:(NSString *)identifier - (PL__NSArray_of(NSLayoutConstraint *) *)autoSetViewsDimension:(ALDimension)dimension toSize:(CGFloat)size { NSAssert([self al_containsMinimumNumberOfViews:1], @"This array must contain at least 1 view."); - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { ALView *view = (ALView *)object; @@ -217,7 +217,7 @@ - (instancetype)autoIdentifyConstraints:(NSString *)identifier */ - (PL__NSArray_of(NSLayoutConstraint *) *)autoSetViewsDimensionsToSize:(CGSize)size { - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; [constraints addObjectsFromArray:[self autoSetViewsDimension:ALDimensionWidth toSize:size.width]]; [constraints addObjectsFromArray:[self autoSetViewsDimension:ALDimensionHeight toSize:size.height]]; return constraints; @@ -311,7 +311,7 @@ Views will be the same size (variable) in the dimension along the axis and will CGFloat leadingSpacing = shouldSpaceInsets ? spacing : 0.0; CGFloat trailingSpacing = shouldSpaceInsets ? spacing : 0.0; - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; ALView *previousView = nil; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { @@ -407,7 +407,7 @@ Views will be the same size (fixed) in the dimension along the axis and will hav #endif /* TARGET_OS_IPHONE */ BOOL shouldFlipOrder = isRightToLeftLayout && (axis != ALAxisVertical); // imitate the effect of leading/trailing when distributing horizontally - __NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; + PL__NSMutableArray_of(NSLayoutConstraint *) *constraints = [NSMutableArray new]; PL__NSArray_of(ALView *) *views = [self al_copyViewsOnly]; NSUInteger numberOfViews = [views count]; ALView *commonSuperview = [views al_commonSuperviewOfViews]; @@ -493,7 +493,7 @@ - (BOOL)al_containsMinimumNumberOfViews:(NSUInteger)minimumNumberOfViews */ - (PL__NSArray_of(ALView *) *)al_copyViewsOnly { - __NSMutableArray_of(ALView *) *viewsOnlyArray = [NSMutableArray arrayWithCapacity:[self count]]; + PL__NSMutableArray_of(ALView *) *viewsOnlyArray = [NSMutableArray arrayWithCapacity:[self count]]; for (id object in self) { if ([object isKindOfClass:[ALView class]]) { [viewsOnlyArray addObject:object]; diff --git a/PureLayout/PureLayout/NSLayoutConstraint+PureLayout.m b/PureLayout/PureLayout/NSLayoutConstraint+PureLayout.m index 2569b02..5738bc0 100755 --- a/PureLayout/PureLayout/NSLayoutConstraint+PureLayout.m +++ b/PureLayout/PureLayout/NSLayoutConstraint+PureLayout.m @@ -46,7 +46,7 @@ @implementation NSLayoutConstraint (PureLayout) NOTE: Access to this variable is not synchronized (and should only be done on the main thread). */ -static __NSMutableArray_of(__NSMutableArray_of(NSLayoutConstraint *) *) *_al_arraysOfCreatedConstraints = nil; +static PL__NSMutableArray_of(PL__NSMutableArray_of(NSLayoutConstraint *) *) *_al_arraysOfCreatedConstraints = nil; /** A global variable that is set to YES when installing a batch of constraints collected from a call to +[autoCreateAndInstallConstraints]. @@ -59,7 +59,7 @@ should not return constraints from within the blocks of nested call(s). /** Accessor for the global state that stores arrays of constraints created without being installed. */ -+ (__NSMutableArray_of(__NSMutableArray_of(NSLayoutConstraint *) *) *)al_arraysOfCreatedConstraints ++ (PL__NSMutableArray_of(PL__NSMutableArray_of(NSLayoutConstraint *) *) *)al_arraysOfCreatedConstraints { NSAssert([NSThread isMainThread], @"PureLayout is not thread safe, and must be used exclusively from the main thread."); if (!_al_arraysOfCreatedConstraints) { @@ -71,7 +71,7 @@ should not return constraints from within the blocks of nested call(s). /** Accessor for the current mutable array of constraints created without being immediately installed. */ -+ (__NSMutableArray_of(NSLayoutConstraint *) *)al_currentArrayOfCreatedConstraints ++ (PL__NSMutableArray_of(NSLayoutConstraint *) *)al_currentArrayOfCreatedConstraints { return [[self al_arraysOfCreatedConstraints] lastObject]; } @@ -138,12 +138,12 @@ Creates all of the constraints in the block but prevents them from being automat constraints created by this library (even if automatic constraint installation is being prevented). NOTE: Access to this variable is not synchronized (and should only be done on the main thread). */ -static __NSMutableArray_of(NSNumber *) *_al_globalConstraintPriorities = nil; +static PL__NSMutableArray_of(NSNumber *) *_al_globalConstraintPriorities = nil; /** Accessor for the global stack of layout priorities. */ -+ (__NSMutableArray_of(NSNumber *) *)al_globalConstraintPriorities ++ (PL__NSMutableArray_of(NSNumber *) *)al_globalConstraintPriorities { NSAssert([NSThread isMainThread], @"PureLayout is not thread safe, and must be used exclusively from the main thread."); if (!_al_globalConstraintPriorities) { @@ -159,7 +159,7 @@ constraints created by this library (even if automatic constraint installation i */ + (ALLayoutPriority)al_currentGlobalConstraintPriority { - __NSMutableArray_of(NSNumber *) *globalConstraintPriorities = [self al_globalConstraintPriorities]; + PL__NSMutableArray_of(NSNumber *) *globalConstraintPriorities = [self al_globalConstraintPriorities]; if ([globalConstraintPriorities count] == 0) { return ALLayoutPriorityRequired; } @@ -207,12 +207,12 @@ + (void)autoSetPriority:(ALLayoutPriority)priority forConstraints:(__attribute__ constraints created by this library (even if automatic constraint installation is being prevented). NOTE: Access to this variable is not synchronized (and should only be done on the main thread). */ -static __NSMutableArray_of(NSString *) *_al_globalConstraintIdentifiers = nil; +static PL__NSMutableArray_of(NSString *) *_al_globalConstraintIdentifiers = nil; /** Accessor for the global state of constraint identifiers. */ -+ (__NSMutableArray_of(NSString *) *)al_globalConstraintIdentifiers ++ (PL__NSMutableArray_of(NSString *) *)al_globalConstraintIdentifiers { NSAssert([NSThread isMainThread], @"PureLayout is not thread safe, and must be used exclusively from the main thread."); if (!_al_globalConstraintIdentifiers) { @@ -228,7 +228,7 @@ constraints created by this library (even if automatic constraint installation i */ + (NSString *)al_currentGlobalConstraintIdentifier { - __NSMutableArray_of(NSString *) *globalConstraintIdentifiers = [self al_globalConstraintIdentifiers]; + PL__NSMutableArray_of(NSString *) *globalConstraintIdentifiers = [self al_globalConstraintIdentifiers]; if ([globalConstraintIdentifiers count] == 0) { return nil; } diff --git a/PureLayout/PureLayout/PureLayout+Internal.h b/PureLayout/PureLayout/PureLayout+Internal.h index 2a2c5eb..12aa7d0 100644 --- a/PureLayout/PureLayout/PureLayout+Internal.h +++ b/PureLayout/PureLayout/PureLayout+Internal.h @@ -29,7 +29,7 @@ // Using generics with NSMutableArray is so common in the internal implementation of PureLayout that it gets a dedicated preprocessor macro for better readability. -#define __NSMutableArray_of(type) PL__GENERICS(NSMutableArray, type) +#define PL__NSMutableArray_of(type) PL__GENERICS(NSMutableArray, type) PL__ASSUME_NONNULL_BEGIN @@ -68,7 +68,7 @@ static const CGFloat kMULTIPLIER_MIN_VALUE = (CGFloat)0.00001; // very small flo @interface NSLayoutConstraint (PureLayoutInternal) + (BOOL)al_preventAutomaticConstraintInstallation; -+ (__NSMutableArray_of(NSLayoutConstraint *) *)al_currentArrayOfCreatedConstraints; ++ (PL__NSMutableArray_of(NSLayoutConstraint *) *)al_currentArrayOfCreatedConstraints; + (BOOL)al_isExecutingPriorityConstraintsBlock; + (ALLayoutPriority)al_currentGlobalConstraintPriority; #if PL__PureLayout_MinBaseSDK_iOS_8_0 || PL__PureLayout_MinBaseSDK_OSX_10_10 diff --git a/PureLayout/PureLayoutTests/PureLayoutBatchTests.m b/PureLayout/PureLayoutTests/PureLayoutBatchTests.m index 09ae16e..ab9b46f 100644 --- a/PureLayout/PureLayoutTests/PureLayoutBatchTests.m +++ b/PureLayout/PureLayoutTests/PureLayoutBatchTests.m @@ -78,7 +78,7 @@ - (BOOL)noConstraintsAreActivated:(PL__NSArray_of(NSLayoutConstraint *) *)constr */ - (void)testCreateAndInstallConstraints { - __NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array]; + PL__NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array]; PL__NSArray_of(NSLayoutConstraint *) *returnedConstraints = [NSLayoutConstraint autoCreateAndInstallConstraints:^{ [createdConstraints addObjectsFromArray:[self.viewA autoPinEdgesToSuperviewEdges]]; [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisHorizontal toSameAxisOfView:self.viewA_A.superview]]; @@ -149,7 +149,7 @@ - (void)testCreateAndInstallConstraintsNested */ - (void)testCreateConstraintsWithoutInstalling { - __NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array]; + PL__NSMutableArray_of(NSLayoutConstraint *) *createdConstraints = [NSMutableArray array]; PL__NSArray_of(NSLayoutConstraint *) *returnedConstraints = [NSLayoutConstraint autoCreateConstraintsWithoutInstalling:^{ [createdConstraints addObjectsFromArray:[self.viewA autoPinEdgesToSuperviewEdgesWithInsets:ALEdgeInsetsMake(10.0, 10.0, 10.0, 10.0) excludingEdge:ALEdgeBottom]]; [createdConstraints addObject:[self.viewA_A autoAlignAxis:ALAxisVertical toSameAxisOfView:self.viewA_A.superview]]; From b9e0a80b47490e86bb170bd1385e3d3ae76e0ff5 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 16 Sep 2016 10:53:37 +0200 Subject: [PATCH 2/8] Add ruby version specification in travis; --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0743aeb..d967019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: false language: objective-c +rvm: + - 2.3.1 xcode_project: PureLayout/PureLayout.xcodeproj matrix: include: From cd1aa6b8c08f1f4987031ee5e091c9e713397c97 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 16 Sep 2016 10:58:19 +0200 Subject: [PATCH 3/8] Install rvm to use specific ruby version; --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d967019..aa0280b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: xcode_scheme: PureLayout_Mac before_install: + - rvm install 2.3.1 - gem install slather --no-ri --no-rdoc after_success: slather From e50eb576a8ce4d5dab3ad43db728ac546411eba6 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 16 Sep 2016 10:53:37 +0200 Subject: [PATCH 4/8] Add ruby version specification in travis; --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0743aeb..d967019 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ sudo: false language: objective-c +rvm: + - 2.3.1 xcode_project: PureLayout/PureLayout.xcodeproj matrix: include: From f1a8023fb8a6fbfc6f02a2554420b236ec3843fc Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Fri, 16 Sep 2016 10:58:19 +0200 Subject: [PATCH 5/8] Install rvm to use specific ruby version; --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d967019..aa0280b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ matrix: xcode_scheme: PureLayout_Mac before_install: + - rvm install 2.3.1 - gem install slather --no-ri --no-rdoc after_success: slather From 25421ec78ba8c3c1046cb2f0c5fb62656b0fe2f0 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Mon, 16 Jan 2017 13:06:15 +0100 Subject: [PATCH 6/8] Specify osx_image as Xcode 8; --- .ruby-version | 1 + .travis.yml | 1 + 2 files changed, 2 insertions(+) create mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..8bbe6cf --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.2 diff --git a/.travis.yml b/.travis.yml index aa0280b..a969491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ sudo: false +osx_image: xcode8 language: objective-c rvm: - 2.3.1 From f9941dcb7462b2dfbe55330b75c747b0623de382 Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Tue, 17 Jan 2017 19:48:54 +0100 Subject: [PATCH 7/8] Update travis.yml; --- .ruby-version | 1 - .travis.yml | 11 ++--- .../PureLayout.xcodeproj/project.pbxproj | 49 ++++++++++++------- 3 files changed, 36 insertions(+), 25 deletions(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 8bbe6cf..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.2 diff --git a/.travis.yml b/.travis.yml index a969491..e51de5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,15 +4,12 @@ language: objective-c rvm: - 2.3.1 xcode_project: PureLayout/PureLayout.xcodeproj -matrix: - include: - - xcode_sdk: iphonesimulator - xcode_scheme: PureLayout_iOS - - xcode_sdk: macosx - xcode_scheme: PureLayout_Mac - before_install: - rvm install 2.3.1 - gem install slather --no-ri --no-rdoc +script: + - xcodebuild test -project PureLayout/PureLayout.xcodeproj -scheme PureLayout_iOS -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' + - xcodebuild test -project PureLayout/PureLayout.xcodeproj -scheme PureLayout_Mac -destination 'platform=OS X,arch=x86_64' + after_success: slather diff --git a/PureLayout/PureLayout.xcodeproj/project.pbxproj b/PureLayout/PureLayout.xcodeproj/project.pbxproj index 9b21a3b..666310d 100644 --- a/PureLayout/PureLayout.xcodeproj/project.pbxproj +++ b/PureLayout/PureLayout.xcodeproj/project.pbxproj @@ -145,6 +145,13 @@ remoteGlobalIDString = 164C8B721C0D36500007A6B1; remoteInfo = PureLayout_tvOS; }; + 6D207E9A1E2E99EB00CCDD7C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = B12C23D317C3FDE4001CF667 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B1A290DA19562FDA00D4765E; + remoteInfo = "Example-Mac"; + }; A7D496571B7B084800A74818 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = B12C23D317C3FDE4001CF667 /* Project object */; @@ -173,13 +180,6 @@ remoteGlobalIDString = B12C23DA17C3FDE4001CF667; remoteInfo = "Example-iOS"; }; - B1046B1B1A7F4A680017187F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = B12C23D317C3FDE4001CF667 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B1A290DA19562FDA00D4765E; - remoteInfo = "Example-Mac"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -905,7 +905,7 @@ buildRules = ( ); dependencies = ( - B1046B1C1A7F4A680017187F /* PBXTargetDependency */, + 6D207E9B1E2E99EB00CCDD7C /* PBXTargetDependency */, ); name = "PureLayoutTests-Mac"; productName = "PureLayoutTests-Mac"; @@ -956,6 +956,7 @@ TestTargetID = B12C23DA17C3FDE4001CF667; }; B1EC857B195662B40099293C = { + ProvisioningStyle = Manual; TestTargetID = B1A290DA19562FDA00D4765E; }; }; @@ -1217,6 +1218,11 @@ target = 164C8B721C0D36500007A6B1 /* PureLayout_tvOS */; targetProxy = 164C8B8E1C0D37C70007A6B1 /* PBXContainerItemProxy */; }; + 6D207E9B1E2E99EB00CCDD7C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B1A290DA19562FDA00D4765E /* Example-Mac */; + targetProxy = 6D207E9A1E2E99EB00CCDD7C /* PBXContainerItemProxy */; + }; A7D496561B7B084800A74818 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B1046AAF1A7F32380017187F /* PureLayout_iOS */; @@ -1237,11 +1243,6 @@ target = B12C23DA17C3FDE4001CF667 /* Example-iOS */; targetProxy = B1046B191A7F4A640017187F /* PBXContainerItemProxy */; }; - B1046B1C1A7F4A680017187F /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B1A290DA19562FDA00D4765E /* Example-Mac */; - targetProxy = B1046B1B1A7F4A680017187F /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1603,6 +1604,8 @@ MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = PureLayout; + PROVISIONING_PROFILE = None; + PROVISIONING_PROFILE_SPECIFIER = None; SDKROOT = macosx; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1639,6 +1642,8 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = PureLayout; + PROVISIONING_PROFILE = None; + PROVISIONING_PROFILE_SPECIFIER = None; SDKROOT = macosx; SKIP_INSTALL = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1664,7 +1669,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1711,7 +1716,7 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; COPY_PHASE_STRIP = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1796,6 +1801,8 @@ METAL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = None; + PROVISIONING_PROFILE_SPECIFIER = None; SDKROOT = macosx; }; name = Debug; @@ -1823,6 +1830,8 @@ METAL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE = None; + PROVISIONING_PROFILE_SPECIFIER = None; SDKROOT = macosx; }; name = Release; @@ -1834,6 +1843,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1867,6 +1877,7 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1897,7 +1908,9 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", @@ -1918,7 +1931,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; + SUPPORTED_PLATFORMS = macosx; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example-Mac.app/Contents/MacOS/Example-Mac"; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; @@ -1932,8 +1945,10 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEVELOPMENT_TEAM = ""; ENABLE_NS_ASSERTIONS = NO; FRAMEWORK_SEARCH_PATHS = ( "$(DEVELOPER_FRAMEWORKS_DIR)", @@ -1951,7 +1966,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.PureLayout.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; - SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; + SUPPORTED_PLATFORMS = macosx; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example-Mac.app/Contents/MacOS/Example-Mac"; WARNING_CFLAGS = ""; WRAPPER_EXTENSION = xctest; From e40123d02f39ff1a768e539b56bf8455a1fe654f Mon Sep 17 00:00:00 2001 From: Anton Domashnev Date: Tue, 17 Jan 2017 22:55:06 +0100 Subject: [PATCH 8/8] Use 10.0 simulator; --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e51de5a..97e962e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - gem install slather --no-ri --no-rdoc script: - - xcodebuild test -project PureLayout/PureLayout.xcodeproj -scheme PureLayout_iOS -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.2' + - xcodebuild test -project PureLayout/PureLayout.xcodeproj -scheme PureLayout_iOS -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' - xcodebuild test -project PureLayout/PureLayout.xcodeproj -scheme PureLayout_Mac -destination 'platform=OS X,arch=x86_64' after_success: slather