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
f6028aa0
Commit
f6028aa0
authored
Jul 01, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3750 from CocoaPods/seg-predictable-uuids
[Installer] Save the Pods project with deterministic UUIDs
parents
cc831ac0
3642859a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
CHANGELOG.md
CHANGELOG.md
+4
-0
Gemfile.lock
Gemfile.lock
+3
-2
installer.rb
lib/cocoapods/installer.rb
+1
-0
No files found.
CHANGELOG.md
View file @
f6028aa0
...
@@ -13,6 +13,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -13,6 +13,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
[
#2443
](
https://github.com/CocoaPods/CocoaPods/issues/2443
)
[
#2443
](
https://github.com/CocoaPods/CocoaPods/issues/2443
)
*
`Pods.xcodeproj`
will now be written with deterministic UUIDs, vastly reducing
project churn and merge conflicts.
[
Samuel Giddins
](
https://github.com/segiddins
)
##### Bug Fixes
##### Bug Fixes
*
Ensure that the
`prepare_command`
is run even when skipping the download
*
Ensure that the
`prepare_command`
is run even when skipping the download
...
...
Gemfile.lock
View file @
f6028aa0
...
@@ -24,11 +24,12 @@ GIT
...
@@ -24,11 +24,12 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/Xcodeproj.git
remote: https://github.com/CocoaPods/Xcodeproj.git
revision:
700e41b26f170d31af2599c50cea5666923a6363
revision:
4fabf08c0c0b78c49f72092e3a125610b4377d25
branch: master
branch: master
specs:
specs:
xcodeproj (0.25.
0
)
xcodeproj (0.25.
1
)
activesupport (>= 3)
activesupport (>= 3)
claide (~> 0.8.2)
colored (~> 1.2)
colored (~> 1.2)
GIT
GIT
...
...
lib/cocoapods/installer.rb
View file @
f6028aa0
...
@@ -621,6 +621,7 @@ module Pod
...
@@ -621,6 +621,7 @@ module Pod
pods_project
.
development_pods
.
remove_from_project
if
pods_project
.
development_pods
.
empty?
pods_project
.
development_pods
.
remove_from_project
if
pods_project
.
development_pods
.
empty?
pods_project
.
sort
(
:groups_position
=>
:below
)
pods_project
.
sort
(
:groups_position
=>
:below
)
pods_project
.
recreate_user_schemes
(
false
)
pods_project
.
recreate_user_schemes
(
false
)
pods_project
.
predictabilize_uuids
pods_project
.
save
pods_project
.
save
end
end
end
end
...
...
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