Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
250f4e30
Commit
250f4e30
authored
Jun 26, 2015
by
Boris Bügling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing watchOS bits.
parent
17609a19
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
2 deletions
+7
-2
create.rb
lib/cocoapods/command/spec/create.rb
+1
-0
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
installer.rb
lib/cocoapods/installer.rb
+2
-0
post_install_hooks_context.rb
lib/cocoapods/installer/post_install_hooks_context.rb
+1
-1
validator.rb
lib/cocoapods/validator.rb
+2
-0
No files found.
lib/cocoapods/command/spec/create.rb
View file @
250f4e30
...
...
@@ -177,6 +177,7 @@ Pod::Spec.new do |s|
# When using multiple platforms
# s.ios.deployment_target = "5.0"
# s.osx.deployment_target = "10.7"
# s.watchos.deployment_target = "2.0"
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
...
...
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
250f4e30
...
...
@@ -189,7 +189,7 @@ module Pod
search_paths
=
xcconfig
.
attributes
[
'FRAMEWORK_SEARCH_PATHS'
]
||=
''
search_paths_to_add
=
[]
search_paths_to_add
<<
'$(inherited)'
if
platform
==
:ios
if
platform
==
:ios
||
platform
==
:watchos
search_paths_to_add
<<
'"$(SDKROOT)/Developer/Library/Frameworks"'
else
search_paths_to_add
<<
'"$(DEVELOPER_LIBRARY_DIR)/Frameworks"'
...
...
lib/cocoapods/installer.rb
View file @
250f4e30
...
...
@@ -509,9 +509,11 @@ module Pod
platforms
=
aggregate_targets
.
map
(
&
:platform
)
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
watchos_deployment_target
=
platforms
.
select
{
|
p
|
p
.
name
==
:watchos
}.
map
(
&
:deployment_target
).
min
@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
[
'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
[
'CLANG_ENABLE_OBJC_ARC'
]
=
'YES'
end
...
...
lib/cocoapods/installer/post_install_hooks_context.rb
View file @
250f4e30
...
...
@@ -66,7 +66,7 @@ module Pod
#
attr_accessor
:specs
# @return [Symbol] The platform (either `:ios` or `:osx`).
# @return [Symbol] The platform (either `:ios`
, `:watchos`
or `:osx`).
#
attr_accessor
:platform_name
...
...
lib/cocoapods/validator.rb
View file @
250f4e30
...
...
@@ -92,6 +92,8 @@ module Pod
platform_message
=
'[iOS] '
elsif
result
.
platforms
==
[
:osx
]
platform_message
=
'[OSX] '
elsif
result
.
platforms
==
[
:watchos
]
platform_message
=
'[watchOS] '
end
subspecs_message
=
''
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment