Skip to content

Commit 3116754

Browse files
committed
Use Xcode 12 for travis
1 parent 852b469 commit 3116754

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
---
22
language: objective-c
3-
osx_image: xcode9
3+
osx_image: xcode12
44
before_install:
5-
- sudo easy_install cpp-coveralls
5+
- curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py | sudo python
6+
- sudo pip install cpp-coveralls
67
- gem install xcpretty -N
78
- export LANG=en_US.UTF-8
89

910
script:
1011
- set -o pipefail
11-
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' clean test ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
12-
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS' -configuration Debug -sdk iphonesimulator clean build ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO | xcpretty -c
13-
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry OSX' -configuration Debug clean build | xcpretty -c
12+
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8,OS=14.0' clean test ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c
13+
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk iphonesimulator clean build ARCHS=x86_64 VALID_ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO | xcpretty -c
14+
- xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry' -configuration Debug -sdk macosx clean build | xcpretty -c
1415

1516
after_success:
1617
- ./script/coveralls.sh

Tests/Specs/NSLayoutConstraint+MASDebugAdditionsSpec.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ - (void)testDisplayLayoutConstraintKey {
3535
MASLayoutConstraint *layoutConstraint = [MASLayoutConstraint constraintWithItem:newView1 attribute:NSLayoutAttributeBaseline relatedBy:NSLayoutRelationEqual toItem:newView2 attribute:NSLayoutAttributeTop multiplier:2 constant:300];
3636
layoutConstraint.mas_key = @"helloConstraint";
3737

38-
NSString *description = [NSString stringWithFormat:@"<MASLayoutConstraint:helloConstraint %@:newView1.baseline == %@:newView2.top * 2 + 300>", MAS_VIEW.class, MAS_VIEW.class];
38+
NSString *description = [NSString stringWithFormat:@"<MASLayoutConstraint:helloConstraint %@:newView1.lastBaseline == %@:newView2.top * 2 + 300>", MAS_VIEW.class, MAS_VIEW.class];
3939
expect([layoutConstraint description]).to.equal(description);
4040
}
4141

@@ -57,4 +57,4 @@ - (void)testDisplayConstraintKey {
5757
expect([superview.constraints[0] description]).to.equal(description);
5858
}
5959

60-
SpecEnd
60+
SpecEnd

0 commit comments

Comments
 (0)