Skip to content

Commit 36f4151

Browse files
mickael-menumickael-menu
authored
2.7.4 (#506)
1 parent 5febe4c commit 36f4151

19 files changed

+36
-72
lines changed

‎.github/workflows/checks.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77

88
env:
99
platform: ${{ 'iOS Simulator' }}
10-
device: ${{ 'iPhone 12' }}
10+
device: ${{ 'iPhone 15' }}
1111
commit_sha: ${{ github.sha }}
12+
DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
1213

1314
jobs:
1415
build:
1516
name: Build
16-
runs-on: macos-12
17+
runs-on: macos-14
1718
if: ${{ !github.event.pull_request.draft }}
1819
env:
1920
scheme: ${{ 'Readium-Package' }}
20-
DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
2121

2222
steps:
2323
- name: Checkout
@@ -42,7 +42,7 @@ jobs:
4242
4343
lint:
4444
name: Lint
45-
runs-on: macos-12
45+
runs-on: macos-14
4646
if: ${{ !github.event.pull_request.draft }}
4747
env:
4848
scripts: ${{ 'Sources/Navigator/EPUB/Scripts' }}
@@ -76,7 +76,7 @@ jobs:
7676

7777
int-dev:
7878
name: Integration (Local)
79-
runs-on: macos-12
79+
runs-on: macos-14
8080
if: ${{ !github.event.pull_request.draft }}
8181
defaults:
8282
run:
@@ -98,7 +98,7 @@ jobs:
9898
9999
int-spm:
100100
name: Integration (Swift Package Manager)
101-
runs-on: macos-12
101+
runs-on: macos-14
102102
if: ${{ !github.event.pull_request.draft }}
103103
defaults:
104104
run:
@@ -126,7 +126,7 @@ jobs:
126126
127127
int-carthage:
128128
name: Integration (Carthage)
129-
runs-on: macos-12
129+
runs-on: macos-14
130130
if: ${{ !github.event.pull_request.draft }}
131131
defaults:
132132
run:
@@ -157,7 +157,7 @@ jobs:
157157
int-cocoapods:
158158
name: Integration (CocoaPods)
159159
if: github.event_name == 'push'
160-
runs-on: macos-12
160+
runs-on: macos-14
161161
defaults:
162162
run:
163163
working-directory: TestApp

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
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.7.4]
810

911
### Fixed
1012

@@ -704,3 +706,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress
704706
[2.7.1]: https://github.com/readium/swift-toolkit/compare/2.7.0...2.7.1
705707
[2.7.2]: https://github.com/readium/swift-toolkit/compare/2.7.1...2.7.2
706708
[2.7.3]: https://github.com/readium/swift-toolkit/compare/2.7.2...2.7.3
709+
[2.7.4]: https://github.com/readium/swift-toolkit/compare/2.7.3...2.7.4

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If you're stuck, find more information at [developer.apple.com](https://develope
4444
Add the following to your `Cartfile`:
4545

4646
```
47-
github "readium/swift-toolkit" ~> 2.7.3
47+
github "readium/swift-toolkit" ~> 2.7.4
4848
```
4949

5050
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
7171
Add the following `pod` statements to your `Podfile` for the Readium libraries you want to use:
7272

