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
4e084442
Commit
4e084442
authored
Aug 11, 2014
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AggregateTarget] Minor cleanup
parent
7b14c180
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
11 deletions
+4
-11
aggregate_target.rb
lib/cocoapods/target/aggregate_target.rb
+4
-8
aggregate_target_spec.rb
spec/unit/target/aggregate_target_spec.rb
+0
-3
No files found.
lib/cocoapods/target/aggregate_target.rb
View file @
4e084442
...
@@ -36,8 +36,8 @@ module Pod
...
@@ -36,8 +36,8 @@ module Pod
#
#
attr_accessor
:user_project_path
attr_accessor
:user_project_path
# @return [
String] the list of the UUIDs of the user targets that will be
# @return [
Array<String>] the list of the UUIDs of the user targets that
# integrated by this target as identified by the analizer.
#
will be
integrated by this target as identified by the analizer.
#
#
# @note The target instances are not stored to prevent editing different
# @note The target instances are not stored to prevent editing different
# instances.
# instances.
...
@@ -104,11 +104,10 @@ module Pod
...
@@ -104,11 +104,10 @@ module Pod
"${SRCROOT}/
#{
relative_to_srcroot
(
copy_resources_script_path
)
}
"
"${SRCROOT}/
#{
relative_to_srcroot
(
copy_resources_script_path
)
}
"
end
end
#-------------------------------------------------------------------------#
private
# @!group Private Helpers
# @!group Private Helpers
#-------------------------------------------------------------------------#
private
# Computes the relative path of a sandboxed file from the `$(SRCROOT)`
# Computes the relative path of a sandboxed file from the `$(SRCROOT)`
# variable of the user's project.
# variable of the user's project.
...
@@ -121,8 +120,5 @@ module Pod
...
@@ -121,8 +120,5 @@ module Pod
def
relative_to_srcroot
(
path
)
def
relative_to_srcroot
(
path
)
path
.
relative_path_from
(
client_root
).
to_s
path
.
relative_path_from
(
client_root
).
to_s
end
end
#-------------------------------------------------------------------------#
end
end
end
end
spec/unit/target/aggregate_target_spec.rb
View file @
4e084442
...
@@ -58,8 +58,6 @@ module Pod
...
@@ -58,8 +58,6 @@ module Pod
@target
.
acknowledgements_basepath
.
to_s
.
should
.
include?
(
'Pods/Pods-acknowledgements'
)
@target
.
acknowledgements_basepath
.
to_s
.
should
.
include?
(
'Pods/Pods-acknowledgements'
)
end
end
#--------------------------------------#
it
"returns the path of the resources script relative to the user project"
do
it
"returns the path of the resources script relative to the user project"
do
@target
.
copy_resources_script_relative_path
.
should
==
'${SRCROOT}/Pods/Pods-resources.sh'
@target
.
copy_resources_script_relative_path
.
should
==
'${SRCROOT}/Pods/Pods-resources.sh'
end
end
...
@@ -88,6 +86,5 @@ module Pod
...
@@ -88,6 +86,5 @@ module Pod
consumer_reps
.
should
==
[[
"BananaLib"
,
:ios
]]
consumer_reps
.
should
==
[[
"BananaLib"
,
:ios
]]
end
end
end
end
end
end
end
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