diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b9c45a..96cb62d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,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.1.0] ### Added @@ -85,3 +87,4 @@ All notable changes to this project will be documented in this file. [2.0.0-beta.1]: https://github.com/readium/r2-streamer-swift/compare/2.0.0-alpha.2...2.0.0-beta.1 [2.0.0-beta.2]: https://github.com/readium/r2-streamer-swift/compare/2.0.0-beta.1...2.0.0-beta.2 [2.0.0]: https://github.com/readium/r2-streamer-swift/compare/2.0.0-beta.2...2.0.0 +[2.1.0]: https://github.com/readium/r2-streamer-swift/compare/2.0.0...2.1.0 diff --git a/Cartfile b/Cartfile index 359e8f7..c3f1432 100644 --- a/Cartfile +++ b/Cartfile @@ -2,4 +2,4 @@ github "cezheng/Fuzi" ~> 3.1.3 github "dexman/Minizip" ~> 1.4.0 github "krzyzanowskim/CryptoSwift" ~> 1.3.8 github "readium/GCDWebServer" ~> 3.6.3 -github "readium/r2-shared-swift" "develop" +github "readium/r2-shared-swift" ~> 2.1.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 8f896b2..4ffdec1 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -2,5 +2,5 @@ github "cezheng/Fuzi" "3.1.3" github "dexman/Minizip" "1.4.0" github "krzyzanowskim/CryptoSwift" "1.4.1" github "readium/GCDWebServer" "3.7.0" -github "readium/r2-shared-swift" "7e99bfb4f9a2428857620a9c5a69575e4e839c83" +github "readium/r2-shared-swift" "2.1.0" github "scinfu/SwiftSoup" "2.3.2" diff --git a/Package.resolved b/Package.resolved index 967f24d..0fc6b11 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git", "state": { "branch": null, - "revision": "4e31051c63cc0ddf10a25cf5318856c510cf77f4", - "version": "1.4.0" + "revision": "8d4f6384e0a8cc41f2005247241dd553963a492a", + "version": "1.4.1" } }, { @@ -32,9 +32,9 @@ "package": "r2-shared-swift", "repositoryURL": "https://github.com/readium/r2-shared-swift.git", "state": { - "branch": "develop", - "revision": "da74c212047c4616876b25a2993572dda888b949", - "version": null + "branch": null, + "revision": "f631efdb51ad6cb55fb173b4e80bbb1d1215fa76", + "version": "2.1.0" } }, { diff --git a/Package.swift b/Package.swift index 8b4d67d..9da33c9 100644 --- a/Package.swift +++ b/Package.swift @@ -19,7 +19,7 @@ let package = Package( .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.3.8"), .package(url: "https://github.com/marmelroy/Zip.git", from: "2.1.1"), .package(url: "https://github.com/readium/GCDWebServer.git", from: "3.7.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.1.0"), ], targets: [ .target( diff --git a/R2Streamer.podspec b/R2Streamer.podspec index 4209173..798bafc 100644 --- a/R2Streamer.podspec +++ b/R2Streamer.podspec @@ -1,20 +1,20 @@ Pod::Spec.new do |s| - s.name = "R2Streamer" - s.version = "2.0.0" - s.license = "BSD 3-Clause License" - s.summary = "R2 Streamer" - s.homepage = "http://readium.github.io" - s.author = { "Aferdita Muriqi" => "aferdita.muriqi@gmail.com" } - s.source = { :git => "https://github.com/readium/r2-streamer-swift.git", :branch => "develop" } + s.name = "R2Streamer" + s.version = "2.1.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/r2-streamer-swift.git', :tag => '2.1.0' } s.exclude_files = ["**/Info*.plist"] - s.requires_arc = true - s.resources = ['r2-streamer-swift/Resources/**', 'r2-streamer-swift/Assets'] + s.requires_arc = true + s.resources = ['r2-streamer-swift/Resources/**', 'r2-streamer-swift/Assets'] s.source_files = "r2-streamer-swift/**/*.{m,h,swift}" - s.platform = :ios + s.platform = :ios s.ios.deployment_target = "10.0" - s.libraries = 'z', 'xml2' - s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } + s.libraries = 'z', 'xml2' + s.xcconfig = { 'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2' } s.dependency 'R2Shared' s.dependency 'CryptoSwift', '~> 1.3.8'