Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not consider podspec_repo when analying sandbox for changes. #10985

Merged
merged 1 commit into from Mar 8, 2022
Merged

Do not consider podspec_repo when analying sandbox for changes. #10985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -12,6 +12,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* Do not consider podspec_repo when analying sandbox for changes.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#10985](https://github.com/CocoaPods/CocoaPods/pull/10985)

* Rewrite XCFramework slice selection using plist metadata.
[Igor Makarov](https://github.com/igor-makarov)
[#11229](https://github.com/CocoaPods/CocoaPods/pull/11229)
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/installer/analyzer.rb
View file
Open in desktop
Expand Up @@ -125,7 +125,7 @@ def analyze(allow_fetches = true)
validate_platforms(resolver_specs_by_target)
specifications = generate_specifications(resolver_specs_by_target)
aggregate_targets, pod_targets = generate_targets(resolver_specs_by_target, target_inspections)
sandbox_state = generate_sandbox_state(specifications)
sandbox_state = generate_sandbox_state(specifications)
specs_by_target = resolver_specs_by_target.each_with_object({}) do |rspecs_by_target, hash|
hash[rspecs_by_target[0]] = rspecs_by_target[1].map(&:spec)
end
Expand Down
3 changes: 2 additions & 1 deletion lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
View file
Open in desktop
Expand Up @@ -145,7 +145,8 @@ def pod_changed?(pod)
return true if spec.version != sandbox_version(pod)
return true if spec.checksum != sandbox_checksum(pod)
return true if resolved_spec_names(pod) != sandbox_spec_names(pod)
return true if podfile_dependency(pod) != sandbox_dependency(pod)
podfile_dep = podfile_dependency(pod)&.tap { |dep| dep.podspec_repo = nil }
igor-makarov marked this conversation as resolved.
Show resolved Hide resolved
return true if podfile_dep != sandbox_dependency(pod)
return true if sandbox.predownloaded?(pod)
return true if folder_empty?(pod)
false
Expand Down
9 changes: 9 additions & 0 deletions spec/unit/installer/analyzer/sandbox_analyzer_spec.rb
View file
Open in desktop
Expand Up @@ -92,6 +92,15 @@ module Pod
@analyzer.stubs(:podfile_dependency).returns(dep2)
@analyzer.send(:pod_changed?, 'BananaLib').should == true
end

it 'does not consider the podspec repo on whether a dependency has changed' do
dep1 = Dependency.new('BananaLib')
dep2 = Dependency.new('BananaLib')
dep2.podspec_repo = 'https://some/repo/my_repo.git'
@analyzer.stubs(:sandbox_dependency).returns(dep1)
@analyzer.stubs(:podfile_dependency).returns(dep2)
@analyzer.send(:pod_changed?, 'BananaLib').should == false
end
end

#-------------------------------------------------------------------------#
Expand Down