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
6912516c
Commit
6912516c
authored
Nov 16, 2016
by
Danielle Tomlinson
Committed by
GitHub
Nov 16, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5645 from pcantrell/macos-lint-code-signing-fix
Fix for lint codesign failure on macOS projects
parents
1db1c555
5ee46cc9
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
CHANGELOG.md
CHANGELOG.md
+3
-0
validator.rb
lib/cocoapods/validator.rb
+2
-0
validator_spec.rb
spec/unit/validator_spec.rb
+2
-1
No files found.
CHANGELOG.md
View file @
6912516c
...
@@ -30,6 +30,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -30,6 +30,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Remove the
`const_missing`
hack for
`Pod::SourcesManager`
.
*
Remove the
`const_missing`
hack for
`Pod::SourcesManager`
.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
*
Fixed code signing issue causing lint failure on macOS.
[
Paul Cantrell
](
https://github.com/pcantrell
)
[
#5645
](
https://github.com/CocoaPods/CocoaPods/issues/5645
)
## 1.2.0.beta.1 (2016-10-28)
## 1.2.0.beta.1 (2016-10-28)
...
...
lib/cocoapods/validator.rb
View file @
6912516c
...
@@ -766,6 +766,8 @@ module Pod
...
@@ -766,6 +766,8 @@ module Pod
require
'fourflusher'
require
'fourflusher'
command
=
[
'clean'
,
'build'
,
'-workspace'
,
File
.
join
(
validation_dir
,
'App.xcworkspace'
),
'-scheme'
,
'App'
,
'-configuration'
,
'Release'
]
command
=
[
'clean'
,
'build'
,
'-workspace'
,
File
.
join
(
validation_dir
,
'App.xcworkspace'
),
'-scheme'
,
'App'
,
'-configuration'
,
'Release'
]
case
consumer
.
platform_name
case
consumer
.
platform_name
when
:osx
,
:macos
command
+=
%w(CODE_SIGN_IDENTITY=)
when
:ios
when
:ios
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
command
+=
Fourflusher
::
SimControl
.
new
.
destination
(
:oldest
,
'iOS'
,
deployment_target
)
command
+=
Fourflusher
::
SimControl
.
new
.
destination
(
:oldest
,
'iOS'
,
deployment_target
)
...
...
spec/unit/validator_spec.rb
View file @
6912516c
...
@@ -435,7 +435,8 @@ module Pod
...
@@ -435,7 +435,8 @@ module Pod
Executable
.
stubs
(
:capture_command
).
with
(
'git'
,
[
'config'
,
'--get'
,
'remote.origin.url'
],
:capture
=>
:out
).
returns
([
'https://github.com/CocoaPods/Specs.git'
])
Executable
.
stubs
(
:capture_command
).
with
(
'git'
,
[
'config'
,
'--get'
,
'remote.origin.url'
],
:capture
=>
:out
).
returns
([
'https://github.com/CocoaPods/Specs.git'
])
Executable
.
stubs
(
:which
).
with
(
:xcrun
)
Executable
.
stubs
(
:which
).
with
(
:xcrun
)
command
=
[
'clean'
,
'build'
,
'-workspace'
,
File
.
join
(
validator
.
validation_dir
,
'App.xcworkspace'
),
'-scheme'
,
'App'
,
'-configuration'
,
'Release'
]
command
=
[
'clean'
,
'build'
,
'-workspace'
,
File
.
join
(
validator
.
validation_dir
,
'App.xcworkspace'
),
'-scheme'
,
'App'
,
'-configuration'
,
'Release'
]
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
args
=
%w(CODE_SIGN_IDENTITY=)
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
args
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
args
=
%w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple TV 1080p'
)
args
=
%w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple TV 1080p'
)
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
args
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
args
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
args
=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
)
args
=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
)
...
...
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