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
9d8a7027
Commit
9d8a7027
authored
Dec 30, 2015
by
Boris Bügling
Committed by
Samuel Giddins
Dec 30, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address segiddinscop warnings
parent
a0515047
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
CHANGELOG.md
CHANGELOG.md
+1
-0
validator.rb
lib/cocoapods/validator.rb
+8
-4
validator_spec.rb
spec/unit/validator_spec.rb
+6
-3
No files found.
CHANGELOG.md
View file @
9d8a7027
...
...
@@ -238,6 +238,7 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Boris Bügling
](
https://github.com/neonichu
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#4550
](
https://github.com/CocoaPods/CocoaPods/issues/4550
)
*
Fix lint in Xcode 7.2, it requires
`-destination`
.
[
Boris Bügling
](
https://github.com/neonichu
)
[
#4652
](
https://github.com/CocoaPods/CocoaPods/pull/4652
)
...
...
lib/cocoapods/validator.rb
View file @
9d8a7027
require
'active_support/core_ext/array'
require
'active_support/core_ext/string/inflections'
require
'fourflusher'
autoload
:Fourflusher
,
'fourflusher'
module
Pod
# Validates a Specification.
...
...
@@ -700,11 +701,14 @@ module Pod
command
=
%w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
case
consumer
.
platform_name
when
:ios
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
,
deployment_target
)
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
command
+=
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
,
deployment_target
)
when
:watchos
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple Watch - 38mm'
,
deployment_target
)
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
command
+=
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple Watch - 38mm'
,
deployment_target
)
when
:tvos
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple TV 1080p'
,
deployment_target
)
command
+=
%w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
command
+=
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple TV 1080p'
,
deployment_target
)
end
output
,
status
=
Dir
.
chdir
(
validation_dir
)
{
_xcodebuild
(
command
)
}
...
...
spec/unit/validator_spec.rb
View file @
9d8a7027
...
...
@@ -421,9 +421,12 @@ module Pod
Executable
.
expects
(
:which
).
with
(
'xcodebuild'
).
times
(
4
).
returns
(
'/usr/bin/xcodebuild'
)
command
=
%w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
%w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple TV 1080p'
),
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
),
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
%w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple Watch - 38mm'
),
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
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
)])
args
=
%w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'iPhone 4s'
)
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
args
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
args
=
%w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
+
Fourflusher
::
SimControl
.
new
.
destination
(
'Apple Watch - 38mm'
)
Executable
.
expects
(
:capture_command
).
with
(
'xcodebuild'
,
command
+
args
,
:capture
=>
:merge
).
once
.
returns
([
''
,
stub
(
:success?
=>
true
)])
validator
.
validate
end
...
...
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