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
85b7bde0
Commit
85b7bde0
authored
Jun 08, 2017
by
Dimitris Koutsogiorgas
Committed by
GitHub
Jun 08, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6783 from dnkoutso/no_longer_034
Remove 0.34 migration for a small boost in `pod install` time
parents
91379dd0
3acf452c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
34 deletions
+4
-34
CHANGELOG.md
CHANGELOG.md
+3
-1
xcconfig_integrator.rb
...oject_integrator/target_integrator/xcconfig_integrator.rb
+0
-32
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
85b7bde0
...
@@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### Bug Fixes
*
None.
*
Remove 0.34 migration for a small boost in
`pod install`
time
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#6783
](
hhttps://github.com/CocoaPods/CocoaPods/pull/6783
)
## 1.3.0.beta.1 (2017-06-06)
## 1.3.0.beta.1 (2017-06-06)
...
...
lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
View file @
85b7bde0
...
@@ -18,7 +18,6 @@ module Pod
...
@@ -18,7 +18,6 @@ module Pod
def
self
.
integrate
(
pod_bundle
,
targets
)
def
self
.
integrate
(
pod_bundle
,
targets
)
targets
.
each
do
|
target
|
targets
.
each
do
|
target
|
target
.
build_configurations
.
each
do
|
config
|
target
.
build_configurations
.
each
do
|
config
|
update_to_cocoapods_0_34
(
pod_bundle
,
targets
)
set_target_xcconfig
(
pod_bundle
,
target
,
config
)
set_target_xcconfig
(
pod_bundle
,
target
,
config
)
end
end
end
end
...
@@ -29,37 +28,6 @@ module Pod
...
@@ -29,37 +28,6 @@ module Pod
# @!group Integration steps
# @!group Integration steps
#-------------------------------------------------------------------#
#-------------------------------------------------------------------#
# Removes the xcconfig used up to CocoaPods 0.33 from the project and
# deletes the file if it exists.
#
# @param [Target::AggregateTarget] pod_bundle
# The Pods bundle.
#
# @param [Array<XcodeProj::PBXNativeTarget>] targets
# The native targets.
#
# @todo This can be removed for CocoaPods 1.0
#
def
self
.
update_to_cocoapods_0_34
(
pod_bundle
,
targets
)
sandbox
=
pod_bundle
.
sandbox
targets
.
map
(
&
:project
).
uniq
.
each
do
|
project
|
file_refs
=
project
.
files
.
select
do
|
file_ref
|
path
=
file_ref
.
path
.
to_s
if
File
.
extname
(
path
)
==
'.xcconfig'
absolute_path
=
file_ref
.
real_path
.
to_s
absolute_path
.
start_with?
(
sandbox
.
root
.
to_s
)
&&
!
absolute_path
.
start_with?
(
sandbox
.
target_support_files_root
.
to_s
)
end
end
file_refs
.
uniq
.
each
do
|
file_ref
|
UI
.
message
"- Removing (
#{
file_ref
.
path
}
)"
do
file_ref
.
remove_from_project
end
end
end
end
# Creates a file reference to the xcconfig generated by
# Creates a file reference to the xcconfig generated by
# CocoaPods (if needed) and sets it as the base configuration of
# CocoaPods (if needed) and sets it as the base configuration of
# build configuration of the user target.
# build configuration of the user target.
...
...
cocoapods-integration-specs
@
72022b87
Subproject commit
f576eb6424bf482e5142afab357d32d1acf6ab0b
Subproject commit
72022b87789ec55842eabfecb7b4f9585318a54e
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