Skip to content

Commit 1c37128

Browse files
authored
Require Dart 2.19, latest lints, support latest pkg:http (#360)
1 parent e7bab95 commit 1c37128

File tree

34 files changed

+232
-126
lines changed

34 files changed

+232
-126
lines changed

.github/workflows/dart.yml

Lines changed: 53 additions & 53 deletions
Large diffs are not rendered by default.

pkgs/shelf/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.4.2-dev
2+
3+
* Require Dart >= 2.19
4+
15
## 1.4.1
26

37
* Added package topics to the pubspec file.

pkgs/shelf/lib/shelf_io.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
/// (the default), streamed responses will be buffered to improve performance.
2020
/// If `false`, all chunks will be pushed over the wire as they're received.
2121
/// See [HttpResponse.bufferOutput] for more information.
22+
library;
23+
2224
import 'dart:async';
2325
import 'dart:io';
2426

pkgs/shelf/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: shelf
2-
version: 1.4.1
2+
version: 1.4.2-dev
33
description: >
44
A model for web server middleware that encourages composition and easy reuse.
55
repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf
@@ -9,7 +9,7 @@ topics:
99
- shelf
1010

1111
environment:
12-
sdk: '>=2.17.0 <3.0.0'
12+
sdk: '>=2.19.0 <3.0.0'
1313

1414
dependencies:
1515
async: ^2.5.0
@@ -20,6 +20,6 @@ dependencies:
2020
stream_channel: ^2.1.0
2121

2222
dev_dependencies:
23-
dart_flutter_team_lints: ^0.1.0
24-
http: ^0.13.0
23+
dart_flutter_team_lints: ^1.0.0
24+
http: '>=0.13.0 <2.0.0'
2525
test: ^1.16.0

pkgs/shelf/test/io_server_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
@TestOn('vm')
6+
library;
7+
68
import 'dart:async';
79
import 'dart:io';
810

pkgs/shelf/test/shelf_io_test.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
@TestOn('vm')
6+
library;
7+
68
import 'dart:async';
79
import 'dart:convert';
810
import 'dart:io';

pkgs/shelf_packages_handler/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 3.0.3-dev
2+
3+
* Require Dart `2.19`.
4+
15
## 3.0.2
26

37
* Added package topics to the pubspec file.

pkgs/shelf_packages_handler/lib/shelf_packages_handler.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
library shelf_packages_handler;
6-
75
import 'package:shelf/shelf.dart';
86

97
import 'src/dir_handler.dart';
@@ -31,4 +29,4 @@ Handler packagesHandler({Map<String, Uri>? packageMap}) =>
3129
/// This is useful for ensuring that `package:` imports work for all entrypoints
3230
/// in Dartium.
3331
Handler packagesDirHandler({Map<String, Uri>? packageMap}) =>
34-
DirHandler('packages', packagesHandler(packageMap: packageMap));
32+
DirHandler('packages', packagesHandler(packageMap: packageMap)).call;

pkgs/shelf_packages_handler/lib/src/dir_handler.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
library shelf_packages_handler.dir_handler;
6-
75
import 'dart:async';
86

97
import 'package:path/path.dart' as p;
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: shelf_packages_handler
2-
version: 3.0.2
2+
version: 3.0.3-dev
33
description: A shelf handler for serving a `packages/` directory.
44
repository: https://github.com/dart-lang/shelf/tree/master/pkgs/shelf_packages_handler
55

@@ -8,13 +8,13 @@ topics:
88
- shelf
99

1010
environment:
11-
sdk: '>=2.17.0 <3.0.0'
11+
sdk: '>=2.19.0 <3.0.0'
1212

1313
dependencies:
1414
path: ^1.8.0
1515
shelf: ^1.0.0
1616
shelf_static: ^1.0.0
1717

1818
dev_dependencies:
19-
dart_flutter_team_lints: ^0.1.0
19+
dart_flutter_team_lints: ^1.0.0
2020
test: ^1.16.0

0 commit comments

Comments
 (0)