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
8faf562b
Commit
8faf562b
authored
Apr 15, 2014
by
Samuel E. Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Print current version when the repo/lockfile requires a higher version
Closes
https://github.com/CocoaPods/CocoaPods/issues/2049
parent
72e592d4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
4 deletions
+11
-4
CHANGELOG.md
CHANGELOG.md
+4
-0
installer.rb
lib/cocoapods/installer.rb
+4
-3
sources_manager.rb
lib/cocoapods/sources_manager.rb
+1
-1
sources_manager_spec.rb
spec/unit/sources_manager_spec.rb
+2
-0
No files found.
CHANGELOG.md
View file @
8faf562b
...
...
@@ -16,6 +16,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
[
Kyle Fuller
](
https://github.com/kylef
)
[
#2025
](
https://github.com/CocoaPods/CocoaPods/issues/2025
)
*
Print current version when the repo/lockfile requires a higher version
[
Samuel E. Giddins
](
https://github.com/segiddins
)
[
#2049
](
https://github.com/CocoaPods/CocoaPods/issues/2049
)
##### Bug Fixes
*
Fixed support for file references in the workspace generated by CocoaPods.
...
...
lib/cocoapods/installer.rb
View file @
8faf562b
...
...
@@ -164,9 +164,10 @@ module Pod
#
def
analyze
if
lockfile
&&
lockfile
.
cocoapods_version
>
Version
.
new
(
VERSION
)
STDERR
.
puts
'[!] The version of CocoaPods used to generate the lockfile is '
\
'higher than the version of the current executable. Incompatibility '
\
'issues may arise.'
.
yellow
STDERR
.
puts
'[!] The version of CocoaPods used to generate '
\
"the lockfile (
#{
lockfile
.
cocoapods_version
}
) is "
\
"higher than the version of the current executable (
#{
VERSION
}
). "
\
'Incompatibility issues may arise.'
.
yellow
end
analyzer
=
Analyzer
.
new
(
sandbox
,
podfile
,
lockfile
)
...
...
lib/cocoapods/sources_manager.rb
View file @
8faf562b
...
...
@@ -206,7 +206,7 @@ module Pod
min
,
max
=
versions
[
'min'
],
versions
[
'max'
]
version_msg
=
(
min
==
max
)
?
min
:
"
#{
min
}
-
#{
max
}
"
raise
Informative
,
"The `
#{
dir
.
basename
}
` repo requires "
\
"CocoaPods
#{
version_msg
}
\n
"
.
red
+
"CocoaPods
#{
version_msg
}
(currently using
#{
Pod
::
VERSION
}
)
\n
"
.
red
+
"Update CocoaPods, or checkout the appropriate tag in the repo."
end
...
...
spec/unit/sources_manager_spec.rb
View file @
8faf562b
...
...
@@ -153,9 +153,11 @@ module Pod
SourcesManager
.
stubs
(
:version_information
).
returns
({
'min'
=>
'999.0'
})
e
=
lambda
{
SourcesManager
.
check_version_information
(
temporary_directory
)
}.
should
.
raise
Informative
e
.
message
.
should
.
match
/Update CocoaPods/
e
.
message
.
should
.
match
/(currently using
#{
Pod
::
VERSION
}
)/
SourcesManager
.
stubs
(
:version_information
).
returns
({
'max'
=>
'0.0.1'
})
e
=
lambda
{
SourcesManager
.
check_version_information
(
temporary_directory
)
}.
should
.
raise
Informative
e
.
message
.
should
.
match
/Update CocoaPods/
e
.
message
.
should
.
match
/(currently using
#{
Pod
::
VERSION
}
)/
end
it
'raises when reading version information with merge conflict'
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