Fix build with Xcode 14 and Carthage / CocoaPods (#247)

Author: mickael-menu

.github/workflows/checks.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: macos-latest
     env:
       scheme: ${{ 'Readium-Package' }}
-      DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -25,6 +25,8 @@ All notable changes to this project will be documented in this file. Take a look
 
 ### Fixed
 
+* [#244](https://github.com/readium/swift-toolkit/issues/244) Fixed build with Xcode 14 and Carthage/CocoaPods.
+
 #### Navigator
 
 * Fixed memory leaks in the EPUB and PDF navigators.

Cartfile

@@ -1,8 +1,8 @@
 github "cezheng/Fuzi" ~> 3.1.3
 github "dexman/Minizip" ~> 1.4.0
 github "krzyzanowskim/CryptoSwift" ~> 1.3.8
-github "ra1028/DifferenceKit" ~> 1.2.0
-github "readium/GCDWebServer" ~> 3.6.3
-github "scinfu/SwiftSoup" ~> 2.3.2
-github "stephencelis/SQLite.swift" ~> 0.12.2
+github "ra1028/DifferenceKit" ~> 1.3.0
+github "readium/GCDWebServer" ~> 3.7.3
+github "scinfu/SwiftSoup" ~> 2.4.3
+github "stephencelis/SQLite.swift" ~> 0.13.3
 github "weichsel/ZIPFoundation" == 0.9.11 # 0.9.12 requires iOS 12+

Package.swift

@@ -21,11 +21,11 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/cezheng/Fuzi.git", from: "3.1.3"),
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.3.8"),
-        .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.1"),
-        .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.2.0"),
-        .package(url: "https://github.com/readium/GCDWebServer.git", from: "3.7.0"),
-        .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
-        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.12.2"),
+        .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"),
+        .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.3.0"),
+        .package(url: "https://github.com/readium/GCDWebServer.git", from: "3.7.3"),
+        .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.4.3"),
+        .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.13.3"),
         // 0.9.12 requires iOS 12+
         .package(url: "https://github.com/weichsel/ZIPFoundation.git", "0.9.0"..<"0.9.12"),
     ],

Sources/Shared/Publication/Services/Content/Iterators/HTMLResourceContentIterator.swift

@@ -154,7 +154,7 @@ public class HTMLResourceContentIterator: ContentIterator {
                             locator: baseLocator.copy(
                                 locations: {
                                     $0 = Locator.Locations(
-                                        otherLocations: ["cssSelector": try? elem.cssSelector()]
+                                        otherLocations: ["cssSelector": (try? elem.cssSelector()) as Any]
                                     )
                                 }
                             ),

Sources/Shared/Toolkit/Extensions/String.swift

@@ -61,7 +61,7 @@ extension String {
     }
 
     /// Same as `index(_,offsetBy:)` but without crashing when reaching the end of the string.
-    func clampedIndex(_ i: String.Index, offsetBy n: String.IndexDistance) -> String.Index {
+    func clampedIndex(_ i: String.Index, offsetBy n: Int) -> String.Index {
         precondition(n != 0)
         let limit = (n > 0) ? endIndex : startIndex
         guard let index = index(i, offsetBy: n, limitedBy: limit) else {

Support/CocoaPods/ReadiumLCP.podspec

@@ -22,6 +22,6 @@ Pod::Spec.new do |s|
   s.dependency 'R2Shared' 
 
   s.dependency 'ZIPFoundation', '<= 0.9.11' # 0.9.12 requires iOS 12+
-  s.dependency 'SQLite.swift', '~> 0.12.2'
+  s.dependency 'SQLite.swift', '~> 0.13'
   s.dependency 'CryptoSwift', '~> 1.3.8'
 end

Support/CocoaPods/ReadiumNavigator.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.platform      = :ios
   s.ios.deployment_target = "10.0"
   s.dependency 'R2Shared'
-  s.dependency 'DifferenceKit'
-  s.dependency 'SwiftSoup', '~> 2.3'
+  s.dependency 'DifferenceKit', '~> 1.0'
+  s.dependency 'SwiftSoup', '~> 2.0'
 
 end

Support/CocoaPods/ReadiumOPDS.podspec

@@ -17,6 +17,6 @@ Pod::Spec.new do |s|
   s.xcconfig      = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
 
   s.dependency 'R2Shared'
-  s.dependency 'Fuzi', '~> 3.1.3'
+  s.dependency 'Fuzi', '~> 3.0'
 
 end

Support/CocoaPods/ReadiumShared.podspec

@@ -19,8 +19,8 @@ Pod::Spec.new do |s|
   s.libraries =  'xml2'
   s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' }
 
-  s.dependency 'Fuzi', '~> 3.1.3'
-  s.dependency 'Minizip', '~> 1.0.0'
-  s.dependency 'SwiftSoup', '~> 2.3'
+  s.dependency 'Fuzi', '~> 3.0'
+  s.dependency 'Minizip', '~> 1.0'
+  s.dependency 'SwiftSoup', '~> 2.0'
 
 end