diff --git a/CHANGELOG.md b/CHANGELOG.md index e69fc02..3bb2eab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,9 @@ All notable changes to this project will be documented in this file. **Warning:** Features marked as *alpha* may change or be removed in a future release without notice. Use with *caution. -## [Unreleased] + + +## [2.2.0] ### Added @@ -135,3 +137,4 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress [2.0.0-beta.2]: https://github.com/readium/r2-navigator-swift/compare/2.0.0-beta.1...2.0.0-beta.2 [2.0.0]: https://github.com/readium/r2-navigator-swift/compare/2.0.0-beta.2...2.0.0 [2.1.0]: https://github.com/readium/r2-navigator-swift/compare/2.0.0...2.1.0 +[2.2.0]: https://github.com/readium/r2-navigator-swift/compare/2.1.0...2.2.0 diff --git a/Cartfile b/Cartfile index 91af076..a7a7be3 100755 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,3 @@ github "ra1028/DifferenceKit" ~> 1.2.0 -github "readium/r2-shared-swift" "develop" +github "readium/r2-shared-swift" ~> 2.2.0 github "scinfu/SwiftSoup" ~> 2.3.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index 47bfa09..2b08927 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,5 +1,5 @@ github "cezheng/Fuzi" "3.1.3" github "dexman/Minizip" "1.4.0" github "ra1028/DifferenceKit" "1.2.0" -github "readium/r2-shared-swift" "7c66c3b7eb8711946b4fca4a1cce8f5ae0bc6bfe" -github "scinfu/SwiftSoup" "2.3.2" +github "readium/r2-shared-swift" "2.2.0" +github "scinfu/SwiftSoup" "2.3.3" diff --git a/Package.resolved b/Package.resolved index b1c5260..58e3864 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,6 +1,15 @@ { "object": { "pins": [ + { + "package": "DifferenceKit", + "repositoryURL": "https://github.com/ra1028/DifferenceKit.git", + "state": { + "branch": null, + "revision": "62745d7780deef4a023a792a1f8f763ec7bf9705", + "version": "1.2.0" + } + }, { "package": "Fuzi", "repositoryURL": "https://github.com/cezheng/Fuzi.git", @@ -14,9 +23,9 @@ "package": "r2-shared-swift", "repositoryURL": "https://github.com/readium/r2-shared-swift.git", "state": { - "branch": "develop", - "revision": "7c66c3b7eb8711946b4fca4a1cce8f5ae0bc6bfe", - "version": null + "branch": null, + "revision": "4c561d8a990e380ebde1e8c99aff9df992acb15b", + "version": "2.2.0" } }, { @@ -24,8 +33,8 @@ "repositoryURL": "https://github.com/scinfu/SwiftSoup.git", "state": { "branch": null, - "revision": "774dc9c7213085db8aa59595e27c1cd22e428904", - "version": "2.3.2" + "revision": "02c63b7be50bda384f22c56c64d347231754a07e", + "version": "2.3.3" } }, { diff --git a/Package.swift b/Package.swift index f2f9a1e..4ec251f 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/ra1028/DifferenceKit.git", from: "1.2.0"), - .package(url: "https://github.com/readium/r2-shared-swift.git", .branch("develop")), + .package(url: "https://github.com/readium/r2-shared-swift.git", from: "2.2.0"), .package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"), ], targets: [ diff --git a/R2Navigator.podspec b/R2Navigator.podspec index 4ad1b5e..847f0a5 100644 --- a/R2Navigator.podspec +++ b/R2Navigator.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "R2Navigator" - s.version = "2.1.0" + s.version = "2.2.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/r2-navigator-swift.git", :branch => "fix/js-ios12" } + s.source = { :git => "https://github.com/readium/r2-navigator-swift.git", :tag => "2.2.0" } s.exclude_files = ["**/Info*.plist"] s.requires_arc = true s.resources = ['r2-navigator-swift/Resources/**', 'r2-navigator-swift/EPUB/Assets']