Merge branch 'release/openebooks/2.5.1'

Author: ettore

.github/workflows/archive-and-upload.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Check Carthage version
         run: command -v carthage && carthage version
       - name: Checkout main repo
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
         with:
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Add Private Repo Auth
@@ -46,14 +46,16 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
     steps:
-      - name: Force Xcode 13.3.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+      - name: Check available Xcodes
+        run: ls -la /Applications | grep Xcode
+      - name: Force Xcode we use for development
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Install Firebase Tools
         run: npm install -g firebase-tools
       - name: Check Firebase Tools version
         run: command -v firebase && firebase --version
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -70,7 +72,7 @@ jobs:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
       - name: Checkout Adobe RMSDK
         if: needs.version-check.outputs.simplye_changed == '1'
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

.github/workflows/non-drm-build.yml

@@ -5,10 +5,12 @@ jobs:
   build:
     runs-on: macOS-12
     steps:
+      - name: Print System Info
+        run: uname -a
       - name: Check available Xcodes
-        run: ls -la /Applications
-      - name: Force Xcode 13.3.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
+        run: ls -la /Applications | grep Xcode
+      - name: Force Xcode we use for development
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Checkout main repo
         uses: actions/checkout@v2
       - name: Set up repo for nonDRM build

.github/workflows/unit-testing.yml

@@ -8,17 +8,19 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
     steps:
-      - name: Force Xcode 13.3.1
-        run: sudo xcode-select -switch /Applications/Xcode_13.1.app
       - name: Print System Info
         run: uname -a
+      - name: Check available Xcodes
+        run: ls -la /Applications | grep Xcode
+      - name: Force Xcode we use for development
+        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Checkout Adobe RMSDK
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

Axis-iOS

@@ -1,13 +1,13 @@
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "8.15.0"
-binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "8.15.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "9.4.0"
+binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "9.4.0"
 github "NYPL-Simplified/PDFRendererProvider-iOS" "d63e6ba168cb91617a4aca5e306a92af1dd4497c"
 github "cezheng/Fuzi" "3.1.3"
 github "dexman/Minizip" "1.4.0"
-github "krzyzanowskim/CryptoSwift" "1.4.3"
-github "ra1028/DifferenceKit" "1.2.0"
+github "krzyzanowskim/CryptoSwift" "1.5.1"
+github "ra1028/DifferenceKit" "1.3.0"
 github "readium/GCDWebServer" "3.7.1"
-github "readium/swift-toolkit" "213b4b212de1b7a2198a42b37387d0def3ec22a8"
-github "scinfu/SwiftSoup" "2.4.2"
+github "readium/swift-toolkit" "5278ddc4c12c69aa6c5946ed4a4e09c0ebf642e3"
+github "scinfu/SwiftSoup" "2.4.3"
 github "stephencelis/SQLite.swift" "0.12.2"
 github "weichsel/ZIPFoundation" "0.9.11"
 github "zxingify/zxingify-objc" "3.6.7"

CardCreator-iOS

@@ -389,7 +389,7 @@
 		118A0E201992B3FD00792DDE /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1330;
+				LastUpgradeCheck = 1340;
 				ORGANIZATIONNAME = Readium;
 			};
 			buildConfigurationList = 118A0E231992B3FD00792DDE /* Build configuration list for PBXProject "RDServices" */;
@@ -537,7 +537,7 @@
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -590,7 +590,7 @@
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
 				VALIDATE_PRODUCT = YES;

Cartfile.resolved

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1330"
+   LastUpgradeVersion = "1340"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"