-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
fix: remove dependency_overrides from temporary pubspec.yaml #199
Merged
devmil
merged 3 commits into
bmw-tech:main
from
devmil:fix/handle_dependency_overrides_in_pub_packages
Dec 9, 2024
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -5,6 +5,7 @@ import 'package:args/args.dart'; | |||||
import 'package:dart_apitool/api_tool.dart'; | ||||||
import 'package:dart_apitool/src/cli/source_item.dart'; | ||||||
import 'package:path/path.dart' as p; | ||||||
import 'package:pubspec_manager/pubspec_manager.dart'; | ||||||
|
||||||
import '../package_ref.dart'; | ||||||
import '../prepared_package_ref.dart'; | ||||||
|
@@ -175,6 +176,25 @@ OBSOLETE: Has no effect anymore. | |||||
await Directory(exampleDirPath).delete(recursive: true); | ||||||
} | ||||||
|
||||||
// remove any dependency overrides from the pubspec.yaml | ||||||
final pubspecFile = File(p.join(packagePath, 'pubspec.yaml')); | ||||||
if (pubspecFile.existsSync()) { | ||||||
try { | ||||||
final pubSpec = PubSpec.load(directory: packagePath); | ||||||
// removeAll of dependencyOverrides has an issue in the current version of pubspec_manager | ||||||
// as it doesn't remove the section part of the dependency overrides and therefore are not removed | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
// in the saved version of the pubspec.yaml file | ||||||
// workaround: remove all dependency overrides manually | ||||||
for (final depOverride in pubSpec.dependencyOverrides.list) { | ||||||
pubSpec.dependencyOverrides.remove(depOverride.name); | ||||||
} | ||||||
pubSpec.save(); | ||||||
} catch (e) { | ||||||
await stdoutSession.writeln( | ||||||
'Error removing dependency overrides from pubspec.yaml: $e'); | ||||||
} | ||||||
} | ||||||
|
||||||
// Check if the package_config.json is already present from the preparation step | ||||||
final packageConfig = File(_getPackageConfigPathForPackage(packagePath)); | ||||||
if (!packageConfig.existsSync()) { | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.