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
4d074081
Commit
4d074081
authored
Nov 23, 2011
by
Eloy Duran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make Subspec ask the top level spec for header mappings.
parent
27fec6a8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
19 deletions
+29
-19
Podfile
examples/RKTwitter/Podfile
+1
-2
Podfile.lock
examples/RKTwitter/Podfile.lock
+9
-11
specification.rb
lib/cocoapods/specification.rb
+18
-5
master
spec/fixtures/spec-repos/master
+1
-1
No files found.
examples/RKTwitter/Podfile
View file @
4d074081
platform
:ios
platform
:ios
dependency
'RestKit-ObjectMapping'
dependency
'RestKit/ObjectMapping/JSONKit'
dependency
'RestKit-JSON-JSONKit'
examples/RKTwitter/Podfile.lock
View file @
4d074081
...
@@ -3,19 +3,17 @@ PODS:
...
@@ -3,19 +3,17 @@ PODS:
- LibComponentLogging-Core (1.1.4)
- LibComponentLogging-Core (1.1.4)
- LibComponentLogging-NSLog (1.0.2):
- LibComponentLogging-NSLog (1.0.2):
- LibComponentLogging-Core (>= 1.1.4)
- LibComponentLogging-Core (>= 1.1.4)
- RestKit-JSON-JSONKit (0.9.3):
- RestKit (0.9.3)
- JSONKit
- RestKit/Network (0.9.3):
- RestKit (= 0.9.3)
- RestKit-Network (0.9.3):
- LibComponentLogging-NSLog
- LibComponentLogging-NSLog
- RestKit (= 0.9.3)
- RestKit (= 0.9.3)
- RestKit
-
ObjectMapping (0.9.3):
- RestKit
/
ObjectMapping (0.9.3):
- RestKit (= 0.9.3)
- RestKit (= 0.9.3)
- RestKit-Network (= 0.9.3)
- RestKit/Network
- RestKit/ObjectMapping/JSONKit (0.9.3):
DOWNLOAD_ONLY:
- JSONKit
- RestKit (0.9.3)
- RestKit (= 0.9.3)
- RestKit/ObjectMapping (= 0.9.3)
DEPENDENCIES:
DEPENDENCIES:
- RestKit-JSON-JSONKit
- RestKit/ObjectMapping/JSONKit
- RestKit-ObjectMapping
lib/cocoapods/specification.rb
View file @
4d074081
...
@@ -21,11 +21,16 @@ module Pod
...
@@ -21,11 +21,16 @@ module Pod
attr_accessor
:defined_in_file
attr_accessor
:defined_in_file
def
initialize
def
initialize
@dependencies
,
@resources
,
@clean_paths
,
@subspecs
=
[],
[],
[],
[]
post_initialize
@xcconfig
=
Xcodeproj
::
Config
.
new
yield
self
if
block_given?
yield
self
if
block_given?
end
end
# TODO This is just to work around a MacRuby bug
def
post_initialize
@dependencies
,
@source_files
,
@resources
,
@clean_paths
,
@subspecs
=
[],
[],
[],
[],
[]
@xcconfig
=
Xcodeproj
::
Config
.
new
end
# Attributes
# Attributes
attr_accessor
:name
attr_accessor
:name
...
@@ -306,7 +311,9 @@ module Pod
...
@@ -306,7 +311,9 @@ module Pod
missing
<<
"`homepage'"
unless
homepage
missing
<<
"`homepage'"
unless
homepage
missing
<<
"`author(s)'"
unless
authors
missing
<<
"`author(s)'"
unless
authors
missing
<<
"either `source' or `part_of'"
unless
source
||
part_of
missing
<<
"either `source' or `part_of'"
unless
source
||
part_of
missing
<<
"`source_files'"
unless
source_files
missing
<<
"`source_files'"
if
source_files
.
empty?
&&
subspecs
.
empty?
# TODO
# * validate subspecs
incorrect
=
[]
incorrect
=
[]
allowed
=
[
nil
,
:ios
,
:osx
]
allowed
=
[
nil
,
:ios
,
:osx
]
...
@@ -392,8 +399,7 @@ module Pod
...
@@ -392,8 +399,7 @@ module Pod
@parent
,
@name
=
parent
,
name
@parent
,
@name
=
parent
,
name
# TODO a MacRuby bug, the correct super impl `initialize' is not called consistently
# TODO a MacRuby bug, the correct super impl `initialize' is not called consistently
#super(&block)
#super(&block)
@dependencies
,
@resources
,
@clean_paths
,
@subspecs
=
[],
[],
[],
[]
post_initialize
@xcconfig
=
Xcodeproj
::
Config
.
new
# A subspec is _always_ part of the source of its top level spec.
# A subspec is _always_ part of the source of its top level spec.
self
.
part_of
=
top_level_parent
.
name
,
version
self
.
part_of
=
top_level_parent
.
name
,
version
...
@@ -415,6 +421,9 @@ module Pod
...
@@ -415,6 +421,9 @@ module Pod
"
#{
@parent
.
name
}
/
#{
@name
}
"
"
#{
@parent
.
name
}
/
#{
@name
}
"
end
end
# TODO manually forwarding the attributes that we have so far needed to forward,
# but need to think if there's a better way to do this.
def
summary
def
summary
@summary
?
@summary
:
top_level_parent
.
summary
@summary
?
@summary
:
top_level_parent
.
summary
end
end
...
@@ -434,6 +443,10 @@ module Pod
...
@@ -434,6 +443,10 @@ module Pod
def
requires_arc
def
requires_arc
top_level_parent
.
requires_arc
top_level_parent
.
requires_arc
end
end
def
copy_header_mapping
(
from
)
top_level_parent
.
copy_header_mapping
(
from
)
end
end
end
end
end
...
...
master
@
8b2cd6ae
Subproject commit
d0a5f7b8b29c6cc81ff28760d756e5fb300a9e7f
Subproject commit
8b2cd6ae4b7c3ec41fe6adba6fa3b7b1f34aaadd
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