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
88203873
Commit
88203873
authored
Aug 03, 2016
by
Samuel Giddins
Committed by
GitHub
Aug 03, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5704 from DanToml/dan_watchos_codesign
[Installer] Set codesigning identity for watchos/tvos
parents
793155cb
84899552
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
8 deletions
+27
-8
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
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pod_target_installer_spec.rb
...xcode/pods_project_generator/pod_target_installer_spec.rb
+9
-0
No files found.
CHANGELOG.md
View file @
88203873
...
@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -22,6 +22,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
Danielle Tomlinson
](
https://github.com/dantoml
)
[
#5491
](
https://github.com/CocoaPods/CocoaPods/issues/5491
)
[
#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)
## 1.1.0.beta.1 (2016-07-11)
...
...
lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb
View file @
88203873
...
@@ -51,13 +51,15 @@ module Pod
...
@@ -51,13 +51,15 @@ module Pod
#
#
def
custom_build_settings
def
custom_build_settings
settings
=
{
settings
=
{
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
=>
''
,
'CODE_SIGN_IDENTITY[sdk=appletvos*]'
=>
''
,
'MACH_O_TYPE'
=>
'staticlib'
,
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
=>
''
,
'OTHER_LDFLAGS'
=>
''
,
'CODE_SIGN_IDENTITY[sdk=watchos*]'
=>
''
,
'OTHER_LIBTOOLFLAGS'
=>
''
,
'MACH_O_TYPE'
=>
'staticlib'
,
'PODS_ROOT'
=>
'$(SRCROOT)'
,
'OTHER_LDFLAGS'
=>
''
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'OTHER_LIBTOOLFLAGS'
=>
''
,
'SKIP_INSTALL'
=>
'YES'
,
'PODS_ROOT'
=>
'$(SRCROOT)'
,
'PRODUCT_BUNDLE_IDENTIFIER'
=>
'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}'
,
'SKIP_INSTALL'
=>
'YES'
,
}
}
super
.
merge
(
settings
)
super
.
merge
(
settings
)
end
end
...
...
lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb
View file @
88203873
...
@@ -54,7 +54,11 @@ module Pod
...
@@ -54,7 +54,11 @@ module Pod
settings
[
'PRIVATE_HEADERS_FOLDER_PATH'
]
=
''
settings
[
'PRIVATE_HEADERS_FOLDER_PATH'
]
=
''
settings
[
'PUBLIC_HEADERS_FOLDER_PATH'
]
=
''
settings
[
'PUBLIC_HEADERS_FOLDER_PATH'
]
=
''
end
end
settings
[
'CODE_SIGN_IDENTITY[sdk=appletvos*]'
]
=
''
settings
[
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
]
=
''
settings
[
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
]
=
''
settings
[
'CODE_SIGN_IDENTITY[sdk=watchos*]'
]
=
''
if
target
.
swift_version
if
target
.
swift_version
settings
[
'SWIFT_VERSION'
]
=
target
.
swift_version
settings
[
'SWIFT_VERSION'
]
=
target
.
swift_version
end
end
...
...
cocoapods-integration-specs
@
63ec1d3a
Subproject commit
ccba9c9c0e44b54dec59f414c24fea2634a5b75
7
Subproject commit
63ec1d3a180f130ca7e64660293b8d41dc41cba
7
spec/unit/installer/xcode/pods_project_generator/pod_target_installer_spec.rb
View file @
88203873
...
@@ -90,6 +90,15 @@ module Pod
...
@@ -90,6 +90,15 @@ module Pod
end
end
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=appletvos*]'
].
should
==
''
config
.
build_settings
[
'CODE_SIGN_IDENTITY[sdk=iphoneos*]'
].
should
==
''
config
.
build_settings
[
'CODE_SIGN_IDENTITY[sdk=watchos*]'
].
should
==
''
end
end
#--------------------------------------#
#--------------------------------------#
describe
'headers folder paths'
do
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