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.

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

Dart 2.19 #35

Merged
merged 5 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dart_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
sdk: [ 2.18.7, stable ]
sdk: [ 2.18.7, 2.19.6 ]
steps:
- uses: actions/checkout@v2
- uses: dart-lang/setup-dart@v1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM drydock-prod.workiva.net/workiva/dart2_base_image:1
FROM drydock-prod.workiva.net/workiva/dart2_base_image:2
WORKDIR /build/
ADD pubspec.yaml .
RUN dart pub get
Expand Down
1 change: 0 additions & 1 deletion lib/src/sse_proxy_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ class SseProxyHandler {
sink.close();
});
});
return shelf.Response.notFound('');
}

Future<shelf.Response> _handle(shelf.Request req) async {
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ description: >
routing by rewriting 404s to the root index.

environment:
sdk: '>=2.12.0 <3.0.0'
sdk: '>=2.18.0 <3.0.0'

dependencies:
args: ^2.3.1
Expand Down
9 changes: 5 additions & 4 deletions test/chromedriver_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:io';

import 'package:test/test.dart';
import 'package:webdev_proxy/src/port_utils.dart';
import 'package:webdriver/io.dart' as wd;
import 'package:webdriver/async_io.dart' as wd;

const chromeDriverPort = 4444;
const chromeDriverUrlBase = 'wd/hub';
Expand All @@ -18,8 +18,8 @@ Future<void> startChromeDriver() async {
}
});

// On windows this takes a while to boot up, wait for the first line
// of stdout as a signal that it is ready.
// On windows this takes a while to boot up, wait for a message on stdout
// indicating ChromeDriver started successfully.
final stdOutLines = chromeDriver.stdout
.transform(utf8.decoder)
.transform(LineSplitter())
Expand All @@ -33,7 +33,8 @@ Future<void> startChromeDriver() async {
stdOutLines.listen((line) => print('ChromeDriver stdout: $line'));
stdErrLines.listen((line) => print('ChromeDriver stderr: $line'));

await stdOutLines.first;
await stdOutLines.firstWhere(
(line) => line.contains('ChromeDriver was started successfully'));
} catch (e) {
throw StateError(
'Could not start ChromeDriver. Is it installed?\nError: $e');
Expand Down
2 changes: 1 addition & 1 deletion test/sse_proxy_handler_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:shelf_static/shelf_static.dart';
import 'package:sse/server/sse_handler.dart';
import 'package:test/test.dart';
import 'package:webdev_proxy/src/port_utils.dart';
import 'package:webdriver/io.dart';
import 'package:webdriver/async_io.dart';

import 'package:webdev_proxy/src/sse_proxy_handler.dart';

Expand Down
Loading