Updating to FBSnapshotTestCase's latest 6.2.0 (#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
dzenbot · Jan 1, 2020 · 086b6e5 · 086b6e5
1 parent d210f5a
commit 086b6e5
Show file tree

Hide file tree

Showing 100 changed files with 3,173 additions and 2,250 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-osx_image: xcode9.2
+osx_image: xcode11.3
 language: objective-c
 sudo: required
 
@@ -8,18 +8,18 @@ cache:
 
 before_install:
     - bundle install
-    - bundle exec danger
+    #- bundle exec danger
 
 env:
     global:
     - LANG=en_US.UTF-8
 
     - WORKSPACE="DZNEmptyDataSet/DZNEmptyDataSet.xcworkspace"
     - IOS_SCHEME="DZNEmptyDataSet"
-    - IOS_SDK="iphonesimulator11.2"
+    - IOS_SDK="iphonesimulator13.3"
 
     matrix:
-    - DESTINATION="OS=11.2,name=iPhone 8" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME"
+    - DESTINATION="OS=13.3,name=iPhone 8" SDK="$IOS_SDK" SCHEME="$IOS_SCHEME"
 
 script:
     - 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

diff --git a/DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-2.launchimage/Contents.json b/DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-2.launchimage/Contents.json
@@ -3,43 +3,30 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
-      "idiom" : "iphone",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-3.launchimage/Contents.json b/DZNEmptyDataSet/Applications/Assets.xcassets/LaunchImage-3.launchimage/Contents.json
@@ -3,43 +3,30 @@
     {
       "orientation" : "portrait",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
       "minimum-system-version" : "7.0",
-      "extent" : "full-screen",
       "scale" : "1x"
     },
     {
       "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
       "minimum-system-version" : "7.0",
-      "scale" : "2x"
+      "scale" : "1x"
     },
     {
       "orientation" : "portrait",
-      "idiom" : "iphone",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
       "minimum-system-version" : "7.0",
-      "subtype" : "retina4",
       "scale" : "2x"
     },
     {
-      "orientation" : "portrait",
+      "orientation" : "landscape",
       "idiom" : "ipad",
-      "minimum-system-version" : "7.0",
       "extent" : "full-screen",
-      "scale" : "1x"
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
     }
   ],
   "info" : {

diff --git a/DZNEmptyDataSet/Colors/Assets.xcassets/AppIcon.appiconset/Contents.json b/DZNEmptyDataSet/Colors/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "size" : "29x29",
       "idiom" : "iphone",
@@ -54,6 +64,16 @@
       "filename" : "icon-60@3x.png",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "size" : "29x29",
       "idiom" : "ipad",
@@ -119,6 +139,11 @@
       "idiom" : "ipad",
       "filename" : "icon-120~car.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {