Merge pull request #4451 from CocoaPods/seg-product-bundle-identifier

Set the CFBundleIdentifier using the PRODUCT_BUNDLE_IDENTIFIER build setting

CHANGELOG.md

@@ -43,6 +43,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
   [#2095](https://github.com/CocoaPods/CocoaPods/issues/2095)
   [#2134](https://github.com/CocoaPods/CocoaPods/issues/2134)
 
+* The `Info.plist` file's `CFBundleIdentifier` is now set via the
+  `PRODUCT_BUNDLE_IDENTIFIER` build setting, consisten with Xcode 7.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4426](https://github.com/CocoaPods/CocoaPods/issues/4426)
+
 ##### Bug Fixes
 
 * Improve repo lint error message when no repo found with given name.  

lib/cocoapods/generator/info_plist_file.rb

@@ -64,7 +64,7 @@ module Pod
   <key>CFBundleExecutable</key>
   <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIdentifier</key>
-  <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string>
+  <string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>

lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -50,7 +50,8 @@ module Pod
             'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(search_paths),
             'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) COCOAPODS=1',
             'SKIP_INSTALL' => 'YES',
-            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) '
+            'FRAMEWORK_SEARCH_PATHS' => '$(inherited) ',
+            'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
             # 'USE_HEADERMAP' => 'NO'
           }
 

lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -43,11 +43,12 @@ module Pod
       #
       def custom_build_settings
         settings = {
-          'OTHER_LDFLAGS'      => '',
-          'OTHER_LIBTOOLFLAGS' => '',
-          'PODS_ROOT'          => '$(SRCROOT)',
-          'SKIP_INSTALL'       => 'YES',
-          'MACH_O_TYPE'        => 'staticlib',
+          'MACH_O_TYPE'               => 'staticlib',
+          'OTHER_LDFLAGS'             => '',
+          'OTHER_LIBTOOLFLAGS'        => '',
+          'PODS_ROOT'                 => '$(SRCROOT)',
+          'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
+          'SKIP_INSTALL'              => 'YES',
         }
         super.merge(settings)
       end

cocoapods-integration-specs @ a4589c40

-Subproject commit 0966bef0a5a83edc6a6b7e774d6570b5bb671c12
+Subproject commit a4589c40aa717e3410441e88763cad64f8c73e05

spec/unit/generator/info_plist_file_spec.rb

@@ -62,4 +62,22 @@ describe Pod::Generator::InfoPlistFile do
     `plutil -lint #{file}`
     $?.should.be.success
   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' => '',
+    }
+  end
 end

spec/unit/generator/xcconfig/pod_xcconfig_spec.rb

@@ -99,6 +99,10 @@ module Pod
             @xcconfig.to_hash['SKIP_INSTALL'].should == 'YES'
           end
 
+          it 'sets PRODUCT_BUNDLE_IDENTIFIER' do
+            @xcconfig.to_hash['PRODUCT_BUNDLE_IDENTIFIER'].should == 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
+          end
+
           it 'saves the xcconfig' do
             path = temporary_directory + 'sample.xcconfig'
             @generator.save_as(path)

spec/unit/installer/target_installer/aggregate_target_installer_spec.rb

@@ -114,6 +114,13 @@ module Pod
         end
       end
 
+      it 'has a PRODUCT_BUNDLE_IDENTIFIER set' do
+        @installer.install!
+        @installer.target.native_target.build_configurations.each do |config|
+          config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'].should == 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
+        end
+      end
+
       #--------------------------------------#
 
       it 'creates the xcconfig file' do