7373
```
74-
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumShared.podspec'
75-
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumStreamer.podspec'
76-
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumNavigator.podspec'
77-
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumOPDS.podspec'
78-
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumLCP.podspec'
79-
pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.3/Support/CocoaPods/ReadiumInternal.podspec'
74+
pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumShared.podspec'
75+
pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumStreamer.podspec'
76+
pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumNavigator.podspec'
77+
pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumOPDS.podspec'
78+
pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumLCP.podspec'
79+
pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.7.4/Support/CocoaPods/ReadiumInternal.podspec'
8080
pod 'Fuzi', podspec: 'https://raw.githubusercontent.com/readium/Fuzi/refs/heads/master/Fuzi.podspec'
8181
8282
# Required if you use R2Streamer.

‎Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec

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

33
s.name = "ReadiumAdapterGCDWebServer"
4-
s.version = "2.7.3"
4+
s.version = "2.7.4"
55
s.license = "BSD 3-Clause License"
66
s.summary = "Adapter to use GCDWebServer as an HTTP server in Readium"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.source_files = "Sources/Adapters/GCDWebServer/**/*.{m,h,swift}"
1212
s.platform = :ios

‎Support/CocoaPods/ReadiumInternal.podspec

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

33
s.name = "ReadiumInternal"
4-
s.version = "2.7.3"
4+
s.version = "2.7.4"
55
s.license = "BSD 3-Clause License"
66
s.summary = "Private utilities used by the Readium modules"
77
s.homepage = "http://readium.github.io"
88
s.author = { "Readium" => "[email protected]" }
9-
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.source_files = "Sources/Internal/**/*.{m,h,swift}"
1212
s.platform = :ios

‎Support/CocoaPods/ReadiumLCP.podspec

Lines changed: 2 additions & 2 deletions
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.7.3"
4+
s.version = "2.7.4"
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", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.resource_bundles = {
1212
'ReadiumLCP' => [

‎Support/CocoaPods/ReadiumNavigator.podspec

Lines changed: 2 additions & 2 deletions
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.7.3"
4+
s.version = "2.7.4"
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", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.resource_bundles = {
1212
'ReadiumNavigator' => [

‎Support/CocoaPods/ReadiumOPDS.podspec

Lines changed: 2 additions & 2 deletions
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.7.3"
4+
s.version = "2.7.4"
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", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.resource_bundles = {
1212
'ReadiumOPDS' => ['Sources/OPDS/Resources/**'],

‎Support/CocoaPods/ReadiumShared.podspec

Lines changed: 2 additions & 2 deletions
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.7.3"
4+
s.version = "2.7.4"
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', :tag => "2.7.3" }
9+
s.source = { :git => 'https://github.com/readium/swift-toolkit.git', :tag => "2.7.4" }
1010
s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"]
1111
s.requires_arc = true
1212
s.resource_bundles = {

‎Support/CocoaPods/ReadiumStreamer.podspec

Lines changed: 2 additions & 2 deletions
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.7.3"
4+
s.version = "2.7.4"
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", :tag => "2.7.3" }
9+
s.source = { :git => "https://github.com/readium/swift-toolkit.git", :tag => "2.7.4" }
1010
s.requires_arc = true
1111
s.resource_bundles = {
1212
'ReadiumStreamer' => [

‎TestApp/Sources/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,9 @@
228228
<key>CFBundlePackageType</key>
229229
<string>APPL</string>
230230
<key>CFBundleShortVersionString</key>
231-
<string>2.7.3</string>
231+
<string>2.7.4</string>
232232
<key>CFBundleVersion</key>
233-
<string>2.7.3</string>
233+
<string>2.7.4</string>
234234
<key>LSRequiresIPhoneOS</key>
235235
<true/>
236236
<key>LSSupportsOpeningDocumentsInPlace</key>

‎Tests/LCPTests/Content Protection/LCPDecryptorTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ class LCPDecryptorTests: XCTestCase {
7676
completionExpectation.fulfill()
7777
}
7878

79-
waitForExpectations(timeout: 10, handler: nil)
79+
waitForExpectations(timeout: 30, handler: nil)
8080
}
8181
}

‎Tests/StreamerTests/Parser/PublicationParsingTests.swift

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Documentation/Guides/Assets/settings-flow.svg renamed to ‎docs/Guides/Assets/settings-flow.svg

File renamed without changes.

‎Documentation/Guides/Content.md renamed to ‎docs/Guides/Content.md

File renamed without changes.

‎Documentation/Guides/EPUB Fonts.md renamed to ‎docs/Guides/EPUB Fonts.md

File renamed without changes.

‎Documentation/Guides/Navigator Preferences.md renamed to ‎docs/Guides/Navigator Preferences.md

File renamed without changes.

‎Documentation/Guides/TTS.md renamed to ‎docs/Guides/TTS.md

File renamed without changes.

‎Documentation/Migration Guide.md renamed to ‎docs/Migration Guide.md

File renamed without changes.

0 commit comments

Comments
 (0)