Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Raise macOS default deployment target #636

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Raise macOS default deployment target #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@

##### Bug Fixes

* None.

* Raise macOS default deployment target to avoid a warning in Xcode 12
[Marc Haisenko](https://github.com/DarkDust)
[CocoaPods#9884](https://github.com/CocoaPods/CocoaPods/issues/9884)

## 1.9.3 (2020-05-29)

Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods-core/podfile/dsl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ def inherit!(inheritance)
# Specifies the platform for which a static library should be built.
#
# CocoaPods provides a default deployment target if one is not specified.
# The current default values are `4.3` for iOS, `10.6` for OS X, `9.0` for tvOS
# The current default values are `4.3` for iOS, `10.9` for OS X, `9.0` for tvOS
# and `2.0` for watchOS.
#
# If the deployment target requires it (iOS < `4.3`), `armv6`
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods-core/podfile/target_definition.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ def set_use_modular_headers_for_pod(pod_name, flag)

#--------------------------------------#

PLATFORM_DEFAULTS = { :ios => '4.3', :osx => '10.6', :tvos => '9.0', :watchos => '2.0' }.freeze
PLATFORM_DEFAULTS = { :ios => '4.3', :osx => '10.9', :tvos => '9.0', :watchos => '2.0' }.freeze

# @return [Platform] the platform of the target definition.
#
Expand Down
2 changes: 1 addition & 1 deletion spec/podfile/target_definition_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ module Pod
@parent.platform.should == Pod::Platform.new(:ios, '4.3')

@parent.set_platform(:osx)
@parent.platform.should == Pod::Platform.new(:osx, '10.6')
@parent.platform.should == Pod::Platform.new(:osx, '10.9')
end

it 'raises if the specified platform is unsupported' do
Expand Down
2 changes: 1 addition & 1 deletion spec/podfile_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ module Pod
it 'assigns a deployment target to the platforms if not specified' do
@podfile.target_definitions['Pods'].platform.deployment_target.to_s.should == '4.3'
@podfile.target_definitions[:test].platform.deployment_target.to_s.should == '4.3'
@podfile.target_definitions[:osx_target].platform.deployment_target.to_s.should == '10.6'
@podfile.target_definitions[:osx_target].platform.deployment_target.to_s.should == '10.9'
end

it "automatically marks a target as exclusive if the parent platform doesn't match" do
Expand Down