@@ -84,9 +84,12 @@ Future<int> runReset({
84
84
return Future .value (1 );
85
85
}
86
86
87
- // Add the dependency overrides of DWDS back for webdev:
87
+ // Reset the dependency overrides for the package:
88
+ _updateOverrides (package, includeOverrides: true );
89
+
90
+ // If updating webdev, also reset the dwds override for test_common to prevent
91
+ // conflicts:
88
92
if (package == 'webdev' ) {
89
- _updateOverrides ('webdev' , includeOverrides: true );
90
93
_updateOverrides ('test_common' , includeOverrides: true );
91
94
}
92
95
@@ -124,14 +127,20 @@ Future<int> runRelease({
124
127
}
125
128
}
126
129
130
+ // Update the pinned version of DWDS for webdev releases.
127
131
if (package == 'webdev' ) {
128
- // Update the pinned version of DWDS for webdev releases.
129
132
_logInfo ('Updating pinned version of DWDS.' );
130
133
await _updateDwdsPin ('webdev' );
131
134
await _updateDwdsPin ('test_common' );
132
- // Remove the dependency overrides of DWDS for webdev releases:
133
- _logInfo ('Removing dependency overrides of DWDS.' );
134
- _updateOverrides ('webdev' , includeOverrides: false );
135
+ }
136
+
137
+ // Remove any dependency overrides for the package:
138
+ _logInfo ('Removing dependency overrides for $package .' );
139
+ _updateOverrides (package, includeOverrides: false );
140
+
141
+ // If updating webdev, also remove the dwds override for test_common to
142
+ // prevent conflicts:
143
+ if (package == 'webdev' ) {
135
144
_updateOverrides ('test_common' , includeOverrides: false );
136
145
}
137
146
0 commit comments