Do not generate UIRequiredDeviceCapabilities for tvOS info plists

parent 73ef2fdf
...@@ -14,6 +14,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -14,6 +14,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* Do not generate `UIRequiredDeviceCapabilities` for `tvOS` Info.plists.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6193](https://github.com/CocoaPods/CocoaPods/issues/6193)
* Fix integration with vendored static frameworks and libraries. * Fix integration with vendored static frameworks and libraries.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6477](https://github.com/CocoaPods/CocoaPods/pull/6477) [#6477](https://github.com/CocoaPods/CocoaPods/pull/6477)
......
...@@ -117,7 +117,6 @@ module Pod ...@@ -117,7 +117,6 @@ module Pod
info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl
info['CFBundleVersion'] = '1' if bundle_package_type == :bndl info['CFBundleVersion'] = '1' if bundle_package_type == :bndl
info['UIRequiredDeviceCapabilities'] = %w(arm64) if target.platform.name == :tvos
info info
end end
......
...@@ -59,7 +59,7 @@ module Pod ...@@ -59,7 +59,7 @@ module Pod
end if Executable.which('plutil') end if Executable.which('plutil')
it 'generates a correct Info.plist file' do it 'generates a correct Info.plist file' do
generator = Generator::InfoPlistFile.new(mock('Target', :platform => stub(:name => :ios))) generator = Generator::InfoPlistFile.new(mock('Target'))
file = temporary_directory + 'Info.plist' file = temporary_directory + 'Info.plist'
generator.save_as(file) generator.save_as(file)
Xcodeproj::Plist.read_from_path(file).should == { Xcodeproj::Plist.read_from_path(file).should == {
...@@ -76,15 +76,6 @@ module Pod ...@@ -76,15 +76,6 @@ module Pod
} }
end end
it 'adds UIRequiredDeviceCapabilities for tvOS targets' do
pod_target = fixture_pod_target('orange-framework/OrangeFramework.podspec')
pod_target.stubs(:platform).returns(Platform.new(:tvos, '9.0'))
generator = Generator::InfoPlistFile.new(pod_target)
file = temporary_directory + 'Info.plist'
generator.save_as(file)
Xcodeproj::Plist.read_from_path(file)['UIRequiredDeviceCapabilities'].should == %w(arm64)
end
it 'properly formats serialized arrays' do it 'properly formats serialized arrays' do
generator = Generator::InfoPlistFile.new(mock('Target')) generator = Generator::InfoPlistFile.new(mock('Target'))
generator.send(:to_plist, 'array' => %w(a b)).should == <<-PLIST generator.send(:to_plist, 'array' => %w(a b)).should == <<-PLIST
...@@ -103,7 +94,7 @@ module Pod ...@@ -103,7 +94,7 @@ module Pod
end end
it 'uses the specified bundle_package_type' do it 'uses the specified bundle_package_type' do
target = mock('Target', :platform => stub(:name => :ios)) target = mock('Target')
generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl) generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl)
file = temporary_directory + 'Info.plist' file = temporary_directory + 'Info.plist'
generator.save_as(file) generator.save_as(file)
...@@ -111,7 +102,7 @@ module Pod ...@@ -111,7 +102,7 @@ module Pod
end end
it 'does not include a CFBundleExecutable for bundles' do it 'does not include a CFBundleExecutable for bundles' do
target = mock('Target', :platform => stub(:name => :ios)) target = mock('Target')
generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl) generator = Generator::InfoPlistFile.new(target, :bundle_package_type => :bndl)
file = temporary_directory + 'Info.plist' file = temporary_directory + 'Info.plist'
generator.save_as(file) generator.save_as(file)
......
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