Unverified Commit 84473316 authored by Samuel Giddins's avatar Samuel Giddins

Merge pull request #5436 from naoty/license-in-acknowledgements

This pull request adds a license, such as `MIT` or `Commercial`, to
generated `Pods-{Project}-acknowledgements.plist`. I send this PR
because I want to filter some licenses by their types. It is useful to
show licenses only for open libraries, not private libraries.
parents 09fc1d45 3de89fa6
......@@ -49,6 +49,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[benasher44](https://github.com/benasher44)
[#4203](https://github.com/CocoaPods/CocoaPods/issues/4203)
* Add a license type to generated acknowledgements file in plist.
[Naoto Kaneko](https://github.com/naoty)
[#5436](https://github.com/CocoaPods/CocoaPods/pull/5436)
##### Bug Fixes
* Fix local pod platform conflict error message.
......
......@@ -37,6 +37,7 @@ module Pod
:Type => 'PSGroupSpecifier',
:Title => sanitize_encoding(spec.name),
:FooterText => sanitize_encoding(license),
:License => sanitize_encoding(spec.license[:type]),
}
end
end
......
Subproject commit 80dd96be49b786594986f612476c3342c54f2f71
Subproject commit aee8d0d431513c9a2bfa7d96d4c365966d8e6775
......@@ -8,6 +8,7 @@ describe Pod::Generator::Plist do
@spec = @file_accessor.spec
@generator = Pod::Generator::Plist.new([@file_accessor])
@spec.stubs(:name).returns('POD_NAME')
@spec.stubs(:license).returns(:type => 'MIT')
@generator.stubs(:license_text).returns('LICENSE_TEXT')
end
......@@ -24,6 +25,7 @@ describe Pod::Generator::Plist do
:Type => 'PSGroupSpecifier',
:Title => 'POD_NAME',
:FooterText => 'LICENSE_TEXT',
:License => 'MIT',
}
end
......@@ -34,6 +36,7 @@ describe Pod::Generator::Plist do
:Type => 'PSGroupSpecifier',
:Title => 'POD_NAME',
:FooterText => license_text,
:License => 'MIT',
}
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