Upgrade dependencies and fix build with Carthage / Xcode 12

.travis.yml

@@ -1,6 +1,6 @@
 
 language: swift
-osx_image: xcode11
+osx_image: xcode12.2
 xcode_project: r2-testapp-swift.xcodeproj
 xcode_scheme: 'r2-testapp-swift (carthage)'
 xcode_destination: platform=iOS Simulator,OS=11.3,name=iPhone X
@@ -18,7 +18,7 @@ cache:
 before_install:
   - brew update
   - brew outdated carthage || brew upgrade carthage
-  - carthage bootstrap --verbose --no-use-binaries --platform iOS --cache-builds
+  - carthage bootstrap --verbose --no-use-binaries --use-xcframeworks --platform iOS --cache-builds
 
 script:
   - xcodebuild clean build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO -quiet

Cartfile

@@ -1,14 +1,14 @@
-github "onevcat/Kingfisher" == 5.15.6
+github "onevcat/Kingfisher" == 5.15.8
 github "weichsel/ZIPFoundation" == 0.9.11
 github "jdg/MBProgressHUD" == 1.2.0
 github "stephencelis/SQLite.swift" == 0.12.2
 github "edrlab/GCDWebServer" == 3.6.3
-github "krzyzanowskim/CryptoSwift" == 1.3.2
-github "cezheng/Fuzi" == 3.1.2
+github "krzyzanowskim/CryptoSwift" == 1.3.8
+github "cezheng/Fuzi" == 3.1.3
 github "dexman/Minizip" == 1.4.0
 github "scinfu/SwiftSoup" == 2.3.2
 
-github "readium/r2-shared-swift" == 2.0.0-beta.1
-github "readium/r2-streamer-swift" == 2.0.0-beta.1
-github "readium/r2-navigator-swift" == 2.0.0-beta.1
-github "readium/readium-opds-swift" == 2.0.0-beta.1
+github "readium/r2-shared-swift" "develop"
+github "readium/r2-streamer-swift" "develop"
+github "readium/r2-navigator-swift" "develop"
+github "readium/readium-opds-swift" "develop"

Cartfile.resolved

@@ -1,13 +1,13 @@
-github "cezheng/Fuzi" "3.1.2"
+github "cezheng/Fuzi" "3.1.3"
 github "dexman/Minizip" "1.4.0"
 github "edrlab/GCDWebServer" "3.6.3"
 github "jdg/MBProgressHUD" "1.2.0"
-github "krzyzanowskim/CryptoSwift" "1.3.2"
-github "onevcat/Kingfisher" "5.15.6"
-github "readium/r2-navigator-swift" "2.0.0-beta.1"
-github "readium/r2-shared-swift" "2.0.0-beta.1"
-github "readium/r2-streamer-swift" "2.0.0-beta.1"
-github "readium/readium-opds-swift" "2.0.0-beta.1"
+github "krzyzanowskim/CryptoSwift" "1.3.8"
+github "onevcat/Kingfisher" "5.15.8"
+github "readium/r2-navigator-swift" "f9c268da74b3ae8f387af3dffbd1589b4641b16e"
+github "readium/r2-shared-swift" "8065a61e72b46214a71f7128c8ce1594fc30c85d"
+github "readium/r2-streamer-swift" "fb255154c32751b33727d668953ac26cdc77efbf"
+github "readium/readium-opds-swift" "fc42209e930c7c40884c0c90b25dc9e9aaefb95f"
 github "scinfu/SwiftSoup" "2.3.2"
 github "stephencelis/SQLite.swift" "0.12.2"
 github "weichsel/ZIPFoundation" "0.9.11"

README.md

@@ -1,6 +1,6 @@
 # Readium Mobile Test App (Swift/iOS)
 
-A test app for the Swift implementation of Readium-2. Stable builds are [published on TestFlight](https://testflight.apple.com/join/lYEMEfBr).
+A test app for the Swift implementation of Readium 2. Stable builds are [published on TestFlight](https://testflight.apple.com/join/lYEMEfBr).
 
 Follow the project on [ZenHub](https://app.zenhub.com/workspace/o/readium/r2-testapp-swift/boards).
 
@@ -45,23 +45,17 @@ github "readium/readium-opds-swift" "develop"
 
 2) Fetch the dependencies using [Carthage](https://github.com/Carthage/Carthage) :
 
-`$> carthage update --platform ios`
+`$> carthage update --platform ios --use-xcframeworks`
 
-**Warning: Carthage can't build the dependencies with Xcode 12 at the moment. [See this issue for a workaround.](https://github.com/readium/r2-testapp-swift/issues/351)**
-
-3) Generate Carthage input/output filelist using [Carting](https://github.com/artemnovichkov/Carting) :
-
-`$> carting update`
-
-4) Open the Xcode project :
+3) Open the Xcode project :
 
 `$> open r2-testapp-swift.xcodeproj`
 
-5) Build the project target named `r2-testapp-swift (carthage)`.
+4) Build the project target named `r2-testapp-swift (carthage)`.
 
 **More build and dependency information can be found in [r2-workspace-swift](https://github.com/readium/r2-workspace-swift)**
 
-## [@Contributors] Efficient workflow for testing changes on Readium-2
+## [@Contributors] Efficient workflow for testing changes on Readium 2
 
 The release target `r2-testapp-swift` uses the libraries and frameworks built by **Carthage**, while the debug `r2-testapp-swift-DEBUG` can be modified to use local versions of  **r2-shared-swift**, **r2-streamer-swift** and **r2-navigator-swift** depending of which you want to modify. Doing so will allow you to see the changes directly in the testapp, without the need for a Carthage cycle.