Commit 250f4e30 authored by Boris Bügling's avatar Boris Bügling

Added missing watchOS bits.

parent 17609a19
...@@ -177,6 +177,7 @@ Pod::Spec.new do |s| ...@@ -177,6 +177,7 @@ Pod::Spec.new do |s|
# When using multiple platforms # When using multiple platforms
# s.ios.deployment_target = "5.0" # s.ios.deployment_target = "5.0"
# s.osx.deployment_target = "10.7" # s.osx.deployment_target = "10.7"
# s.watchos.deployment_target = "2.0"
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # # ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
......
...@@ -189,7 +189,7 @@ module Pod ...@@ -189,7 +189,7 @@ module Pod
search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= '' search_paths = xcconfig.attributes['FRAMEWORK_SEARCH_PATHS'] ||= ''
search_paths_to_add = [] search_paths_to_add = []
search_paths_to_add << '$(inherited)' search_paths_to_add << '$(inherited)'
if platform == :ios if platform == :ios || platform == :watchos
search_paths_to_add << '"$(SDKROOT)/Developer/Library/Frameworks"' search_paths_to_add << '"$(SDKROOT)/Developer/Library/Frameworks"'
else else
search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"' search_paths_to_add << '"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
......
...@@ -509,9 +509,11 @@ module Pod ...@@ -509,9 +509,11 @@ module Pod
platforms = aggregate_targets.map(&:platform) platforms = aggregate_targets.map(&:platform)
osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
watchos_deployment_target = platforms.select { |p| p.name == :watchos }.map(&:deployment_target).min
@pods_project.build_configurations.each do |build_configuration| @pods_project.build_configurations.each do |build_configuration|
build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
build_configuration.build_settings['WATCHOS_DEPLOYMENT_TARGET'] = watchos_deployment_target.to_s if watchos_deployment_target
build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO' build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES' build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
end end
......
...@@ -66,7 +66,7 @@ module Pod ...@@ -66,7 +66,7 @@ module Pod
# #
attr_accessor :specs attr_accessor :specs
# @return [Symbol] The platform (either `:ios` or `:osx`). # @return [Symbol] The platform (either `:ios`, `:watchos` or `:osx`).
# #
attr_accessor :platform_name attr_accessor :platform_name
......
...@@ -92,6 +92,8 @@ module Pod ...@@ -92,6 +92,8 @@ module Pod
platform_message = '[iOS] ' platform_message = '[iOS] '
elsif result.platforms == [:osx] elsif result.platforms == [:osx]
platform_message = '[OSX] ' platform_message = '[OSX] '
elsif result.platforms == [:watchos]
platform_message = '[watchOS] '
end end
subspecs_message = '' subspecs_message = ''
......
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