Skip to content

Commit 23fe0b6

Browse files
committed
Bump deps, prepare v5.4.5
Also un-archive this repo - for now
1 parent 9604823 commit 23fe0b6

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
lines changed

.github/workflows/test-package.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
# TODO(srawlins): Re-enable stable Dart when 3.6.0 is available.
41-
#sdk: [3.5.0, dev]
4240
sdk: [dev]
4341
steps:
4442
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -51,7 +49,7 @@ jobs:
5149
- name: Build generated artifacts
5250
run: dart pub run build_runner build
5351
- name: Analyze code
54-
run: dart analyze
52+
run: dart analyze --fatal-infos
5553

5654
# Run tests against stable and dev SDKs.
5755
test:
@@ -61,9 +59,7 @@ jobs:
6159
fail-fast: false
6260
matrix:
6361
os: [ubuntu-latest]
64-
# TODO(srawlins): Re-enable stable Dart when 3.6.0 is available.
65-
#sdk: [3.5.0, dev]
66-
sdk: [dev]
62+
sdk: [3.6.0, dev]
6763
steps:
6864
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
6965
- uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* Ignore "must_be_immutable" warning in generated files. Mocks cannot be made
44
immutable anyway, but this way users aren't prevented from using generated
55
mocks altogether.
6-
* Require Dart SDK ^3.6.0-0.
7-
* Require analyzer ^6.9.0.
8-
* Require build_runner ^2.4.11.
9-
* Require dart_style ^2.3.7, so that the current Dart language version can be
10-
passed to `DartFormatter`.
6+
* Require Dart SDK ^3.6.0.
7+
* Require `analyzer: '>=6.9.0 <8.0.0'`.
8+
* Require `dart_style: '>=2.3.7 <4.0.0'`, so that the current Dart language
9+
version can be passed to `DartFormatter`.
10+
* Require `source_gen: ">=1.4.0 <3.0.0"`.
1111
* Add support for extension types.
1212
* Add topics to `pubspec.yaml`.
1313
* Fix a bug where type aliases in type arguments were not correctly

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
> [!IMPORTANT]
2-
> This repo has moved to https://github.com/dart-lang/test/tree/master/pkgs/mockito
3-
41
[![Dart CI](https://github.com/dart-lang/mockito/actions/workflows/test-package.yml/badge.svg)](https://github.com/dart-lang/mockito/actions/workflows/test-package.yml)
52
[![Pub](https://img.shields.io/pub/v/mockito.svg)](https://pub.dev/packages/mockito)
63
[![package publisher](https://img.shields.io/pub/publisher/mockito.svg)](https://pub.dev/packages/mockito/publisher)

lib/mockito.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// ignore_for_file: combinators_ordering
16+
1517
// ignore: deprecated_member_use
1618
export 'package:test_api/fake.dart' show Fake;
1719

lib/src/builder.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1707,8 +1707,8 @@ class _MockClassInfo {
17071707
..initializers.add(refer('super')
17081708
.call([refer('parent'), refer('parentInvocation')]).code)));
17091709

1710-
final toStringMethod =
1711-
elementToFake.lookUpMethod('toString', elementToFake.library);
1710+
final toStringMethod = elementToFake.augmented
1711+
.lookUpMethod(name: 'toString', library: elementToFake.library);
17121712
if (toStringMethod != null && toStringMethod.parameters.isNotEmpty) {
17131713
// If [elementToFake] includes an overriding `toString` implementation,
17141714
// we need to include an implementation which matches the signature.

pubspec.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ topics:
1010
- mocking
1111

1212
environment:
13-
sdk: ^3.6.0-0
13+
sdk: ^3.6.0
1414

1515
dependencies:
16-
analyzer: '>=6.9.0 <7.0.0'
17-
build: ^2.0.0
16+
analyzer: '>=6.9.0 <8.0.0'
17+
build: ^2.4.1
1818
code_builder: ^4.5.0
19-
collection: ^1.15.0
20-
dart_style: ^2.3.7
21-
matcher: ^0.12.15
22-
meta: ^1.3.0
23-
path: ^1.8.0
24-
source_gen: ^1.0.0
25-
test_api: '>=0.2.1 <0.8.0'
19+
collection: ^1.19.0
20+
dart_style: '>=2.3.7 <4.0.0'
21+
matcher: ^0.12.16
22+
meta: ^1.15.0
23+
path: ^1.9.0
24+
source_gen: ">=1.4.0 <3.0.0"
25+
test_api: ">=0.6.1 <0.8.0"
2626

2727
dev_dependencies:
2828
build_runner: ^2.4.11
29-
build_test: ^2.0.0
30-
build_web_compilers: '>=3.0.0 <5.0.0'
29+
build_test: ^2.1.7
30+
build_web_compilers: ^4.0.11
3131
http: ^1.0.0
32-
lints: ^3.0.0
33-
package_config: ^2.0.0
34-
test: ^1.16.0
32+
lints: ^5.1.0
33+
package_config: ^2.1.0
34+
test: ^1.24.4

test/builder/auto_mocks_test.dart

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

1515
@TestOn('vm')
16+
library;
17+
1618
import 'dart:convert' show utf8;
1719

1820
import 'package:build/build.dart';

test/builder/custom_mocks_test.dart

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

1515
@TestOn('vm')
16+
library;
17+
1618
import 'dart:convert' show utf8;
1719

1820
import 'package:build/build.dart';

0 commit comments

Comments
 (0)