diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index def70bb..4b955cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,9 +2,9 @@ name: ReadiumLCP on: push: - branches: [ develop ] + branches: [ develop, master ] pull_request: - branches: [ develop ] + branches: [ develop, master ] jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index 87046c6..c4f2610 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ All notable changes to this project will be documented in this file. +## [2.1.1] + +### Fixed + +* Fix crash using the default `LCPDialogViewController` with CocoaPods. + + ## [2.1.0] ### Added @@ -86,3 +93,4 @@ All notable changes to this project will be documented in this file. [2.0.0-beta.2]: https://github.com/readium/r2-lcp-swift/compare/2.0.0-beta.1...2.0.0-beta.2 [2.0.0]: https://github.com/readium/r2-lcp-swift/compare/2.0.0-beta.2...2.0.0 [2.1.0]: https://github.com/readium/r2-lcp-swift/compare/2.0.0...2.1.0 +[2.1.1]: https://github.com/readium/r2-lcp-swift/compare/2.1.0...2.1.1 diff --git a/ReadiumLCP.podspec b/ReadiumLCP.podspec index cf192b7..ce5a10a 100644 --- a/ReadiumLCP.podspec +++ b/ReadiumLCP.podspec @@ -1,15 +1,18 @@ Pod::Spec.new do |s| s.name = "ReadiumLCP" - s.version = "2.1.0" + s.version = "2.1.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/r2-lcp-swift.git', :tag => '2.1.0' } + s.source = { :git => 'https://github.com/readium/r2-lcp-swift.git', :tag => '2.1.1' } s.exclude_files = ["**/Info*.plist"] s.requires_arc = true - s.resources = ['readium-lcp-swift/Resources/**'] + s.resources = [ + 'readium-lcp-swift/Resources/**', + 'readium-lcp-swift/**/*.xib' + ] s.source_files = "readium-lcp-swift/**/*.{m,h,swift}" s.platform = :ios s.ios.deployment_target = "10.0"