From ce50635a0d6699f2e279d1331f6bf7e236bf5f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Menu?= Date: Thu, 21 Sep 2023 21:37:53 +0200 Subject: [PATCH] 2.6.0 (#339) --- CHANGELOG.md | 5 ++++- README.md | 14 +++++++------- .../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 | 18 +++++++++--------- Support/CocoaPods/ReadiumStreamer.podspec | 4 ++-- 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2069cb700..438901911 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.0] * Support for Xcode 15. @@ -602,3 +604,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress [2.4.0]: https://github.com/readium/swift-toolkit/compare/2.3.0...2.4.0 [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 diff --git a/README.md b/README.md index da066523e..d2dbc72be 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.5.1 +github "readium/swift-toolkit" ~> 2.6.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. @@ -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.5.1/Support/CocoaPods/ReadiumShared.podspec' -pod 'R2Streamer', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.5.1/Support/CocoaPods/ReadiumStreamer.podspec' -pod 'R2Navigator', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.5.1/Support/CocoaPods/ReadiumNavigator.podspec' -pod 'ReadiumOPDS', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.5.1/Support/CocoaPods/ReadiumOPDS.podspec' -pod 'ReadiumLCP', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.5.1/Support/CocoaPods/ReadiumLCP.podspec' -pod 'ReadiumInternal', podspec: 'https://raw.githubusercontent.com/readium/swift-toolkit/2.5.1/Support/CocoaPods/ReadiumInternal.podspec' +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' # 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 50ad52be5..d058661ba 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.5.1" + s.version = "2.6.0" 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.0" } 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 cf14268d1..e8a0ddae4 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.5.1" + s.version = "2.6.0" 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.0" } 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 eb9439180..03bde3dc2 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.5.1" + s.version = "2.6.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.6.0" } s.requires_arc = true s.resource_bundles = { 'ReadiumLCP' => [ diff --git a/Support/CocoaPods/ReadiumNavigator.podspec b/Support/CocoaPods/ReadiumNavigator.podspec index 57a1925e5..798a25bd6 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.5.1" + s.version = "2.6.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.6.0" } s.requires_arc = true s.resource_bundles = { 'ReadiumNavigator' => [ diff --git a/Support/CocoaPods/ReadiumOPDS.podspec b/Support/CocoaPods/ReadiumOPDS.podspec index 7d5218d0b..8943cfbf6 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.5.1" + s.version = "2.6.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.6.0" } s.requires_arc = true s.resource_bundles = { 'ReadiumOPDS' => ['Sources/OPDS/Resources/**'], diff --git a/Support/CocoaPods/ReadiumShared.podspec b/Support/CocoaPods/ReadiumShared.podspec index 94b82bbf8..a6ff69908 100644 --- a/Support/CocoaPods/ReadiumShared.podspec +++ b/Support/CocoaPods/ReadiumShared.podspec @@ -1,22 +1,22 @@ Pod::Spec.new do |s| - s.name = 'R2Shared' - s.version = '2.5.1' - s.license = 'BSD 3-Clause License' - s.summary = 'R2 Shared' - s.homepage = 'http://readium.github.io' + s.name = "R2Shared" + s.version = "2.6.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.6.0" } s.exclude_files = ["Sources/Shared/Toolkit/Archive/ZIPFoundation.swift"] s.requires_arc = true s.resource_bundles = { - 'ReadiumShared' => ['Sources/Shared/Resources/**'], + "ReadiumShared" => ["Sources/Shared/Resources/**"], } s.source_files = "Sources/Shared/**/*.{m,h,swift}" s.platform = :ios s.ios.deployment_target = "11.0" - s.frameworks = 'CoreServices' - s.libraries = 'xml2' + s.frameworks = "CoreServices" + s.libraries = "xml2" s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } s.dependency 'Fuzi', '~> 3.0' diff --git a/Support/CocoaPods/ReadiumStreamer.podspec b/Support/CocoaPods/ReadiumStreamer.podspec index d00769165..945a859d3 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.5.1" + s.version = "2.6.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.6.0" } s.requires_arc = true s.resource_bundles = { 'ReadiumStreamer' => [