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
8c4b4d92
Commit
8c4b4d92
authored
Feb 05, 2017
by
Dimitris Koutsogiorgas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ${SRCROOT} rather than ${PODS_ROOT} in the generated manifest lock script phase.
parent
9fecb2ee
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
target_integrator.rb
...ds/installer/user_project_integrator/target_integrator.rb
+1
-1
target_integrator_spec.rb
...staller/user_project_integrator/target_integrator_spec.rb
+1
-1
No files found.
CHANGELOG.md
View file @
8c4b4d92
...
@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
##### Bug Fixes
*
Use
`${SRCROOT}`
rather than
`${PODS_ROOT}`
in the generated manifest lock script phase.
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
#5499
](
https://github.com/CocoaPods/CocoaPods/issues/5499
)
*
Fix build phase resource references to point at PBXVariantGroups where relevant.
*
Fix build phase resource references to point at PBXVariantGroups where relevant.
[
Wes Campaigne
](
https://github.com/Westacular
)
[
Wes Campaigne
](
https://github.com/Westacular
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
[
Dimitris Koutsogiorgas
](
https://github.com/dnkoutso
)
...
...
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file @
8c4b4d92
...
@@ -177,7 +177,7 @@ module Pod
...
@@ -177,7 +177,7 @@ module Pod
phase
=
create_or_update_build_phase
(
native_target
,
phase_name
)
phase
=
create_or_update_build_phase
(
native_target
,
phase_name
)
native_target
.
build_phases
.
unshift
(
phase
).
uniq!
unless
native_target
.
build_phases
.
first
==
phase
native_target
.
build_phases
.
unshift
(
phase
).
uniq!
unless
native_target
.
build_phases
.
first
==
phase
phase
.
shell_script
=
<<-
SH
.
strip_heredoc
phase
.
shell_script
=
<<-
SH
.
strip_heredoc
diff "${
PODS_ROOT}/..
/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
diff "${
SRCROOT}
/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [ $? != 0 ] ; then
if [ $? != 0 ] ; then
# print error to STDERR
# print error to STDERR
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
...
...
spec/unit/installer/user_project_integrator/target_integrator_spec.rb
View file @
8c4b4d92
...
@@ -95,7 +95,7 @@ module Pod
...
@@ -95,7 +95,7 @@ module Pod
phase_name
=
@phase_prefix
+
Installer
::
UserProjectIntegrator
::
TargetIntegrator
::
CHECK_MANIFEST_PHASE_NAME
phase_name
=
@phase_prefix
+
Installer
::
UserProjectIntegrator
::
TargetIntegrator
::
CHECK_MANIFEST_PHASE_NAME
phase
=
target
.
shell_script_build_phases
.
find
{
|
bp
|
bp
.
name
==
phase_name
}
phase
=
target
.
shell_script_build_phases
.
find
{
|
bp
|
bp
.
name
==
phase_name
}
phase
.
shell_script
.
should
==
<<-
EOS
.
strip_heredoc
phase
.
shell_script
.
should
==
<<-
EOS
.
strip_heredoc
diff "${
PODS_ROOT}/..
/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
diff "${
SRCROOT}
/Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
if [ $? != 0 ] ; then
if [ $? != 0 ] ; then
# print error to STDERR
# print error to STDERR
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
echo "error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation." >&2
...
...
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