diff --git a/Cartfile b/Cartfile index adf87b40a..4bc7fc5b7 100644 --- a/Cartfile +++ b/Cartfile @@ -1,8 +1,8 @@ -github "cezheng/Fuzi" ~> 3.1.3 +github "cezheng/Fuzi" ~> 3.1.0 github "dexman/Minizip" ~> 1.4.0 -github "krzyzanowskim/CryptoSwift" == 1.5.1 # From 1.6.0, the build fails in GitHub actions +github "krzyzanowskim/CryptoSwift" ~> 1.8.0 github "ra1028/DifferenceKit" ~> 1.3.0 github "readium/GCDWebServer" ~> 4.0.0 -github "scinfu/SwiftSoup" == 2.5.3 # 2.6.0 requires Xcode 14 -github "stephencelis/SQLite.swift" ~> 0.15.3 -github "weichsel/ZIPFoundation" == 0.9.11 # 0.9.12 requires iOS 12+ +github "scinfu/SwiftSoup" ~> 2.7.0 +github "stephencelis/SQLite.swift" ~> 0.15.0 +github "weichsel/ZIPFoundation" ~> 0.9.0 diff --git a/Package.swift b/Package.swift index 70fe5fdef..d793deb4f 100644 --- a/Package.swift +++ b/Package.swift @@ -23,17 +23,14 @@ let package = Package( .library(name: "ReadiumAdapterLCPSQLite", targets: ["ReadiumAdapterLCPSQLite"]), ], dependencies: [ - .package(url: "https://github.com/cezheng/Fuzi.git", from: "3.1.3"), - // From 1.6.0, the build fails in GitHub actions with Carthage - .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", "1.5.1" ..< "1.6.0"), - .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.2"), + .package(url: "https://github.com/cezheng/Fuzi.git", from: "3.1.0"), + .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.8.0"), + .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.0"), .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.3.0"), .package(url: "https://github.com/readium/GCDWebServer.git", from: "4.0.0"), - // From 2.6.0, Xcode 14 is required - .package(url: "https://github.com/scinfu/SwiftSoup.git", "2.5.3" ..< "2.6.0"), - .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.3"), - // 0.9.12 requires iOS 12+ - .package(url: "https://github.com/weichsel/ZIPFoundation.git", "0.9.0" ..< "0.9.12"), + .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.7.0"), + .package(url: "https://github.com/stephencelis/SQLite.swift.git", from: "0.15.0"), + .package(url: "https://github.com/weichsel/ZIPFoundation.git", from: "0.9.0"), ], targets: [ .target( diff --git a/Support/CocoaPods/ReadiumAdapterLCPSQLite.podspec b/Support/CocoaPods/ReadiumAdapterLCPSQLite.podspec index 95f69b96c..261290bb2 100644 --- a/Support/CocoaPods/ReadiumAdapterLCPSQLite.podspec +++ b/Support/CocoaPods/ReadiumAdapterLCPSQLite.podspec @@ -13,7 +13,8 @@ Pod::Spec.new do |s| s.ios.deployment_target = "13.0" s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } + s.dependency 'ReadiumLCP' s.dependency 'ReadiumShared' - s.dependency 'SQLite.swift', '~> 0.15.3' + s.dependency 'SQLite.swift', '~> 0.15.0' end diff --git a/Support/CocoaPods/ReadiumLCP.podspec b/Support/CocoaPods/ReadiumLCP.podspec index 7f930aaeb..ba98205fb 100644 --- a/Support/CocoaPods/ReadiumLCP.podspec +++ b/Support/CocoaPods/ReadiumLCP.podspec @@ -21,6 +21,6 @@ Pod::Spec.new do |s| s.dependency 'ReadiumShared' s.dependency 'ReadiumInternal' - s.dependency 'ZIPFoundation', '<= 0.9.11' # 0.9.12 requires iOS 12+ - s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions with Carthage + s.dependency 'ZIPFoundation', '~> 0.9.0' + s.dependency 'CryptoSwift', '~> 1.8.0' end diff --git a/Support/CocoaPods/ReadiumNavigator.podspec b/Support/CocoaPods/ReadiumNavigator.podspec index 0a8d88317..1823b54e8 100644 --- a/Support/CocoaPods/ReadiumNavigator.podspec +++ b/Support/CocoaPods/ReadiumNavigator.podspec @@ -20,6 +20,6 @@ Pod::Spec.new do |s| s.dependency 'ReadiumShared' s.dependency 'ReadiumInternal' s.dependency 'DifferenceKit', '~> 1.0' - s.dependency 'SwiftSoup', '<= 2.5.3' # From 2.6.0, Xcode 14 is required + s.dependency 'SwiftSoup', '~> 2.7.0' end diff --git a/Support/CocoaPods/ReadiumOPDS.podspec b/Support/CocoaPods/ReadiumOPDS.podspec index 00bc8209e..5dda011d0 100644 --- a/Support/CocoaPods/ReadiumOPDS.podspec +++ b/Support/CocoaPods/ReadiumOPDS.podspec @@ -18,6 +18,6 @@ Pod::Spec.new do |s| s.dependency 'ReadiumShared' s.dependency 'ReadiumInternal' - s.dependency 'Fuzi', '~> 3.0' + s.dependency 'Fuzi', '~> 3.1.0' end diff --git a/Support/CocoaPods/ReadiumShared.podspec b/Support/CocoaPods/ReadiumShared.podspec index a49fb4030..869c62e22 100644 --- a/Support/CocoaPods/ReadiumShared.podspec +++ b/Support/CocoaPods/ReadiumShared.podspec @@ -19,9 +19,9 @@ Pod::Spec.new do |s| s.libraries = "xml2" s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } - s.dependency 'Fuzi', '~> 3.0' - s.dependency 'Minizip', '~> 1.0' - s.dependency 'SwiftSoup', '<= 2.5.3' # From 2.6.0, Xcode 14 is required + s.dependency 'Fuzi', '~> 3.1.0' + s.dependency 'Minizip', '~> 1.4.0' + s.dependency 'SwiftSoup', '~> 2.7.0' s.dependency 'ReadiumInternal' end diff --git a/Support/CocoaPods/ReadiumStreamer.podspec b/Support/CocoaPods/ReadiumStreamer.podspec index 3dd3ef117..bc31251b5 100644 --- a/Support/CocoaPods/ReadiumStreamer.podspec +++ b/Support/CocoaPods/ReadiumStreamer.podspec @@ -22,9 +22,9 @@ Pod::Spec.new do |s| s.dependency 'ReadiumShared' s.dependency 'ReadiumInternal' - s.dependency 'CryptoSwift', '<= 1.5.1' # From 1.6.0, the build fails in GitHub actions - s.dependency 'Fuzi', '~> 3.0' + s.dependency 'CryptoSwift', '~> 1.8.0' + s.dependency 'Fuzi', '~> 3.1.0' s.dependency 'ReadiumGCDWebServer', '~> 4.0.0' - s.dependency 'Minizip', '~> 1.0' + s.dependency 'Minizip', '~> 1.4.0' end