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
cc93cc40
Commit
cc93cc40
authored
Jul 03, 2015
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Allow disaling deterministic UUIDs
parent
c06be7de
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
2 deletions
+10
-2
CHANGELOG.md
CHANGELOG.md
+2
-1
config.rb
lib/cocoapods/config.rb
+7
-0
installer.rb
lib/cocoapods/installer.rb
+1
-1
No files found.
CHANGELOG.md
View file @
cc93cc40
...
@@ -14,7 +14,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
...
@@ -14,7 +14,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[
#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
*
`Pods.xcodeproj`
will now be written with deterministic UUIDs, vastly reducing
project churn and merge conflicts.
project churn and merge conflicts. This behavior can be disabled via the new
`COCOAPODS_DISABLE_DETERMINISTIC_UUIDS`
environment variable.
[
Samuel Giddins
](
https://github.com/segiddins
)
[
Samuel Giddins
](
https://github.com/segiddins
)
*
[
`cocoapods-stats`
](
https://github.com/CocoaPods/cocoapods-stats
)
*
[
`cocoapods-stats`
](
https://github.com/CocoaPods/cocoapods-stats
)
...
...
lib/cocoapods/config.rb
View file @
cc93cc40
...
@@ -20,6 +20,7 @@ module Pod
...
@@ -20,6 +20,7 @@ module Pod
:clean
=>
true
,
:clean
=>
true
,
:integrate_targets
=>
true
,
:integrate_targets
=>
true
,
:deduplicate_targets
=>
true
,
:deduplicate_targets
=>
true
,
:deterministic_uuids
=>
ENV
[
'COCOAPODS_DISABLE_DETERMINISTIC_UUIDS'
].
nil?
,
:lock_pod_source
=>
true
,
:lock_pod_source
=>
true
,
:new_version_message
=>
ENV
[
'COCOAPODS_SKIP_UPDATE_MESSAGE'
].
nil?
,
:new_version_message
=>
ENV
[
'COCOAPODS_SKIP_UPDATE_MESSAGE'
].
nil?
,
...
@@ -95,6 +96,12 @@ module Pod
...
@@ -95,6 +96,12 @@ module Pod
attr_accessor
:deduplicate_targets
attr_accessor
:deduplicate_targets
alias_method
:deduplicate_targets?
,
:deduplicate_targets
alias_method
:deduplicate_targets?
,
:deduplicate_targets
# @return [Bool] Whether CocoaPods should give the pods project
# deterministic UUIDs.
#
attr_accessor
:deterministic_uuids
alias_method
:deterministic_uuids?
,
:deterministic_uuids
# @return [Bool] Whether the installer should skip the repos update.
# @return [Bool] Whether the installer should skip the repos update.
#
#
attr_accessor
:skip_repo_update
attr_accessor
:skip_repo_update
...
...
lib/cocoapods/installer.rb
View file @
cc93cc40
...
@@ -644,7 +644,7 @@ module Pod
...
@@ -644,7 +644,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
.
predictabilize_uuids
if
config
.
deterministic_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