Skip to content

Commit 2e0c647

Browse files
mickael-menumickael-menu
authored
2.3.0 (#45)
1 parent 712a723 commit 2e0c647

File tree

11 files changed

+34
-22
lines changed

11 files changed

+34
-22
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
.swiftpm/
77
Package.resolved
88

9+
# Carthage
10+
Carthage/
11+
Cartfile.resolved
912

1013
# Xcode
1114

‎CHANGELOG.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file. Take a look
44

55
**Warning:** Features marked as *alpha* may change or be removed in a future release without notice. Use with caution.
66

7-
## [Unreleased]
7+
<!--## [Unreleased]-->
8+
9+
## [2.3.0]
810

911
### Added
1012

@@ -421,4 +423,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress
421423

422424

423425
[unreleased]: https://github.com/readium/swift-toolkit/compare/main...HEAD
424-
[2.2.1]: https://github.com/readium/swift-kotlin/compare/2.2.0...2.2.1
426+
[2.3.0]: https://github.com/readium/swift-toolkit/compare/2.2.0...2.3.0

‎README.md

+9-6
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ If you're stuck, find more information at [developer.apple.com](https://develope
3333
Add the following to your `Cartfile`:
3434

3535
```
36-
github "readium/swift-toolkit" ~> 2.2.0
36+
github "readium/swift-toolkit" ~> 2.3.0
3737
```
3838

3939
Then, [follow the usual Carthage steps](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) to add the Readium libraries to your project.
@@ -59,11 +59,14 @@ Refer to the following table to know which dependencies are required for each Re
5959
Add the following `pod` statements to your `Podfile` for the Readium libraries you want to use:
6060

6161
```
62-
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumShared.podspec'
63-
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumStreamer.podspec'
64-
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumNavigator.podspec'
65-
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumOPDS.podspec'
66-
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumLCP.podspec'
62+
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumShared.podspec'
63+
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumStreamer.podspec'
64+
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumNavigator.podspec'
65+
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumOPDS.podspec'
66+
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumLCP.podspec'
67+
68+
# Required if you use R2Streamer.
69+
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
6770
```
6871

6972
Take a look at [CocoaPods's documentation](https://guides.cocoapods.org/using/using-cocoapods.html) for more information.

‎Support/CocoaPods/ReadiumLCP.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22

33
s.name = "ReadiumLCP"
4-
s.version = "2.2.0"
4+
s.version = "2.3.0"
55
s.license = "BSD 3-Clause License"
66
s.summary = "Readium LCP"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
1010
s.requires_arc = true
1111
s.resources = [
1212
'Sources/LCP/Resources/**',

‎Support/CocoaPods/ReadiumNavigator.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22

33
s.name = "R2Navigator"
4-
s.version = "2.2.0"
4+
s.version = "2.3.0"
55
s.license = "BSD 3-Clause License"
66
s.summary = "R2 Navigator"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
1010
s.requires_arc = true
1111
s.resources = ['Sources/Navigator/Resources/**', 'Sources/Navigator/EPUB/Assets']
1212
s.source_files = "Sources/Navigator/**/*.{m,h,swift}"

‎Support/CocoaPods/ReadiumOPDS.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22

33
s.name = "ReadiumOPDS"
4-
s.version = "2.2.0"
4+
s.version = "2.3.0"
55
s.license = "BSD 3-Clause License"
66
s.summary = "Readium OPDS"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
1010
s.requires_arc = true
1111
s.resources = ['Sources/OPDS/Resources/**']
1212
s.source_files = "Sources/OPDS/**/*.{m,h,swift}"

‎Support/CocoaPods/ReadiumShared.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'R2Shared'
4-
s.version = '2.2.0'
4+
s.version = '2.3.0'
55
s.license = 'BSD 3-Clause License'
66
s.summary = 'R2 Shared'
77
s.homepage = 'http://readium.github.io'
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => 'https://github.com/readium/swift-toolkit.git', :branch => "develop" }
9+
s.source = { :git => 'https://github.com/readium/swift-toolkit.git', :tag => "2.3.0" }
1010
s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
1111
s.requires_arc = true
1212
s.resources = ['Sources/Shared/Resources/**']

‎Support/CocoaPods/ReadiumStreamer.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Pod::Spec.new do |s|
22

33
s.name = "R2Streamer"
4-
s.version = "2.2.0"
4+
s.version = "2.3.0"
55
s.license = "BSD 3-Clause License"
66
s.summary = "R2 Streamer"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
1010
s.requires_arc = true
1111
s.resources = ['Sources/Streamer/Resources/**', 'Sources/Streamer/Assets']
1212
s.source_files = "Sources/Streamer/**/*.{m,h,swift}"

‎TestApp/Integrations/CocoaPods/Podfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ target 'TestApp' do
99
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumNavigator.podspec'
1010
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumOPDS.podspec'
1111

12+
# Required for R2Streamer.
1213
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
14+
1315
pod 'GRDB.swift'
1416
pod 'Kingfisher'
1517
pod 'MBProgressHUD'
@@ -23,4 +25,4 @@ post_install do |installer|
2325
config.build_settings['ENABLE_BITCODE'] = 'NO'
2426
end
2527
end
26-
end
28+
end

‎TestApp/Integrations/CocoaPods/Podfile+lcp

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ target 'TestApp' do
1111
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumLCP.podspec'
1212
pod 'R2LCPClient', podspec: 'LCP_URL'
1313

14+
# Required for R2Streamer.
1415
pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
16+
1517
pod 'GRDB.swift'
1618
pod 'Kingfisher'
1719
pod 'MBProgressHUD'
@@ -25,4 +27,4 @@ post_install do |installer|
2527
config.build_settings['ENABLE_BITCODE'] = 'NO'
2628
end
2729
end
28-
end
30+
end

‎TestApp/Sources/Library/LibraryService.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ final class LibraryService: Loggable {
143143
.flatMap { self.fulfillIfNeeded($0) }
144144
.flatMap { url in
145145
self.openPublication(at: url, allowUserInteraction: false, sender: sender).flatMap { pub, mediaType in
146-
self.moveToDocuments(from: url, title: pub.metadata.title, mediaType: mediaType).flatMap { url in
147-
self.importCover(of: pub).flatMap { coverPath in
146+
self.importCover(of: pub).flatMap { coverPath in
147+
self.moveToDocuments(from: url, title: pub.metadata.title, mediaType: mediaType).flatMap { url in
148148
self.insertBook(at: url, publication: pub, mediaType: mediaType, coverPath: coverPath)
149149
}
150150
}

0 commit comments

Comments
 (0)