Merge pull request #1266 from NYPL-Simplified/release/simplye/3.6.2

Merge SimplyE 3.6.2 release

Cartfile

@@ -3,8 +3,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.j
 github "NYPL-Simplified/CardCreator-iOS" ~> 1.2
 github "NYPL-Simplified/NYPLAEToolkit" "master"
 github "NYPL-Simplified/NYPLAudiobookToolkit" "master"
-github "PureLayout/PureLayout" ~> 3.1.2
-github "TheLevelUp/ZXingObjC" ~> 3.3
-github "stephencelis/SQLite.swift" ~> 0.11.5
 github "NYPL-Simplified/PDFRendererProvider-iOS" "master"
 github "NYPL-Simplified/audiobook-ios-overdrive" "master"
+github "PureLayout/PureLayout" ~> 3.1.2
+github "stephencelis/SQLite.swift" ~> 0.11.5
+github "zxingify/zxingify-objc" ~> 3.6

Cartfile.resolved

@@ -1,10 +1,10 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "6.33.0"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "6.33.0"
-github "NYPL-Simplified/CardCreator-iOS" "v1.2"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "7.1.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "7.1.0"
+github "NYPL-Simplified/CardCreator-iOS" "v1.2.1"
 github "NYPL-Simplified/NYPLAEToolkit" "26beeab0fde7fe4112e105e012a688c68d806ae9"
-github "NYPL-Simplified/NYPLAudiobookToolkit" "9d6ac2918f8826464496211465913c971d9d84fa"
+github "NYPL-Simplified/NYPLAudiobookToolkit" "e8fc7450bec441d35c540d2e395222038fa5cef0"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "b0ee13aa74e0d88193a401c29624dda8120a340d"
-github "NYPL-Simplified/audiobook-ios-overdrive" "938e24d17da94b0b81400ef30c0dbdb7fa2cbfbd"
+github "NYPL-Simplified/audiobook-ios-overdrive" "26609934bd80ea1084c041d6f176b4c8ea331046"
 github "PureLayout/PureLayout" "v3.1.6"
-github "TheLevelUp/ZXingObjC" "3.6.4"
 github "stephencelis/SQLite.swift" "0.11.6"
+github "zxingify/zxingify-objc" "3.6.7"

OpenEbooks/OEImages.xcassets/Warning.imageset/Contents.json → OpenEbooks/OEImages.xcassets/BookmarkOff.imageset/Contents.json

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "ic_bookmark_border.png",
       "idiom" : "universal",
-      "filename" : "dialog-warning-2.png",
       "scale" : "1x"
     },
     {
+      "filename" : "ic_bookmark_border_2x.png",
       "idiom" : "universal",
-      "filename" : "dialog-warning-1.png",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_bookmark_border_3x.png",
       "idiom" : "universal",
-      "filename" : "dialog-warning.png",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

OpenEbooks/OEImages.xcassets/Check.imageset/Contents.json → OpenEbooks/OEImages.xcassets/BookmarkOn.imageset/Contents.json

@@ -1,21 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "ic_bookmark.png",
       "idiom" : "universal",
-      "filename" : "yes-check.png",
       "scale" : "1x"
     },
     {
+      "filename" : "ic_bookmark_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_bookmark_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

OpenEbooks/OEImages.xcassets/NYMap.imageset/Contents.json → OpenEbooks/OEImages.xcassets/Format.imageset/Contents.json

@@ -1,21 +1,23 @@
 {
   "images" : [
     {
+      "filename" : "ic_format_size.png",
       "idiom" : "universal",
-      "filename" : "NY-map-asset.png",
       "scale" : "1x"
     },
     {
+      "filename" : "ic_format_size_2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "ic_format_size_3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

OpenEbooks/OEImages.xcassets/Logo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Logo.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}