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
27475a53
Commit
27475a53
authored
May 15, 2015
by
Marius Rackwitz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use pod_target_xcconfig instead xcconfig
parent
6172ba7b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
xcconfig_helper.rb
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+1
-1
xcconfig_helper_spec.rb
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
+6
-6
No files found.
lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
View file @
27475a53
...
@@ -70,7 +70,7 @@ module Pod
...
@@ -70,7 +70,7 @@ module Pod
# The xcconfig to edit.
# The xcconfig to edit.
#
#
def
self
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
def
self
.
add_spec_build_settings_to_xcconfig
(
consumer
,
xcconfig
)
xcconfig
.
merge!
(
consumer
.
xcconfig
)
xcconfig
.
merge!
(
consumer
.
pod_target_
xcconfig
)
xcconfig
.
libraries
.
merge
(
consumer
.
libraries
)
xcconfig
.
libraries
.
merge
(
consumer
.
libraries
)
xcconfig
.
frameworks
.
merge
(
consumer
.
frameworks
)
xcconfig
.
frameworks
.
merge
(
consumer
.
frameworks
)
xcconfig
.
weak_frameworks
.
merge
(
consumer
.
weak_frameworks
)
xcconfig
.
weak_frameworks
.
merge
(
consumer
.
weak_frameworks
)
...
...
spec/unit/generator/xcconfig/xcconfig_helper_spec.rb
View file @
27475a53
...
@@ -49,7 +49,7 @@ module Pod
...
@@ -49,7 +49,7 @@ module Pod
it
'adds the build settings of the consumer'
do
it
'adds the build settings of the consumer'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{
'OTHER_LDFLAGS'
=>
'-framework SenTestingKit'
},
:
pod_target_
xcconfig
=>
{
'OTHER_LDFLAGS'
=>
'-framework SenTestingKit'
},
:libraries
=>
[],
:libraries
=>
[],
:frameworks
=>
[],
:frameworks
=>
[],
:weak_frameworks
=>
[],
:weak_frameworks
=>
[],
...
@@ -62,7 +62,7 @@ module Pod
...
@@ -62,7 +62,7 @@ module Pod
it
'adds the libraries of the xcconfig'
do
it
'adds the libraries of the xcconfig'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{},
:
pod_target_
xcconfig
=>
{},
:libraries
=>
[
'xml2'
],
:libraries
=>
[
'xml2'
],
:frameworks
=>
[],
:frameworks
=>
[],
:weak_frameworks
=>
[],
:weak_frameworks
=>
[],
...
@@ -75,7 +75,7 @@ module Pod
...
@@ -75,7 +75,7 @@ module Pod
it
'adds the frameworks of the xcconfig'
do
it
'adds the frameworks of the xcconfig'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{},
:
pod_target_
xcconfig
=>
{},
:libraries
=>
[],
:libraries
=>
[],
:frameworks
=>
[
'CoreAnimation'
],
:frameworks
=>
[
'CoreAnimation'
],
:weak_frameworks
=>
[],
:weak_frameworks
=>
[],
...
@@ -88,7 +88,7 @@ module Pod
...
@@ -88,7 +88,7 @@ module Pod
it
'adds the weak frameworks of the xcconfig'
do
it
'adds the weak frameworks of the xcconfig'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{},
:
pod_target_
xcconfig
=>
{},
:libraries
=>
[],
:libraries
=>
[],
:frameworks
=>
[],
:frameworks
=>
[],
:weak_frameworks
=>
[
'iAd'
],
:weak_frameworks
=>
[
'iAd'
],
...
@@ -101,7 +101,7 @@ module Pod
...
@@ -101,7 +101,7 @@ module Pod
it
'adds the ios developer frameworks search paths if needed'
do
it
'adds the ios developer frameworks search paths if needed'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{},
:
pod_target_
xcconfig
=>
{},
:libraries
=>
[],
:libraries
=>
[],
:frameworks
=>
[
'SenTestingKit'
],
:frameworks
=>
[
'SenTestingKit'
],
:weak_frameworks
=>
[],
:weak_frameworks
=>
[],
...
@@ -115,7 +115,7 @@ module Pod
...
@@ -115,7 +115,7 @@ module Pod
it
'adds the osx developer frameworks search paths if needed'
do
it
'adds the osx developer frameworks search paths if needed'
do
xcconfig
=
Xcodeproj
::
Config
.
new
xcconfig
=
Xcodeproj
::
Config
.
new
consumer
=
stub
(
consumer
=
stub
(
:xcconfig
=>
{},
:
pod_target_
xcconfig
=>
{},
:libraries
=>
[],
:libraries
=>
[],
:frameworks
=>
[
'SenTestingKit'
],
:frameworks
=>
[
'SenTestingKit'
],
:weak_frameworks
=>
[],
:weak_frameworks
=>
[],
...
...
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