Commit 1549838e authored by Fabio Pelosin's avatar Fabio Pelosin

Merge pull request #531 from xslim/master

Forcing UTF-8 encoding on licenses generation. Fixes #530
parents 0360ab89 c9fcab20
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
- In certain conditions pod setup would execute twice. - In certain conditions pod setup would execute twice.
- The git cache now is updated if a branch is not found - The git cache now is updated if a branch is not found
[#514](https://github.com/CocoaPods/CocoaPods/issues/514) [#514](https://github.com/CocoaPods/CocoaPods/issues/514)
- Forcing UTF-8 encoding on licenses generation in Ruby 1.9.
[#530](https://github.com/CocoaPods/CocoaPods/issues/530)
## 0.14.0 ## 0.14.0
......
...@@ -28,6 +28,7 @@ module Pod ...@@ -28,6 +28,7 @@ module Pod
licenses_string = "#{title_from_string(header_title, 1)}\n#{header_text}\n" licenses_string = "#{title_from_string(header_title, 1)}\n#{header_text}\n"
@pods.each do |pod| @pods.each do |pod|
if (license = string_for_pod(pod)) if (license = string_for_pod(pod))
license = license.force_encoding("UTF-8") if license.respond_to?(:force_encoding)
licenses_string += license licenses_string += license
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment