From a62962bbb862a5852ce8f79c5369213f38c79e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Menu?= Date: Tue, 31 Oct 2023 14:54:29 +0100 Subject: [PATCH] 2.6.1 (#353) --- CHANGELOG.md | 5 ++++- README.md | 14 +++++++------- .../CocoaPods/ReadiumAdapterGCDWebServer.podspec | 4 ++-- Support/CocoaPods/ReadiumInternal.podspec | 4 ++-- Support/CocoaPods/ReadiumLCP.podspec | 4 ++-- Support/CocoaPods/ReadiumNavigator.podspec | 4 ++-- Support/CocoaPods/ReadiumOPDS.podspec | 4 ++-- Support/CocoaPods/ReadiumShared.podspec | 4 ++-- Support/CocoaPods/ReadiumStreamer.podspec | 4 ++-- TestApp/Sources/App/AppModule.swift | 2 +- TestApp/Sources/Info.plist | 4 ++-- 11 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba08bb87d..46f73cac4 100644 --- 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] + + +## [2.6.1] ### Added @@ -631,3 +633,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress [2.5.0]: https://github.com/readium/swift-toolkit/compare/2.4.0...2.5.0 [2.5.1]: https://github.com/readium/swift-toolkit/compare/2.5.0...2.5.1 [2.6.0]: https://github.com/readium/swift-toolkit/compare/2.5.1...2.6.0 +[2.6.1]: https://github.com/readium/swift-toolkit/compare/2.6.0...2.6.1 diff --git a/README.md b/README.md index d2dbc72be..3f8b1db56 100644 --- 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.6.0 +github "readium/swift-toolkit" ~> 2.6.1 ``` 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.6.0/Support/CocoaPods/ReadiumShared.podspec' -pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumStreamer.podspec' -pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumNavigator.podspec' -pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumOPDS.podspec' -pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumLCP.podspec' -pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.0/Support/CocoaPods/ReadiumInternal.podspec' +pod 'R2Shared', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumShared.podspec' +pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumStreamer.podspec' +pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumNavigator.podspec' +pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumOPDS.podspec' +pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumLCP.podspec' +pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.6.1/Support/CocoaPods/ReadiumInternal.podspec' # Required if you use R2Streamer. pod 'GCDWebServer', podspec: 'https://raw.githubusercontent.com/readium/GCDWebServer/3.7.4/GCDWebServer.podspec' diff --git a/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec b/Support/CocoaPods/ReadiumAdapterGCDWebServer.podspec index fa3afc17c..d3398dff0 100644 --- 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.6.0" + s.version = "2.6.1" 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" => "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.6.1" } 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 index 3999b38b7..e89f0cbbd 100644 --- 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.6.0" + s.version = "2.6.1" s.license = "BSD 3-Clause License" s.summary = "Private utilities used by the Readium modules" 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.6.1" } 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 index 4ca8b5974..b0d8c8c58 100644 --- 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.6.0" + s.version = "2.6.1" 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.6.1" } s.requires_arc = true s.resource_bundles = { 'ReadiumLCP' => [ diff --git a/Support/CocoaPods/ReadiumNavigator.podspec b/Support/CocoaPods/ReadiumNavigator.podspec index 0b2b783f8..d14ee37bb 100644 --- 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.6.0" + s.version = "2.6.1" 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.6.1" } s.requires_arc = true s.resource_bundles = { 'ReadiumNavigator' => [ diff --git a/Support/CocoaPods/ReadiumOPDS.podspec b/Support/CocoaPods/ReadiumOPDS.podspec index ca06007d4..c6479ba10 100644 --- 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.6.0" + s.version = "2.6.1" 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.6.1" } s.requires_arc = true s.resource_bundles = { 'ReadiumOPDS' => ['Sources/OPDS/Resources/**'], diff --git a/Support/CocoaPods/ReadiumShared.podspec b/Support/CocoaPods/ReadiumShared.podspec index aa49f3e25..98f0c1efa 100644 --- 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.6.0" + s.version = "2.6.1" 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.6.1" } 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 index 259c86d79..3d85b7125 100644 --- 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.6.0" + s.version = "2.6.1" 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.6.1" } s.requires_arc = true s.resource_bundles = { 'ReadiumStreamer' => [ diff --git a/TestApp/Sources/App/AppModule.swift b/TestApp/Sources/App/AppModule.swift index d62a6cb74..29d3cf32e 100644 --- a/TestApp/Sources/App/AppModule.swift +++ b/TestApp/Sources/App/AppModule.swift @@ -38,7 +38,7 @@ final class AppModule { opds = OPDSModule(delegate: self) // Set Readium 2's logging minimum level. - R2EnableLog(withMinimumSeverityLevel: .warning) + R2EnableLog(withMinimumSeverityLevel: .debug) } private(set) lazy var aboutViewController: UIViewController = { diff --git a/TestApp/Sources/Info.plist b/TestApp/Sources/Info.plist index a6f57474c..1574ded44 100644 --- a/TestApp/Sources/Info.plist +++ b/TestApp/Sources/Info.plist @@ -228,9 +228,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.6.0 + 2.6.1 CFBundleVersion - 2.6.0 + 2.6.1 LSRequiresIPhoneOS LSSupportsOpeningDocumentsInPlace