2.3.0 (#45)

readium · Apr 21, 2022 · 2e0c647 · 2e0c647
1 parent 712a723
commit 2e0c647
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,9 @@
 .swiftpm/
 Package.resolved
 
+# Carthage
+Carthage/
+Cartfile.resolved
 
 # Xcode
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file. Take a look
 
 **Warning:** Features marked as *alpha* may change or be removed in a future release without notice. Use with caution.
 
-## [Unreleased]
+<!--## [Unreleased]-->
+
+## [2.3.0]
 
 ### Added
 
@@ -421,4 +423,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress
 
 
 [unreleased]: https://github.com/readium/swift-toolkit/compare/main...HEAD
-[2.2.1]: https://github.com/readium/swift-kotlin/compare/2.2.0...2.2.1
+[2.3.0]: https://github.com/readium/swift-toolkit/compare/2.2.0...2.3.0
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ If you're stuck, find more information at [developer.apple.com](https://develope
 Add the following to your `Cartfile`:
 
 ```
-github "readium/swift-toolkit" ~> 2.2.0
+github "readium/swift-toolkit" ~> 2.3.0
 ```
 
 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
 Add the following `pod` statements to your `Podfile` for the Readium libraries you want to use:
 
 ```
-pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumShared.podspec'
-pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumStreamer.podspec'
-pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumNavigator.podspec'
-pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumOPDS.podspec'
-pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.2.0/Support/CocoaPods/ReadiumLCP.podspec'
+pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumShared.podspec'
+pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumStreamer.podspec'
+pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumNavigator.podspec'
+pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumOPDS.podspec'
+pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.3.0/Support/CocoaPods/ReadiumLCP.podspec'
+
+# Required if you use R2Streamer.
+pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
 ```
 
 Take a look at [CocoaPods's documentation](https://guides.cocoapods.org/using/using-cocoapods.html) for more information.

diff --git a/Support/CocoaPods/ReadiumLCP.podspec b/Support/CocoaPods/ReadiumLCP.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "ReadiumLCP"
-  s.version       = "2.2.0"
+  s.version       = "2.3.0"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium LCP"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "contact@readium.org" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
   s.requires_arc  = true
   s.resources     = [
     'Sources/LCP/Resources/**',

diff --git a/Support/CocoaPods/ReadiumNavigator.podspec b/Support/CocoaPods/ReadiumNavigator.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "R2Navigator"
-  s.version       = "2.2.0"
+  s.version       = "2.3.0"
   s.license       = "BSD 3-Clause License"
   s.summary       = "R2 Navigator"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "contact@readium.org" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
   s.requires_arc  = true
   s.resources     = ['Sources/Navigator/Resources/**', 'Sources/Navigator/EPUB/Assets']
   s.source_files  = "Sources/Navigator/**/*.{m,h,swift}"

diff --git a/Support/CocoaPods/ReadiumOPDS.podspec b/Support/CocoaPods/ReadiumOPDS.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "ReadiumOPDS"
-  s.version       = "2.2.0"
+  s.version       = "2.3.0"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium OPDS"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "contact@readium.org" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
   s.requires_arc  = true
   s.resources     = ['Sources/OPDS/Resources/**']
   s.source_files  = "Sources/OPDS/**/*.{m,h,swift}"

diff --git a/Support/CocoaPods/ReadiumShared.podspec b/Support/CocoaPods/ReadiumShared.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name         = 'R2Shared'
-  s.version      = '2.2.0'
+  s.version      = '2.3.0'
   s.license      = 'BSD 3-Clause License'
   s.summary      = 'R2 Shared'
   s.homepage     = 'http://readium.github.io'
   s.author       = { "Readium" => "contact@readium.org" }
-  s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :branch => "develop" }
+  s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :tag => "2.3.0" }
   s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
   s.requires_arc = true
   s.resources    = ['Sources/Shared/Resources/**']

diff --git a/Support/CocoaPods/ReadiumStreamer.podspec b/Support/CocoaPods/ReadiumStreamer.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "R2Streamer"
-  s.version       = "2.2.0"
+  s.version       = "2.3.0"
   s.license       = "BSD 3-Clause License"
   s.summary       = "R2 Streamer"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "contact@readium.org" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :branch => "develop" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.3.0" }
   s.requires_arc  = true
   s.resources     = ['Sources/Streamer/Resources/**', 'Sources/Streamer/Assets']
   s.source_files  = "Sources/Streamer/**/*.{m,h,swift}"

diff --git a/TestApp/Integrations/CocoaPods/Podfile b/TestApp/Integrations/CocoaPods/Podfile
@@ -9,7 +9,9 @@ target 'TestApp' do
   pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumNavigator.podspec'
   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 'GRDB.swift'
   pod 'Kingfisher'
   pod 'MBProgressHUD'
@@ -23,4 +25,4 @@ post_install do |installer|
         config.build_settings['ENABLE_BITCODE'] = 'NO'
     end
   end
-end
+end
diff --git a/TestApp/Integrations/CocoaPods/Podfile+lcp b/TestApp/Integrations/CocoaPods/Podfile+lcp
@@ -11,7 +11,9 @@ target 'TestApp' do
   pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/VERSION/Support/CocoaPods/ReadiumLCP.podspec'
   pod 'R2LCPClient', podspec: 'LCP_URL'
 
+  # Required for R2Streamer.
   pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.6.3/GCDWebServer.podspec'
+
   pod 'GRDB.swift'
   pod 'Kingfisher'
   pod 'MBProgressHUD'
@@ -25,4 +27,4 @@ post_install do |installer|
         config.build_settings['ENABLE_BITCODE'] = 'NO'
     end
   end
-end
+end
diff --git a/TestApp/Sources/Library/LibraryService.swift b/TestApp/Sources/Library/LibraryService.swift
@@ -143,8 +143,8 @@ final class LibraryService: Loggable {
             .flatMap { self.fulfillIfNeeded($0) }
             .flatMap { url in
                 self.openPublication(at: url, allowUserInteraction: false, sender: sender).flatMap { pub, mediaType in
-                    self.moveToDocuments(from: url, title: pub.metadata.title, mediaType: mediaType).flatMap { url in
-                        self.importCover(of: pub).flatMap { coverPath in
+                    self.importCover(of: pub).flatMap { coverPath in
+                        self.moveToDocuments(from: url, title: pub.metadata.title, mediaType: mediaType).flatMap { url in
                             self.insertBook(at: url, publication: pub, mediaType: mediaType, coverPath: coverPath)
                         }
                     }