Additional fixes for watchOS support.

CocoaPods · Jun 24, 2015 · a8487bf · a8487bf
1 parent f30b8c8
commit a8487bf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/lib/xcodeproj/project/object/native_target.rb b/lib/xcodeproj/project/object/native_target.rb
@@ -110,10 +110,10 @@ def sdk_version
         #         platform.
         #
         def deployment_target
-          if platform_name == :ios
-            common_resolved_build_setting('IPHONEOS_DEPLOYMENT_TARGET')
-          else
-            common_resolved_build_setting('MACOSX_DEPLOYMENT_TARGET')
+          case platform_name
+          when :ios then common_resolved_build_setting('IPHONEOS_DEPLOYMENT_TARGET')
+          when :osx then common_resolved_build_setting('MACOSX_DEPLOYMENT_TARGET')
+          when :watchos then common_resolved_build_setting('WATCHOS_DEPLOYMENT_TARGET')
           end
         end
 

diff --git a/lib/xcodeproj/project/project_helper.rb b/lib/xcodeproj/project/project_helper.rb
@@ -234,10 +234,10 @@ def self.common_build_settings(type, platform = nil, deployment_target = nil, ta
         end
 
         if deployment_target
-          if platform == :ios
-            settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
-          elsif platform == :osx
-            settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+          case platform
+          when :ios then settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target
+          when :osx then settings['MACOSX_DEPLOYMENT_TARGET'] = deployment_target
+          when :watchos then settings['WATCHOS_DEPLOYMENT_TARGET'] = deployment_target
           end
         end
 

diff --git a/lib/xcodeproj/xcodebuild_helper.rb b/lib/xcodeproj/xcodebuild_helper.rb
@@ -20,6 +20,13 @@ def last_osx_sdk
       verions_by_sdk[:osx].sort.last
     end
 
+    # @return [String] The version of the last watchOS sdk.
+    #
+    def last_watchos_sdk
+      parse_sdks_if_needed
+      verions_by_sdk[:watchos].sort.last
+    end
+
     private
 
     # !@group Private Helpers
@@ -38,12 +45,14 @@ def parse_sdks_if_needed
         @verions_by_sdk = {}
         @verions_by_sdk[:osx] = []
         @verions_by_sdk[:ios] = []
+        @verions_by_sdk[:watchos] = []
         if xcodebuild_available?
           skds = parse_sdks_information(xcodebuild_sdks)
           skds.each do |(name, version)|
             case
             when name == 'macosx' then @verions_by_sdk[:osx] << version
             when name == 'iphoneos' then @verions_by_sdk[:ios] << version
+            when name == 'watchos' then @verions_by_sdk[:watchos] << version
             end
           end
         end
@@ -64,7 +73,7 @@ def xcodebuild_available?
     #         is the name of the SDK and the second is the version.
     #
     def parse_sdks_information(output)
-      output.scan(/-sdk (macosx|iphoneos)(.+\w)/)
+      output.scan(/-sdk (macosx|iphoneos|watchos)(.+\w)/)
     end
 
     # @return [String] The sdk information reported by xcodebuild.