Skip to content

Commit

Permalink
Bump deps, prepare v5.4.5 (#789)
Browse files Browse the repository at this point in the history
Also un-archive this repo - for now
  • Loading branch information
kevmoo authored Dec 18, 2024
1 parent 9604823 commit abf01d3
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 31 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ jobs:
strategy:
fail-fast: false
matrix:
# TODO(srawlins): Re-enable stable Dart when 3.6.0 is available.
#sdk: [3.5.0, dev]
sdk: [dev]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Expand All @@ -51,7 +49,7 @@ jobs:
- name: Build generated artifacts
run: dart pub run build_runner build
- name: Analyze code
run: dart analyze
run: dart analyze --fatal-infos

# Run tests against stable and dev SDKs.
test:
Expand All @@ -61,9 +59,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
# TODO(srawlins): Re-enable stable Dart when 3.6.0 is available.
#sdk: [3.5.0, dev]
sdk: [dev]
sdk: [3.6.0, dev]
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
Expand Down
10 changes: 5 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* Ignore "must_be_immutable" warning in generated files. Mocks cannot be made
immutable anyway, but this way users aren't prevented from using generated
mocks altogether.
* Require Dart SDK ^3.6.0-0.
* Require analyzer ^6.9.0.
* Require build_runner ^2.4.11.
* Require dart_style ^2.3.7, so that the current Dart language version can be
passed to `DartFormatter`.
* Require Dart SDK ^3.6.0.
* Require `analyzer: '>=6.9.0 <8.0.0'`.
* Require `dart_style: '>=2.3.7 <4.0.0'`, so that the current Dart language
version can be passed to `DartFormatter`.
* Require `source_gen: ">=1.4.0 <3.0.0"`.
* Add support for extension types.
* Add topics to `pubspec.yaml`.
* Fix a bug where type aliases in type arguments were not correctly
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
> [!IMPORTANT]
> This repo has moved to https://github.com/dart-lang/test/tree/master/pkgs/mockito
[![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)
[![Pub](https://img.shields.io/pub/v/mockito.svg)](https://pub.dev/packages/mockito)
[![package publisher](https://img.shields.io/pub/publisher/mockito.svg)](https://pub.dev/packages/mockito/publisher)
Expand Down
2 changes: 2 additions & 0 deletions lib/mockito.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// ignore_for_file: combinators_ordering

// ignore: deprecated_member_use
export 'package:test_api/fake.dart' show Fake;

Expand Down
4 changes: 2 additions & 2 deletions lib/src/builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1707,8 +1707,8 @@ class _MockClassInfo {
..initializers.add(refer('super')
.call([refer('parent'), refer('parentInvocation')]).code)));

final toStringMethod =
elementToFake.lookUpMethod('toString', elementToFake.library);
final toStringMethod = elementToFake.augmented
.lookUpMethod(name: 'toString', library: elementToFake.library);
if (toStringMethod != null && toStringMethod.parameters.isNotEmpty) {
// If [elementToFake] includes an overriding `toString` implementation,
// we need to include an implementation which matches the signature.
Expand Down
30 changes: 15 additions & 15 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ topics:
- mocking

environment:
sdk: ^3.6.0-0
sdk: ^3.6.0

dependencies:
analyzer: '>=6.9.0 <7.0.0'
build: ^2.0.0
analyzer: '>=6.9.0 <8.0.0'
build: ^2.4.1
code_builder: ^4.5.0
collection: ^1.15.0
dart_style: ^2.3.7
matcher: ^0.12.15
meta: ^1.3.0
path: ^1.8.0
source_gen: ^1.0.0
test_api: '>=0.2.1 <0.8.0'
collection: ^1.19.0
dart_style: '>=2.3.7 <4.0.0'
matcher: ^0.12.16
meta: ^1.15.0
path: ^1.9.0
source_gen: ">=1.4.0 <3.0.0"
test_api: ">=0.6.1 <0.8.0"

dev_dependencies:
build_runner: ^2.4.11
build_test: ^2.0.0
build_web_compilers: '>=3.0.0 <5.0.0'
build_test: ^2.1.7
build_web_compilers: ^4.0.11
http: ^1.0.0
lints: ^3.0.0
package_config: ^2.0.0
test: ^1.16.0
lints: ^5.1.0
package_config: ^2.1.0
test: ^1.24.4
2 changes: 2 additions & 0 deletions test/builder/auto_mocks_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// limitations under the License.

@TestOn('vm')
library;

import 'dart:convert' show utf8;

import 'package:build/build.dart';
Expand Down
2 changes: 2 additions & 0 deletions test/builder/custom_mocks_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
// limitations under the License.

@TestOn('vm')
library;

import 'dart:convert' show utf8;

import 'package:build/build.dart';
Expand Down

0 comments on commit abf01d3

Please sign in to comment.