2.7.4 (#506)

readium · Nov 18, 2024 · 36f4151 · 36f4151
1 parent 5febe4c
commit 36f4151
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 72 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -7,17 +7,17 @@ on:
 
 env:
   platform: ${{ 'iOS Simulator' }}
-  device: ${{ 'iPhone 12' }}
+  device: ${{ 'iPhone 15' }}
   commit_sha: ${{ github.sha }}
+  DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
 
 jobs:
   build:
     name: Build
-    runs-on: macos-12
+    runs-on: macos-14
     if: ${{ !github.event.pull_request.draft }}
     env:
       scheme: ${{ 'Readium-Package' }}
-      DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
 
     steps:
       - name: Checkout
@@ -42,7 +42,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: macos-12
+    runs-on: macos-14
     if: ${{ !github.event.pull_request.draft }}
     env:
       scripts: ${{ 'Sources/Navigator/EPUB/Scripts' }}
@@ -76,7 +76,7 @@ jobs:
 
   int-dev:
     name: Integration (Local)
-    runs-on: macos-12
+    runs-on: macos-14
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -98,7 +98,7 @@ jobs:
 
   int-spm:
     name: Integration (Swift Package Manager)
-    runs-on: macos-12
+    runs-on: macos-14
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -126,7 +126,7 @@ jobs:
 
   int-carthage:
     name: Integration (Carthage)
-    runs-on: macos-12
+    runs-on: macos-14
     if: ${{ !github.event.pull_request.draft }}
     defaults:
       run:
@@ -157,7 +157,7 @@ jobs:
   int-cocoapods:
     name: Integration (CocoaPods)
     if: github.event_name == 'push'
-    runs-on: macos-12
+    runs-on: macos-14
     defaults:
       run:
         working-directory: TestApp

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.7.4]
 
 ### Fixed
 
@@ -704,3 +706,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress
 [2.7.1]: https://github.com/readium/swift-toolkit/compare/2.7.0...2.7.1
 [2.7.2]: https://github.com/readium/swift-toolkit/compare/2.7.1...2.7.2
 [2.7.3]: https://github.com/readium/swift-toolkit/compare/2.7.2...2.7.3
+[2.7.4]: https://github.com/readium/swift-toolkit/compare/2.7.3...2.7.4
diff --git a/README.md b/README.md
@@ -44,7 +44,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.7.3
+github "readium/swift-toolkit" ~> 2.7.4
 ```
 
 Then, [follow the usual Carthage steps](https://github.com/Carthage/Carthage#adding-frameworks-to-an-application) to add the Readium libraries to your project.
@@ -71,12 +71,12 @@ 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.7.3/Support/CocoaPods/ReadiumShared.podspec'
-pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumStreamer.podspec'
-pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumNavigator.podspec'
-pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumOPDS.podspec'
-pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumLCP.podspec'
-pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumInternal.podspec'
+pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumShared.podspec'
+pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumStreamer.podspec'
+pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumNavigator.podspec'
+pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumOPDS.podspec'
+pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumLCP.podspec'
+pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumInternal.podspec'
 pod 'Fuzi', podspec: 'https://raw.githubusercontent.com/readium/Fuzi/refs/heads/master/Fuzi.podspec'
 
 # Required if you use R2Streamer.

diff --git a/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec b/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "ReadiumAdapterGCDWebServer"
-  s.version       = "2.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Adapter to use GCDWebServer as an HTTP server in Readium"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.source_files  = "Sources/Adapters/GCDWebServer/**/*.{m,h,swift}"
   s.platform      = :ios

diff --git a/Support/CocoaPods/ReadiumInternal.podspec b/Support/CocoaPods/ReadiumInternal.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
 
   s.name          = "ReadiumInternal"
-  s.version       = "2.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Private utilities used by the Readium modules"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.source_files  = "Sources/Internal/**/*.{m,h,swift}"
   s.platform      = :ios

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.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium LCP"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.resource_bundles = {
     'ReadiumLCP' => [

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.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "R2 Navigator"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.resource_bundles = {
     'ReadiumNavigator' => [

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.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "Readium OPDS"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.resource_bundles = {
     'ReadiumOPDS' => ['Sources/OPDS/Resources/**'],

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.7.3"
+  s.version      = "2.7.4"
   s.license      = "BSD 3-Clause License"
   s.summary      = "R2 Shared"
   s.homepage     = "http://readium.github.io"
   s.author       = { "Readium" => "[email protected]" }
-  s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :tag => "2.7.3" }
+  s.source       = { :git => 'https://github.com/readium/swift-toolkit.git', :tag => "2.7.4" }
   s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
   s.requires_arc = true
   s.resource_bundles = {

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.7.3"
+  s.version       = "2.7.4"
   s.license       = "BSD 3-Clause License"
   s.summary       = "R2 Streamer"
   s.homepage      = "http://readium.github.io"
   s.author        = { "Readium" => "[email protected]" }
-  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
+  s.source        = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
   s.requires_arc  = true
   s.resource_bundles = {
     'ReadiumStreamer' => [

diff --git a/TestApp/Sources/Info.plist b/TestApp/Sources/Info.plist
@@ -228,9 +228,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.7.3</string>
+	<string>2.7.4</string>
 	<key>CFBundleVersion</key>
-	<string>2.7.3</string>
+	<string>2.7.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>LSSupportsOpeningDocumentsInPlace</key>

diff --git a/Tests/LCPTests/Content Protection/LCPDecryptorTests.swift b/Tests/LCPTests/Content Protection/LCPDecryptorTests.swift
@@ -76,6 +76,6 @@ class LCPDecryptorTests: XCTestCase {
             completionExpectation.fulfill()
         }
 
-        waitForExpectations(timeout: 10, handler: nil)
+        waitForExpectations(timeout: 30, handler: nil)
     }
 }
diff --git a/Tests/StreamerTests/Parser/PublicationParsingTests.swift b/Tests/StreamerTests/Parser/PublicationParsingTests.swift
diff --git a/...mentation/Guides/Assets/settings-flow.svg → docs/Guides/Assets/settings-flow.svg b/...mentation/Guides/Assets/settings-flow.svg → docs/Guides/Assets/settings-flow.svg
diff --git a/Documentation/Guides/Content.md → docs/Guides/Content.md b/Documentation/Guides/Content.md → docs/Guides/Content.md
diff --git a/Documentation/Guides/EPUB Fonts.md → docs/Guides/EPUB Fonts.md b/Documentation/Guides/EPUB Fonts.md → docs/Guides/EPUB Fonts.md
diff --git a/...mentation/Guides/Navigator Preferences.md → docs/Guides/Navigator Preferences.md b/...mentation/Guides/Navigator Preferences.md → docs/Guides/Navigator Preferences.md
diff --git a/Documentation/Guides/TTS.md → docs/Guides/TTS.md b/Documentation/Guides/TTS.md → docs/Guides/TTS.md
diff --git a/Documentation/Migration Guide.md → docs/Migration Guide.md b/Documentation/Migration Guide.md → docs/Migration Guide.md