Merge pull request #61 from readium/fixes/Xcode-11-swift-5.0.1

Xcode 11 swift 5.0.1

.travis.yml

@@ -1,5 +1,5 @@
 language: swift
-osx_image: xcode10.1
+osx_image: xcode11
 
 branches:
   only:

Cartfile

@@ -1,4 +1,4 @@
-github "readium/r2-shared-swift" == 1.3.4
-github "stephencelis/SQLite.swift" == 0.11.5
+github "readium/r2-shared-swift" == 1.4.0
+github "stephencelis/SQLite.swift" == 0.12.2
 github "krzyzanowskim/CryptoSwift" == 0.15.0
 github "weichsel/ZIPFoundation" == 0.9.8

Cartfile.resolved

@@ -1,4 +1,4 @@
 github "krzyzanowskim/CryptoSwift" "0.15.0"
-github "readium/r2-shared-swift" "1.3.4"
-github "stephencelis/SQLite.swift" "0.11.5"
+github "readium/r2-shared-swift" "1.4.0"
+github "stephencelis/SQLite.swift" "0.12.2"
 github "weichsel/ZIPFoundation" "0.9.8"

r2-lcp-swift.xcodeproj/project.pbxproj

@@ -476,7 +476,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -532,7 +532,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -568,7 +568,7 @@
 				PRODUCT_NAME = ReadiumLCP;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -600,7 +600,7 @@
 				PRODUCT_NAME = ReadiumLCP;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

readium-lcp-swift/License/License.swift

@@ -167,7 +167,7 @@ extension License: LCPLicense {
                 throw LCPError.licenseInteractionNotAvailable
             }
 
-            return Deferred<Void> { success, _ in present(url, success) }
+            return Deferred<Void> { success, _ in present(url, { success(()) }) }
                 .flatMap { _ in
                     // We fetch the Status Document again after the HTML interaction is done, in case it changed the License.
                     self.network.fetch(statusURL)