Merge branch 'master' into june-release

ios/bitkit/Images.xcassets/AppIconBlack.appiconset/Contents.json

@@ -1,100 +1,122 @@
 {
-  "images": [
-    {
-      "size": "60x60",
-      "expected-size": "180",
-      "filename": "180.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "3x"
-    },
-    {
-      "size": "40x40",
-      "expected-size": "80",
-      "filename": "80.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "2x"
-    },
-    {
-      "size": "40x40",
-      "expected-size": "120",
-      "filename": "120.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "3x"
-    },
-    {
-      "size": "60x60",
-      "expected-size": "120",
-      "filename": "120.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "2x"
-    },
-    {
-      "size": "57x57",
-      "expected-size": "57",
-      "filename": "57.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "1x"
-    },
-    {
-      "size": "29x29",
-      "expected-size": "58",
-      "filename": "58.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "2x"
-    },
-    {
-      "size": "29x29",
-      "expected-size": "29",
-      "filename": "29.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "1x"
-    },
-    {
-      "size": "29x29",
-      "expected-size": "87",
-      "filename": "87.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "3x"
-    },
-    {
-      "size": "57x57",
-      "expected-size": "114",
-      "filename": "114.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "2x"
-    },
-    {
-      "size": "20x20",
-      "expected-size": "40",
-      "filename": "40.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "2x"
-    },
-    {
-      "size": "20x20",
-      "expected-size": "60",
-      "filename": "60.png",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "idiom": "iphone",
-      "scale": "3x"
-    },
-    {
-      "size": "1024x1024",
-      "filename": "1024.png",
-      "expected-size": "1024",
-      "idiom": "ios-marketing",
-      "folder": "Images.xcassets/AppIconBlack.appiconset/",
-      "scale": "1x"
+  "images" : [
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-60x60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-60x60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-20x20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-76x76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "ItunesArtwork@2x.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
-  ]
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
 }