@@ -52,7 +52,7 @@ void main(List<String> arguments) async {
52
52
53
53
int exitCode;
54
54
if (isReset == true ) {
55
- exitCode = runReset (
55
+ exitCode = await runReset (
56
56
package: package,
57
57
newVersion: newVersion,
58
58
);
@@ -68,7 +68,7 @@ void main(List<String> arguments) async {
68
68
}
69
69
}
70
70
71
- int runReset ({
71
+ Future < int > runReset ({
72
72
required String package,
73
73
String ? newVersion,
74
74
}) {
@@ -81,7 +81,13 @@ int runReset({
81
81
Current version is $currentVersion .
82
82
''' ,
83
83
);
84
- return 1 ;
84
+ return Future .value (1 );
85
+ }
86
+
87
+ // Add the dependency overrides of DWDS back for webdev:
88
+ if (package == 'webdev' ) {
89
+ _updateOverrides ('webdev' , includeOverrides: true );
90
+ _updateOverrides ('test_common' , includeOverrides: true );
85
91
}
86
92
87
93
// Update the version strings in CHANGELOG and pubspec.yaml.
@@ -92,7 +98,9 @@ int runReset({
92
98
isReset: true ,
93
99
);
94
100
95
- return 0 ;
101
+ // Build the package.
102
+ final exitCode = _buildPackage (package);
103
+ return exitCode;
96
104
}
97
105
98
106
Future <int > runRelease ({
@@ -116,10 +124,15 @@ Future<int> runRelease({
116
124
}
117
125
}
118
126
119
- // Update the pinned version of DWDS for webdev releases.
120
127
if (package == 'webdev' ) {
128
+ // Update the pinned version of DWDS for webdev releases.
121
129
_logInfo ('Updating pinned version of DWDS.' );
122
- await _updateDwdsPin (package);
130
+ await _updateDwdsPin ('webdev' );
131
+ 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
+ _updateOverrides ('test_common' , includeOverrides: false );
123
136
}
124
137
125
138
// Run dart pub upgrade.
@@ -175,6 +188,19 @@ Future<int> _buildPackage(String package) async {
175
188
return buildProcess.exitCode;
176
189
}
177
190
191
+ void _updateOverrides (
192
+ String package, {
193
+ required bool includeOverrides,
194
+ }) {
195
+ final overridesFilePath = '../$package /pubspec_overrides.yaml' ;
196
+ final noOverridesFilePath = '../$package /ignore_pubspec_overrides.yaml' ;
197
+ if (includeOverrides) {
198
+ File (noOverridesFilePath).rename (overridesFilePath);
199
+ } else {
200
+ File (overridesFilePath).rename (noOverridesFilePath);
201
+ }
202
+ }
203
+
178
204
void _updateVersionStrings (
179
205
String package, {
180
206
required String nextVersion,
0 commit comments