Skip to content

Commit 086b6e5

Browse files
authored
Updating to FBSnapshotTestCase's latest 6.2.0 (dzenbot#449)
* Updating to FBSnapshotTestCase's latest 6.2.0 & updating snapshot tests accordingly for Xcode 11.3 * Disabling Danger for now, since it's crashing lately due to octokit. Should get back up once octokit/octokit.rb#1118 is merged * Updating the simulator env and Xcode version * scheme config
1 parent d210f5a commit 086b6e5

File tree

100 files changed

+3173
-2250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+3173
-2250
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
osx_image: xcode9.2
1+
osx_image: xcode11.3
22
language: objective-c
33
sudo: required
44

@@ -8,18 +8,18 @@ cache:
88

99
before_install:
1010
- bundle install
11-
- bundle exec danger
11+
#- bundle exec danger
1212

1313
env:
1414
global:
1515
- LANG=en_US.UTF-8
1616

1717
- WORKSPACE="DZNEmptyDataSet/DZNEmptyDataSet.xcworkspace"
1818
- IOS_SCHEME="DZNEmptyDataSet"
19-
- IOS_SDK="iphonesimulator11.2"
19+
- IOS_SDK="iphonesimulator13.3"
2020

2121
matrix:
22-
- DESTINATION="OS=11.2,name=iPhone 8" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME"
22+
- DESTINATION="OS=13.3,name=iPhone 8" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME"
2323

2424
script:
2525
- xcodebuild clean build test -scheme "$SCHEME" -workspace "$WORKSPACE" SDK="$IOS_SDK" -destination "$DESTINATION" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES

DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-2.launchimage/Contents.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,30 @@
33
{
44
"orientation" : "portrait",
55
"idiom" : "ipad",
6-
"minimum-system-version" : "7.0",
76
"extent" : "full-screen",
8-
"scale" : "2x"
9-
},
10-
{
11-
"orientation" : "landscape",
12-
"idiom" : "ipad",
137
"minimum-system-version" : "7.0",
14-
"extent" : "full-screen",
158
"scale" : "1x"
169
},
1710
{
1811
"orientation" : "landscape",
1912
"idiom" : "ipad",
20-
"minimum-system-version" : "7.0",
2113
"extent" : "full-screen",
22-
"scale" : "2x"
23-
},
24-
{
25-
"orientation" : "portrait",
26-
"idiom" : "iphone",
2714
"minimum-system-version" : "7.0",
28-
"scale" : "2x"
15+
"scale" : "1x"
2916
},
3017
{
3118
"orientation" : "portrait",
32-
"idiom" : "iphone",
19+
"idiom" : "ipad",
20+
"extent" : "full-screen",
3321
"minimum-system-version" : "7.0",
34-
"subtype" : "retina4",
3522
"scale" : "2x"
3623
},
3724
{
38-
"orientation" : "portrait",
25+
"orientation" : "landscape",
3926
"idiom" : "ipad",
40-
"minimum-system-version" : "7.0",
4127
"extent" : "full-screen",
42-
"scale" : "1x"
28+
"minimum-system-version" : "7.0",
29+
"scale" : "2x"
4330
}
4431
],
4532
"info" : {

DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-3.launchimage/Contents.json

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,30 @@
33
{
44
"orientation" : "portrait",
55
"idiom" : "ipad",
6-
"minimum-system-version" : "7.0",
76
"extent" : "full-screen",
8-
"scale" : "2x"
9-
},
10-
{
11-
"orientation" : "landscape",
12-
"idiom" : "ipad",
137
"minimum-system-version" : "7.0",
14-
"extent" : "full-screen",
158
"scale" : "1x"
169
},
1710
{
1811
"orientation" : "landscape",
1912
"idiom" : "ipad",
20-
"minimum-system-version" : "7.0",
2113
"extent" : "full-screen",
22-
"scale" : "2x"
23-
},
24-
{
25-
"orientation" : "portrait",
26-
"idiom" : "iphone",
2714
"minimum-system-version" : "7.0",
28-
"scale" : "2x"
15+
"scale" : "1x"
2916
},
3017
{
3118
"orientation" : "portrait",
32-
"idiom" : "iphone",
19+
"idiom" : "ipad",
20+
"extent" : "full-screen",
3321
"minimum-system-version" : "7.0",
34-
"subtype" : "retina4",
3522
"scale" : "2x"
3623
},
3724
{
38-
"orientation" : "portrait",
25+
"orientation" : "landscape",
3926
"idiom" : "ipad",
40-
"minimum-system-version" : "7.0",
4127
"extent" : "full-screen",
42-
"scale" : "1x"
28+
"minimum-system-version" : "7.0",
29+
"scale" : "2x"
4330
}
4431
],
4532
"info" : {

DZNEmptyDataSet/Colors/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"size" : "20x20",
6+
"scale" : "2x"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"size" : "20x20",
11+
"scale" : "3x"
12+
},
313
{
414
"size" : "29x29",
515
"idiom" : "iphone",
@@ -54,6 +64,16 @@
5464
"filename" : "[email protected]",
5565
"scale" : "3x"
5666
},
67+
{
68+
"idiom" : "ipad",
69+
"size" : "20x20",
70+
"scale" : "1x"
71+
},
72+
{
73+
"idiom" : "ipad",
74+
"size" : "20x20",
75+
"scale" : "2x"
76+
},
5777
{
5878
"size" : "29x29",
5979
"idiom" : "ipad",
@@ -119,6 +139,11 @@
119139
"idiom" : "ipad",
120140
"filename" : "icon-120~car.png",
121141
"scale" : "2x"
142+
},
143+
{
144+
"idiom" : "ios-marketing",
145+
"size" : "1024x1024",
146+
"scale" : "1x"
122147
}
123148
],
124149
"info" : {

0 commit comments

Comments
 (0)