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
b0d51847
Commit
b0d51847
authored
Dec 29, 2015
by
Samuel Giddins
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove support for the deprecated :local option in Podfiles
parent
8479939a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
24 deletions
+3
-24
Gemfile.lock
Gemfile.lock
+1
-1
external_sources.rb
lib/cocoapods/external_sources.rb
+0
-4
path_source.rb
lib/cocoapods/external_sources/path_source.rb
+2
-2
analyzer.rb
lib/cocoapods/installer/analyzer.rb
+0
-1
path_source_spec.rb
spec/unit/external_sources/path_source_spec.rb
+0
-10
external_sources_spec.rb
spec/unit/external_sources_spec.rb
+0
-6
No files found.
Gemfile.lock
View file @
b0d51847
...
@@ -7,7 +7,7 @@ GIT
...
@@ -7,7 +7,7 @@ GIT
GIT
GIT
remote: https://github.com/CocoaPods/Core.git
remote: https://github.com/CocoaPods/Core.git
revision:
9fd6c128f989655cf48b07f7145d73ad02ab0694
revision:
e5b64946f634fec8c99ed82a4da198f9ba1031fc
branch: seg-podfile-refactor
branch: seg-podfile-refactor
specs:
specs:
cocoapods-core (0.39.0)
cocoapods-core (0.39.0)
...
...
lib/cocoapods/external_sources.rb
View file @
b0d51847
...
@@ -46,10 +46,6 @@ module Pod
...
@@ -46,10 +46,6 @@ module Pod
PodspecSource
PodspecSource
elsif
params
.
key?
(
:path
)
elsif
params
.
key?
(
:path
)
PathSource
PathSource
elsif
params
.
key?
(
:local
)
UI
.
warn
'The `:local` option of the Podfile has been '
\
'renamed to `:path` and it is deprecated.'
PathSource
elsif
Downloader
.
strategy_from_options
(
params
)
elsif
Downloader
.
strategy_from_options
(
params
)
DownloaderSource
DownloaderSource
end
end
...
...
lib/cocoapods/external_sources/path_source.rb
View file @
b0d51847
...
@@ -24,7 +24,7 @@ module Pod
...
@@ -24,7 +24,7 @@ module Pod
# @see AbstractExternalSource#description
# @see AbstractExternalSource#description
#
#
def
description
def
description
"from `
#{
params
[
:path
]
||
params
[
:local
]
}
`"
"from `
#{
declared_path
}
`"
end
end
private
private
...
@@ -34,7 +34,7 @@ module Pod
...
@@ -34,7 +34,7 @@ module Pod
# @return [String] The path as declared by the user.
# @return [String] The path as declared by the user.
#
#
def
declared_path
def
declared_path
result
=
params
[
:path
]
||
params
[
:local
]
result
=
params
[
:path
]
result
.
to_s
if
result
result
.
to_s
if
result
end
end
...
...
lib/cocoapods/installer/analyzer.rb
View file @
b0d51847
...
@@ -482,7 +482,6 @@ module Pod
...
@@ -482,7 +482,6 @@ module Pod
deps_to_fetch_if_needed
=
deps_with_external_source
.
select
{
|
dep
|
result
.
podfile_state
.
unchanged
.
include?
(
dep
.
name
)
}
deps_to_fetch_if_needed
=
deps_with_external_source
.
select
{
|
dep
|
result
.
podfile_state
.
unchanged
.
include?
(
dep
.
name
)
}
deps_to_fetch
+=
deps_to_fetch_if_needed
.
select
do
|
dep
|
deps_to_fetch
+=
deps_to_fetch_if_needed
.
select
do
|
dep
|
sandbox
.
specification
(
dep
.
name
).
nil?
||
sandbox
.
specification
(
dep
.
name
).
nil?
||
!
dep
.
external_source
[
:local
].
nil?
||
!
dep
.
external_source
[
:path
].
nil?
||
!
dep
.
external_source
[
:path
].
nil?
||
!
sandbox
.
pod_dir
(
dep
.
root_name
).
directory?
||
!
sandbox
.
pod_dir
(
dep
.
root_name
).
directory?
||
checkout_requires_update?
(
dep
)
checkout_requires_update?
(
dep
)
...
...
spec/unit/external_sources/path_source_spec.rb
View file @
b0d51847
...
@@ -15,16 +15,6 @@ module Pod
...
@@ -15,16 +15,6 @@ module Pod
path
.
should
.
exist?
path
.
should
.
exist?
end
end
it
'supports the deprecated local key'
do
params
=
{
:local
=>
fixture
(
'integration/Reachability'
)
}
dependency
=
Dependency
.
new
(
'Reachability'
,
params
)
podfile_path
=
fixture
(
'integration/Podfile'
)
@subject
=
ExternalSources
.
from_dependency
(
dependency
,
podfile_path
)
@subject
.
fetch
(
config
.
sandbox
)
path
=
config
.
sandbox
.
specifications_root
+
'Reachability.podspec.json'
path
.
should
.
exist?
end
it
'returns the description'
do
it
'returns the description'
do
@subject
.
description
.
should
.
match
/from `.*integration\/Reachability`/
@subject
.
description
.
should
.
match
/from `.*integration\/Reachability`/
end
end
...
...
spec/unit/external_sources_spec.rb
View file @
b0d51847
...
@@ -19,12 +19,6 @@ module Pod
...
@@ -19,12 +19,6 @@ module Pod
klass
.
should
==
@subject
::
PathSource
klass
.
should
==
@subject
::
PathSource
end
end
it
'supports a path source specified with the legacy :local key'
do
dep
=
Dependency
.
new
(
'Reachability'
,
:local
=>
''
)
klass
=
@subject
.
from_dependency
(
dep
,
nil
).
class
klass
.
should
==
@subject
::
PathSource
end
it
'supports all the strategies implemented by the downloader'
do
it
'supports all the strategies implemented by the downloader'
do
[
:git
,
:svn
,
:hg
,
:bzr
,
:http
].
each
do
|
strategy
|
[
:git
,
:svn
,
:hg
,
:bzr
,
:http
].
each
do
|
strategy
|
dep
=
Dependency
.
new
(
'Reachability'
,
strategy
=>
''
)
dep
=
Dependency
.
new
(
'Reachability'
,
strategy
=>
''
)
...
...
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