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
1ec1ead4
Commit
1ec1ead4
authored
Mar 02, 2016
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[FileAccessor] Access root-only values from the spec consumer
parent
4c8c6d58
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
Gemfile.lock
Gemfile.lock
+2
-2
file_accessor.rb
lib/cocoapods/sandbox/file_accessor.rb
+5
-5
No files found.
Gemfile.lock
View file @
1ec1ead4
...
@@ -7,7 +7,7 @@ GIT
...
@@ -7,7 +7,7 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/Core.git
remote: https://github.com/CocoaPods/Core.git
revision:
cc77e5194b892786a698f67f272f13cefeca5f17
revision:
014afb20ee157ea25c53f55c7d50a9e3c6591766
branch: master
branch: master
specs:
specs:
cocoapods-core (1.0.0.beta.4)
cocoapods-core (1.0.0.beta.4)
...
@@ -115,7 +115,7 @@ PATH
...
@@ -115,7 +115,7 @@ PATH
GEM
GEM
remote: https://rubygems.org/
remote: https://rubygems.org/
specs:
specs:
activesupport (4.2.5.
1
)
activesupport (4.2.5.
2
)
i18n (~> 0.7)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
minitest (~> 5.1)
...
...
lib/cocoapods/sandbox/file_accessor.rb
View file @
1ec1ead4
...
@@ -259,8 +259,8 @@ module Pod
...
@@ -259,8 +259,8 @@ module Pod
# @return [Pathname] The of the prefix header file of the specification.
# @return [Pathname] The of the prefix header file of the specification.
#
#
def
prefix_header
def
prefix_header
if
spec_consumer
.
prefix_header_file
if
file
=
spec_consumer
.
prefix_header_file
path_list
.
root
+
spec_consumer
.
prefix_header_
file
path_list
.
root
+
file
end
end
end
end
...
@@ -274,8 +274,8 @@ module Pod
...
@@ -274,8 +274,8 @@ module Pod
# specification or auto-detected.
# specification or auto-detected.
#
#
def
license
def
license
if
spec_consumer
.
spec
.
root
.
license
[
:file
]
if
file
=
spec_consumer
.
license
[
:file
]
path_list
.
root
+
spec_consumer
.
spec
.
root
.
license
[
:file
]
path_list
.
root
+
file
else
else
path_list
.
glob
([
GLOB_PATTERNS
[
:license
]]).
first
path_list
.
glob
([
GLOB_PATTERNS
[
:license
]]).
first
end
end
...
@@ -284,7 +284,7 @@ module Pod
...
@@ -284,7 +284,7 @@ module Pod
# @return [Pathname, Nil] The path of the custom module map file of the
# @return [Pathname, Nil] The path of the custom module map file of the
# specification, if specified.
# specification, if specified.
def
module_map
def
module_map
if
module_map
=
spec_consumer
.
spec
.
root
.
module_map
if
module_map
=
spec_consumer
.
module_map
path_list
.
root
+
module_map
path_list
.
root
+
module_map
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