Skip to content

Fix build with Xcode 14 and Carthage / CocoaPods #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 23, 2022
Merged

Fix build with Xcode 14 and Carthage / CocoaPods #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdb9d54
Bump third-party dependencies
mickael-menu Sep 23, 2022
fe0b9a3
Fix build warnings
mickael-menu Sep 23, 2022
6dc6fdb
Update changelog
mickael-menu Sep 23, 2022
c55c08f
Fix build
mickael-menu Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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+
10 changes: 5 additions & 5 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
],
Expand Down
2 changes: 1 addition & 1 deletion Sources/Shared/Publication/Services/Content/Iterators/HTMLResourceContentIterator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
)
}
),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Shared/Toolkit/Extensions/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Support/CocoaPods/ReadiumLCP.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions Support/CocoaPods/ReadiumNavigator.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Support/CocoaPods/ReadiumOPDS.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions Support/CocoaPods/ReadiumShared.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions Support/CocoaPods/ReadiumStreamer.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Pod::Spec.new do |s|

s.dependency 'R2Shared'
s.dependency 'CryptoSwift', '~> 1.3.8'
s.dependency 'Fuzi', '~> 3.1.3'
s.dependency 'GCDWebServer', '~> 3.6.3'
s.dependency 'Minizip', '~> 1.0.0'
s.dependency 'Fuzi', '~> 3.0'
s.dependency 'GCDWebServer', '~> 3.0'
s.dependency 'Minizip', '~> 1.0'

end
2 changes: 1 addition & 1 deletion TestApp/Integrations/CocoaPods/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target 'TestApp' do
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumOPDS.podspec'

# Required for R2Streamer.
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'

pod 'GRDB.swift'
pod 'Kingfisher'
Expand Down
2 changes: 1 addition & 1 deletion TestApp/Integrations/CocoaPods/Podfile+lcp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target 'TestApp' do
pod 'R2LCPClient', podspec: 'LCP_URL'

# Required for R2Streamer.
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/master/GCDWebServer.podspec'

pod 'GRDB.swift'
pod 'Kingfisher'
Expand Down