Swift 4, iPhone X support and Carthage fixes

.swift-version

@@ -1 +1 @@
-3.0
+4.0

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "tadija/AEXML" "4.0.0"
 github "ArtSabintsev/FontBlaster" "3.0.0"
-github "jessesquires/JSQWebViewController" "5.0.0"
-github "cxa/MenuItemKit" "2.0"
-github "alexpopov/ZFDragableModalTransition" "8da951efb4202385630d1cf7104b60d1208f807e"
 github "ZipArchive/ZipArchive" "v1.8.1"
+github "alexpopov/ZFDragableModalTransition" "8da951efb4202385630d1cf7104b60d1208f807e"
+github "cxa/MenuItemKit" "2.0"
+github "jessesquires/JSQWebViewController" "5.0.0"
 github "realm/realm-cocoa" "v3.0.2"
+github "tadija/AEXML" "4.0.0"

Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -55,6 +56,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/Example.xcodeproj/xcshareddata/xcschemes/MultipleInstance-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/Example.xcodeproj/xcshareddata/xcschemes/Storyboard-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Example/Podfile

@@ -8,8 +8,8 @@ def shared_pods
 end
 
 def testing_pods
-  pod 'Quick', '0.10.0'
-  pod 'Nimble', '~> 5.0.0' 
+  pod 'Quick', '1.2.0'
+  pod 'Nimble', '7.0.2' 
 end
 
 target 'Example' do

Example/Podfile.lock

@@ -1,46 +1,48 @@
 PODS:
-  - AEXML (4.0.0)
-  - FolioReaderKit (1.2.0):
-    - AEXML (= 4.0)
-    - FontBlaster (= 3.0.0)
-    - JSQWebViewController (~> 5.0)
-    - MenuItemKit (= 2.0)
+  - AEXML (4.2.2)
+  - FolioReaderKit (1.3.0):
+    - AEXML (= 4.2.2)
+    - FontBlaster (= 4.0.1)
+    - JSQWebViewController (= 6.0.0)
+    - MenuItemKit (= 3.0.0)
     - RealmSwift (= 3.0.2)
-    - SSZipArchive (~> 1.8)
-    - ZFDragableModalTransition (~> 0.6)
-  - FontBlaster (3.0.0)
-  - JSQWebViewController (5.0.0)
-  - MenuItemKit (2.0)
+    - SSZipArchive (= 2.1.1)
+    - ZFDragableModalTransition (= 0.6)
+  - FontBlaster (4.0.1)
+  - JSQWebViewController (6.0.0)
+  - MenuItemKit (3.0.0)
+  - Nimble (7.0.2)
+  - Quick (1.2.0)
   - Realm (3.0.2):
     - Realm/Headers (= 3.0.2)
   - Realm/Headers (3.0.2)
   - RealmSwift (3.0.2):
     - Realm (= 3.0.2)
-  - SSZipArchive (1.8.1)
+  - SSZipArchive (2.1.1)
   - ZFDragableModalTransition (0.6)
 
 DEPENDENCIES:
   - FolioReaderKit (from `../`)
-  - Nimble (~> 5.0.0)
-  - Quick (= 0.10.0)
+  - Nimble (= 7.0.2)
+  - Quick (= 1.2.0)
 
 EXTERNAL SOURCES:
   FolioReaderKit:
     :path: ../
 
 SPEC CHECKSUMS:
-  AEXML: 6fc6433aa35bdc15dd8eb8d54eb7aa4520a010eb
-  FolioReaderKit: 8aca75320da0de2164daa9c498bd2eed3c3cafd3
-  FontBlaster: 0f4a3e2f965968e2dfc3f7f5cec7214c3f3b2f07
-  JSQWebViewController: 0461aa42612b221571556df61d9c09f080cb2eef
-  MenuItemKit: 9af69953dc983803ee85230e205fadbac0f26213
-  Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
-  Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
+  AEXML: 5ebafc1b75e0bcf0f1b09b8ca8fed2d5a199479b
+  FolioReaderKit: f2a3a19c1041924974d68da48abd0463b6a8748a
+  FontBlaster: 84229df8e3a7a6dacb190565bc543747a0c323f9
+  JSQWebViewController: 51041569b75d19dbb6b7fe0b7ae053c32409a9be
+  MenuItemKit: d9b539b28fdbbd7980d6f3668b9cd6daefeabd9b
+  Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
+  Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
   Realm: 6f23fd1f178a09342eac21bfa7c2bf4312a7a180
   RealmSwift: 695393add1b8f9d5fa75dd16e6355cf3935f71e2
-  SSZipArchive: 04547dfa448be5ed7ecbaf7eaf8a6e9eb9b42997
+  SSZipArchive: 14401ade5f8e82aba1ff03e9f88e9de60937ae60
   ZFDragableModalTransition: 0d294eaaba6edfcb9839595de765f9ca06a4b524
 
-PODFILE CHECKSUM: 38a26e71a3566d844488629f70fa094d06893b23
+PODFILE CHECKSUM: d5e64429a71bc13b6eceb790b04656d8082e4d66
 
 COCOAPODS: 1.3.1

Example/Shared/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -97,6 +97,11 @@
       "idiom" : "ipad",
       "filename" : "Icon-iPadPro@2x.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

FolioReaderKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "FolioReaderKit"
-  s.version          = "1.2.0"
+  s.version          = "1.3.0"
   s.summary          = "A Swift ePub reader and parser framework for iOS."
   s.description  = <<-DESC
                    Written in Swift.
@@ -29,12 +29,12 @@ Pod::Spec.new do |s|
   s.public_header_files = 'Source/*.h'
 
   s.libraries  = "z"
-  s.dependency 'SSZipArchive', '~> 1.8'
-  s.dependency 'MenuItemKit', '2.0'
-  s.dependency 'ZFDragableModalTransition', '~> 0.6'
-  s.dependency 'AEXML', '4.0'
-  s.dependency 'FontBlaster', '3.0.0'
-  s.dependency 'JSQWebViewController', '~> 5.0'
+  s.dependency 'SSZipArchive', '2.1.1'
+  s.dependency 'MenuItemKit', '3.0.0'
+  s.dependency 'ZFDragableModalTransition', '0.6'
+  s.dependency 'AEXML', '4.2.2'
+  s.dependency 'FontBlaster', '4.0.1'
+  s.dependency 'JSQWebViewController', '6.0.0'
   s.dependency 'RealmSwift', '3.0.2'
 
 end