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
bc9f8f99
Commit
bc9f8f99
authored
May 09, 2018
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop linking frameworks to static libraries to avoid warnings with the new build system
parent
a0472395
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
8 deletions
+19
-8
CHANGELOG.md
CHANGELOG.md
+4
-0
Gemfile.lock
Gemfile.lock
+1
-1
pods_project_generator.rb
lib/cocoapods/installer/xcode/pods_project_generator.rb
+1
-0
pod_target.rb
lib/cocoapods/target/pod_target.rb
+1
-1
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
pods_project_generator_spec.rb
spec/unit/installer/xcode/pods_project_generator_spec.rb
+11
-5
No files found.
CHANGELOG.md
View file @
bc9f8f99
...
...
@@ -40,6 +40,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
*
Improve performance of grouping pods by configuration.
[
Samuel Giddins
](
https://github.com/segiddins
)
*
Stop linking frameworks to static libraries to avoid warnings with the new build system.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#7570
](
https://github.com/CocoaPods/CocoaPods/pull/7570
)
## 1.5.2 (2018-05-09)
...
...
Gemfile.lock
View file @
bc9f8f99
...
...
@@ -31,7 +31,7 @@ GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
revision:
b27620b3dd31ce2f9201fbb9c05f195cda74434a
revision:
3333a879ecd24c42ebb6fc99ce4897ee099d4ce3
branch: master
specs:
xcodeproj (1.5.8)
...
...
lib/cocoapods/installer/xcode/pods_project_generator.rb
View file @
bc9f8f99
...
...
@@ -220,6 +220,7 @@ module Pod
sorted_installation_results
.
each
do
|
target_installation_result
|
pod_target
=
target_installation_result
.
target
next
unless
pod_target
.
should_build?
next
if
!
pod_target
.
requires_frameworks?
||
pod_target
.
static_framework?
pod_target
.
file_accessors
.
each
do
|
file_accessor
|
native_target
=
target_installation_result
.
native_target_for_spec
(
file_accessor
.
spec
)
add_system_frameworks_to_native_target
(
native_target
,
file_accessor
)
...
...
lib/cocoapods/target/pod_target.rb
View file @
bc9f8f99
...
...
@@ -191,7 +191,7 @@ module Pod
# @return [Boolean] Whether the target should build a static framework.
#
def
static_framework?
root_spec
.
static_framework
r
equires_frameworks?
&&
r
oot_spec
.
static_framework
end
# @return [Boolean] Whether the target defines a "module"
...
...
cocoapods-integration-specs
@
dd63f1db
Subproject commit
c9eb7708b0c8d528ddbe030e93fc6ef80bab9691
Subproject commit
dd63f1db0cda5489fbcc0b0c0ebe1f4b7ddbb0e7
spec/unit/installer/xcode/pods_project_generator_spec.rb
View file @
bc9f8f99
...
...
@@ -176,12 +176,18 @@ module Pod
]
end
it
'adds
system frameworks to
targets'
do
it
'adds
no system frameworks to static
targets'
do
@generator
.
generate!
@generator
.
project
.
targets
.
find
{
|
t
|
t
.
name
==
'OrangeFramework'
}.
frameworks_build_phase
.
file_display_names
.
sort
.
should
==
[
'Foundation.framework'
,
'UIKit.framework'
,
]
@generator
.
project
.
targets
.
find
{
|
t
|
t
.
name
==
'OrangeFramework'
}.
frameworks_build_phase
.
file_display_names
.
should
==
[]
end
it
'adds system frameworks to dynamic targets'
do
@orangeframework_pod_target
.
stubs
(
:requires_frameworks?
=>
true
)
@generator
.
generate!
@generator
.
project
.
targets
.
find
{
|
t
|
t
.
name
==
'OrangeFramework'
}.
frameworks_build_phase
.
file_display_names
.
should
==
%w(
Foundation.framework
UIKit.framework
)
end
it
'adds target dependencies when inheriting search paths'
do
...
...
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