Commit 6333b0b2 authored by Eloy Duran's avatar Eloy Duran

Cleanup and pass a path to File.basename, not a File instance.

parent 7e2dbedd
...@@ -17,11 +17,6 @@ module Pod ...@@ -17,11 +17,6 @@ module Pod
config.project_root + 'Podfile.lock' config.project_root + 'Podfile.lock'
end end
def dependency_specifications
# Resolve *all* dependencies first.
@dependency_specifications ||= @resolver.resolve
end
def project def project
return @project if @project return @project if @project
@project = Pod::Project.for_platform(@podfile.platform) @project = Pod::Project.for_platform(@podfile.platform)
......
...@@ -9,10 +9,6 @@ module Pod ...@@ -9,10 +9,6 @@ module Pod
@podfile, @project, @target_definition = podfile, project, target_definition @podfile, @project, @target_definition = podfile, project, target_definition
end end
def dependency_specifications
@dependency_specifications ||= @resolver.resolve(@definition.dependencies)
end
def xcconfig def xcconfig
@xcconfig ||= Xcodeproj::Config.new({ @xcconfig ||= Xcodeproj::Config.new({
# In a workspace this is where the static library headers should be found. # In a workspace this is where the static library headers should be found.
......
...@@ -59,6 +59,7 @@ module Pod ...@@ -59,6 +59,7 @@ module Pod
workspace << path unless workspace.include?(path) workspace << path unless workspace.include?(path)
end end
workspace.save_as(workspace_path) workspace.save_as(workspace_path)
workspace_path
end end
def project_already_integrated?(project) def project_already_integrated?(project)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment