Merge pull request #4539 from CocoaPods/seg-tvos-info-plist

[InfoPlistFile] Include UIRequiredDeviceCapabilities for tvOS pods

CHANGELOG.md

@@ -131,6 +131,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [Samuel Giddins](https://github.com/segiddins)
   [#4420](https://github.com/CocoaPods/CocoaPods/issues/4420)
 
+* The `UIRequiredDeviceCapabilities` key is now specified in the `Info.plist`
+  file for tvOS pods built as frameworks.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4514](https://github.com/CocoaPods/CocoaPods/issues/4514)
+
 
 ## 0.39.0 (2015-10-09)
 

lib/cocoapods/generator/info_plist_file.rb

@@ -51,14 +51,29 @@ module Pod
       # @return [String]
       #
       def generate
-        FILE_CONTENTS.sub('${CURRENT_PROJECT_VERSION_STRING}', target_version)
+        header + dict + footer
       end
 
-      FILE_CONTENTS = <<-EOS
+      private
+
+      def header
+        <<-PLIST
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+        PLIST
+      end
+
+      def footer
+        <<-PLIST
+</dict>
+</plist>
+        PLIST
+      end
+
+      def dict
+        dict = <<-PLIST
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
@@ -72,16 +87,26 @@ module Pod
   <key>CFBundlePackageType</key>
   <string>FMWK</string>
   <key>CFBundleShortVersionString</key>
-  <string>${CURRENT_PROJECT_VERSION_STRING}</string>
+  <string>#{target_version}</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>${CURRENT_PROJECT_VERSION}</string>
   <key>NSPrincipalClass</key>
   <string></string>
-</dict>
-</plist>
-      EOS
+        PLIST
+
+        if target.platform.name == :tvos
+          dict << <<-PLIST
+  <key>UIRequiredDeviceCapabilities</key>
+  <array>
+    <string>arm64</string>
+  </array>
+          PLIST
+        end
+
+        dict
+      end
     end
   end
 end

spec/unit/generator/info_plist_file_spec.rb

 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe Pod::Generator::InfoPlistFile do
-  describe '#target_version' do
-    it 'returns 1.0.0 for the aggregate target' do
-      generator = Pod::Generator::InfoPlistFile.new(fixture_aggregate_target)
-      generator.target_version.should == '1.0.0'
-    end
-
-    describe 'sanitization' do
-      before do
-        @root_spec = mock('RootSpec')
-        pod_target = stub('PodTarget', :root_spec => @root_spec)
-        @generator = Pod::Generator::InfoPlistFile.new(pod_target)
+module Pod
+  describe Generator::InfoPlistFile do
+    describe '#target_version' do
+      it 'returns 1.0.0 for the aggregate target' do
+        generator = Generator::InfoPlistFile.new(fixture_aggregate_target)
+        generator.target_version.should == '1.0.0'
       end
 
-      it 'handles when the version is HEAD' do
-        version = Pod::Version.new('0.2.0')
-        version.head = true
-        @root_spec.stubs(:version).returns(version)
-        @generator.target_version.should == '0.2.0'
-      end
+      describe 'sanitization' do
+        before do
+          @root_spec = mock('RootSpec')
+          @platform = stub('Platform', :name => :ios)
+          pod_target = stub('PodTarget', :root_spec => @root_spec, :platform => @platform)
+          @generator = Generator::InfoPlistFile.new(pod_target)
+        end
 
-      it 'handles when the version is more than 3 numeric parts' do
-        version = Pod::Version.new('0.2.0.1')
-        @root_spec.stubs(:version).returns(version)
-        @generator.target_version.should == '0.2.0'
-      end
+        it 'handles when the version is HEAD' do
+          version = Version.new('0.2.0')
+          version.head = true
+          @root_spec.stubs(:version).returns(version)
+          @generator.target_version.should == '0.2.0'
+        end
 
-      it 'handles when the version is less than 3 numeric parts' do
-        version = Pod::Version.new('0.2')
-        @root_spec.stubs(:version).returns(version)
-        @generator.target_version.should == '0.2.0'
-      end
+        it 'handles when the version is more than 3 numeric parts' do
+          version = Version.new('0.2.0.1')
+          @root_spec.stubs(:version).returns(version)
+          @generator.target_version.should == '0.2.0'
+        end
+
+        it 'handles when the version is less than 3 numeric parts' do
+          version = Version.new('0.2')
+          @root_spec.stubs(:version).returns(version)
+          @generator.target_version.should == '0.2.0'
+        end
+
+        it 'handles when the version is a pre-release' do
+          version = Version.new('1.0.0-beta.1')
+          @root_spec.stubs(:version).returns(version)
+          @generator.target_version.should == '1.0.0'
 
-      it 'handles when the version is a pre-release' do
-        version = Pod::Version.new('1.0.0-beta.1')
-        @root_spec.stubs(:version).returns(version)
-        @generator.target_version.should == '1.0.0'
+          version = Version.new('1.0-beta.5')
+          @root_spec.stubs(:version).returns(version)
+          @generator.target_version.should == '1.0.0'
+        end
+      end
 
-        version = Pod::Version.new('1.0-beta.5')
-        @root_spec.stubs(:version).returns(version)
-        @generator.target_version.should == '1.0.0'
+      it 'returns the specification\'s version for the pod target' do
+        generator = Generator::InfoPlistFile.new(fixture_pod_target('orange-framework/OrangeFramework.podspec'))
+        generator.target_version.should == '0.1.0'
       end
     end
 
-    it 'returns the specification\'s version for the pod target' do
-      generator = Pod::Generator::InfoPlistFile.new(fixture_pod_target('orange-framework/OrangeFramework.podspec'))
-      generator.target_version.should == '0.1.0'
+    it 'replaces the version in the generated plist' do
+      generator = Generator::InfoPlistFile.new(fixture_pod_target('orange-framework/OrangeFramework.podspec'))
+      generator.generate.should.include "<key>CFBundleShortVersionString</key>\n  <string>0.1.0</string>"
     end
-  end
 
-  it 'replaces the version in the generated plist' do
-    generator = Pod::Generator::InfoPlistFile.new(fixture_pod_target('orange-framework/OrangeFramework.podspec'))
-    generator.generate.should.include "<key>CFBundleShortVersionString</key>\n  <string>0.1.0</string>"
-  end
+    it 'generates a valid Info.plist file' do
+      generator = Generator::InfoPlistFile.new(fixture_pod_target('orange-framework/OrangeFramework.podspec'))
+      file = temporary_directory + 'Info.plist'
+      generator.save_as(file)
+      `plutil -lint #{file}`
+      $?.should.be.success
+    end
 
-  it 'generates a valid Info.plist file' do
-    generator = Pod::Generator::InfoPlistFile.new(mock('Target'))
-    file = temporary_directory + 'Info.plist'
-    generator.save_as(file)
-    `plutil -lint #{file}`
-    $?.should.be.success
-  end
+    it 'generates a correct Info.plist file' do
+      generator = Generator::InfoPlistFile.new(mock('Target', :platform => stub(:name => :ios)))
+      file = temporary_directory + 'Info.plist'
+      generator.save_as(file)
+      Xcodeproj::PlistHelper.read(file).should == {
+        'CFBundleDevelopmentRegion' => 'en',
+        'CFBundleExecutable' => '${EXECUTABLE_NAME}',
+        'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
+        'CFBundleInfoDictionaryVersion' => '6.0',
+        'CFBundleName' => '${PRODUCT_NAME}',
+        'CFBundlePackageType' => 'FMWK',
+        'CFBundleShortVersionString' => '1.0.0',
+        'CFBundleSignature' => '????',
+        'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
+        'NSPrincipalClass' => '',
+      }
+    end
 
-  it 'generates a correct Info.plist file' do
-    generator = Pod::Generator::InfoPlistFile.new(mock('Target'))
-    file = temporary_directory + 'Info.plist'
-    generator.save_as(file)
-    Xcodeproj::PlistHelper.read(file).should == {
-      'CFBundleDevelopmentRegion' => 'en',
-      'CFBundleExecutable' => '${EXECUTABLE_NAME}',
-      'CFBundleIdentifier' => '${PRODUCT_BUNDLE_IDENTIFIER}',
-      'CFBundleInfoDictionaryVersion' => '6.0',
-      'CFBundleName' => '${PRODUCT_NAME}',
-      'CFBundlePackageType' => 'FMWK',
-      'CFBundleShortVersionString' => '1.0.0',
-      'CFBundleSignature' => '????',
-      'CFBundleVersion' => '${CURRENT_PROJECT_VERSION}',
-      'NSPrincipalClass' => '',
-    }
+    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::PlistHelper.read(file)['UIRequiredDeviceCapabilities'].should == %w(arm64)
+    end
   end
 end