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
a804ff01
Commit
a804ff01
authored
Aug 01, 2016
by
Danielle Tomlinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Set codesign identity for watchos/tvos
parent
793155cb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
7 deletions
+26
-7
CHANGELOG.md
CHANGELOG.md
+4
-0
aggregate_target_installer.rb
...code/pods_project_generator/aggregate_target_installer.rb
+9
-7
pod_target_installer.rb
...ller/xcode/pods_project_generator/pod_target_installer.rb
+4
-0
pod_target_installer_spec.rb
...xcode/pods_project_generator/pod_target_installer_spec.rb
+9
-0
No files found.
CHANGELOG.md
View file @
a804ff01
...
...
@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#5491
](
https://github.com/CocoaPods/CocoaPods/issues/5491
)
*
Fix codesigning identity on watchOS and tvOS targets.
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#5686
](
https://github.com/CocoaPods/CocoaPods/issues/5686
)
## 1.1.0.beta.1 (2016-07-11)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
View file @
a804ff01
...
...
@@ -51,13 +51,15 @@ module Pod
#
def
custom_build_settings
settings
=
{
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
=>
''
,
'MACH_O_TYPE'
=>
'staticlib'
,
'OTHER_LDFLAGS'
=>
''
,
'OTHER_LIBTOOLFLAGS'
=>
''
,
'PODS_ROOT'
=>
'$(SRCROOT)'
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'SKIP_INSTALL'
=>
'YES'
,
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
=>
''
,
'CODE_SIGN_IDENTITY[sdk=watchos*]'
=>
''
,
'CODE_SIGN_IDENTITY[sdk=appletvos*]'
=>
''
,
'MACH_O_TYPE'
=>
'staticlib'
,
'OTHER_LDFLAGS'
=>
''
,
'OTHER_LIBTOOLFLAGS'
=>
''
,
'PODS_ROOT'
=>
'$(SRCROOT)'
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'SKIP_INSTALL'
=>
'YES'
,
}
super
.
merge
(
settings
)
end
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
a804ff01
...
...
@@ -54,7 +54,11 @@ module Pod
settings
[
'PRIVATE_HEADERS_FOLDER_PATH'
]
=
''
settings
[
'PUBLIC_HEADERS_FOLDER_PATH'
]
=
''
end
settings
[
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
]
=
''
settings
[
'CODE_SIGN_IDENTITY[sdk=watchos*]'
]
=
''
settings
[
'CODE_SIGN_IDENTITY[sdk=appletvos*]'
]
=
''
if
target
.
swift_version
settings
[
'SWIFT_VERSION'
]
=
target
.
swift_version
end
...
...
spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb
View file @
a804ff01
...
...
@@ -90,6 +90,15 @@ module Pod
end
end
it
'sets an empty codesigning identity for iOS/tvOS/watchOS'
do
@installer
.
install!
@project
.
targets
.
first
.
build_configurations
.
each
do
|
config
|
config
.
build_settings
[
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
].
should
==
''
config
.
build_settings
[
'CODE_SIGN_IDENTITY[sdk=watchos*]'
].
should
==
''
config
.
build_settings
[
'CODE_SIGN_IDENTITY[sdk=appletvos*]'
].
should
==
''
end
end
#--------------------------------------#
describe
'headers folder paths'
do
...
...
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