Skip to content

Commit 3dc415a

Browse files
authored
Merge pull request #46 from Workiva/_testing_
Newer deps to get to analyzer 6
2 parents 9fe3d6e + ac5dea4 commit 3dc415a

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.1.12
2+
3+
- Update ranges of dependencies so that in Dart 3 we can resolve to analyzer 6, while still working with Dart 2.19. https://github.com/Workiva/webdev_proxy/pull/46
4+
15
## 0.1.11
26

37
- Update webdev installation message to use `dart pub global activate` rather

pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212

1313
dependencies:
1414
args: ^2.3.1
15-
http: ^0.13.3
15+
http: '>=0.13.3 <2.0.0'
1616
http_multi_server: ^3.2.1
1717
io: ^1.0.3
1818
logging: ^1.1.0
@@ -25,8 +25,8 @@ dependencies:
2525
dev_dependencies:
2626
# These two build deps are required by webdev.
2727
build_runner: ^2.1.2
28-
build_web_compilers: ^3.0.0
29-
lints: ^2.0.1
28+
build_web_compilers: '>3.0.0 <5.0.0'
29+
lints: '>=2.0.1 <5.0.0'
3030

3131
shelf_static: ^1.1.0
3232
sse: ^4.1.0

test/sse_proxy_handler_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ void main() {
128128
await webdriver.get('http://localhost:${proxy.port}');
129129
await serverSse.connections.next;
130130
expect(serverSse.numberOfClients, 1);
131-
132-
await webdriver.get('chrome://version/');
131+
await webdriver.quit();
133132
expect(serverSse.numberOfClients, 0);
134133
});
135134
}

test/webdev_proc_utils_test.dart

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// limitations under the License.
1414

1515
@TestOn('vm')
16+
import 'dart:io';
17+
1618
import 'package:pub_semver/pub_semver.dart';
1719
import 'package:test/test.dart';
1820

@@ -36,8 +38,15 @@ void main() {
3638
});
3739

3840
test('with webdev activated', () async {
39-
await activateWebdev('2.0.0');
40-
expect(getGlobalWebdevVersion(), Version.parse('2.0.0'));
41+
if (Platform.version.contains('2.19')) {
42+
await activateWebdev('2.0.0');
43+
expect(getGlobalWebdevVersion(), Version.parse('2.0.0'));
44+
} else if (Platform.version.contains('3.')) {
45+
await activateWebdev('3.0.0');
46+
expect(getGlobalWebdevVersion(), Version.parse('3.0.0'));
47+
} else {
48+
throw Exception('Unsupported Dart version: ${Platform.version}');
49+
}
4150
});
4251
});
4352

0 commit comments

Comments
 (0)