Merge pull request #546 from CocoaPods/seg-objc-weak-only-new-deployment-targets

Disable weak refs for old deployment targets

Author: segiddins

CHANGELOG.md

@@ -8,7 +8,10 @@
 
 ##### Bug Fixes
 
-* None.  
+* Disable Objective-C weak references by default for new targets
+  whose deployment targets do not support them.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#544](https://github.com/CocoaPods/Xcodeproj/issues/544)
 
 
 ## 1.5.5 (2018-02-02)

Gemfile.lock

@@ -16,7 +16,7 @@ PATH
   specs:
     xcodeproj (1.5.5)
       CFPropertyList (~> 2.3.3)
-      atomos (~> 0.1.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.2.3)
@@ -28,7 +28,7 @@ GEM
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     ast (2.3.0)
-    atomos (0.1.1)
+    atomos (0.1.2)
     bacon (1.2.0)
     claide-plugins (0.9.2)
       cork

lib/xcodeproj/project/project_helper.rb

@@ -270,10 +270,16 @@ def self.common_build_settings(type, platform = nil, deployment_target = nil, ta
 
         if deployment_target
           case platform
-          when :ios then settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-          when :osx then settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
-          when :tvos then settings['TVOS_DEPLOYMENT_TARGET'] = deployment_target
-          when :watchos then settings['WATCHOS_DEPLOYMENT_TARGET'] = deployment_target
+          when :ios
+            settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+            settings['CLANG_ENABLE_OBJC_WEAK'] = 'NO' if deployment_target < '5'
+          when :osx
+            settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+            settings['CLANG_ENABLE_OBJC_WEAK'] = 'NO' if deployment_target < '10.7'
+          when :tvos
+            settings['TVOS_DEPLOYMENT_TARGET'] = deployment_target
+          when :watchos
+            settings['WATCHOS_DEPLOYMENT_TARGET'] = deployment_target
           end
         end
 

spec/project/project_helper_spec.rb

@@ -175,6 +175,18 @@ module ProjectSpecs
         settings_1['SDKROOT'].object_id.should.not == settings_2['SDKROOT'].object_id
         settings_1['SDKROOT'][1].object_id.should.not == settings_2['SDKROOT'][1].object_id
       end
+
+      it 'sets CLANG_ENABLE_OBJC_WEAK=NO for old deployment targets' do
+        settings = @helper.common_build_settings(:release, :osx, '10.6', Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+        settings['CLANG_ENABLE_OBJC_WEAK'].should == 'NO'
+        settings = @helper.common_build_settings(:release, :osx, '10.7', Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+        settings.should.not.key 'CLANG_ENABLE_OBJC_WEAK'
+
+        settings = @helper.common_build_settings(:release, :ios, '4.3', Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+        settings['CLANG_ENABLE_OBJC_WEAK'].should == 'NO'
+        settings = @helper.common_build_settings(:release, :ios, '5', Xcodeproj::Constants::PRODUCT_TYPE_UTI[:bundle])
+        settings.should.not.key 'CLANG_ENABLE_OBJC_WEAK'
+      end
     end
 
     #----------------------------------------#

xcodeproj.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.executables   = %w(xcodeproj)
   s.require_paths = %w(lib)
 
-  s.add_runtime_dependency 'atomos',         '~> 0.1.0'
+  s.add_runtime_dependency 'atomos',         '~> 0.1.2'
   s.add_runtime_dependency 'CFPropertyList', '~> 2.3.3'
   s.add_runtime_dependency 'claide',         '>= 1.0.2', '< 2.0'
   s.add_runtime_dependency 'colored2',       '~> 3.1'