Skip to content

Commit 4a62952

Browse files
committed
Require Dart 3.0.
1 parent 6e7ea14 commit 4a62952

File tree

9 files changed

+40
-45
lines changed

9 files changed

+40
-45
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
## 0.3.2
2-
- Allow Dart 3 in constraints.
3-
- Allow usage of `analyzer` `^5.0.0` and `^6.0.0`.
4-
- Removed constraints from `source_gen`.
1+
## 0.4.0
2+
- Require Dart 3,
3+
- `analyzer` version `^6.0.0`,
4+
- Removed dependency on ansicolor and meta.
55

66
## 0.3.1
77
- Amended description.

example/bin/player_example.dart

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:ansicolor/ansicolor.dart';
1+
import 'package:ansi_modifier/ansi_modifier.dart';
22
import 'package:exception_templates/exception_templates.dart';
33
import 'package:generic_reader/generic_reader.dart';
44
import 'package:source_gen/source_gen.dart' show ConstantReader;
@@ -76,11 +76,9 @@ Future<void> main() async {
7676
'constant of type `Column`.');
7777
});
7878

79-
final green = AnsiPen()..green(bold: true);
80-
8179
// Retrieve an instance of [String].
8280
final columnName = columnNameCR.get<String>();
83-
print(green('Retrieving a String:'));
81+
print('Retrieving a String:'.style(Ansi.green));
8482
print('columnName = \'$columnName\'');
8583
print('');
8684
// Prints:
@@ -89,7 +87,7 @@ Future<void> main() async {
8987

9088
// Retrieve an instance of [Column<Text>].
9189
final columnFirstName = firstNameCR.get<Column>();
92-
print(green('Retrieving a Column<Text>:'));
90+
print('Retrieving a Column<Text>:'.style(Ansi.green));
9391
print(columnFirstName);
9492
// Prints:
9593
// Retrieving a [Column<Text>]:
@@ -104,15 +102,15 @@ Future<void> main() async {
104102
final sponsors = sponsorsCR.getList<Sponsor>();
105103

106104
print('');
107-
print(green('Retrieving a List<Sponsor>:'));
105+
print('Retrieving a List<Sponsor>:'.style(Ansi.green));
108106
print(sponsors);
109107
// Prints:
110108
// Retrieving a [List<Sponsor>]:
111109
// [Sponsor: Johnson's, Sponsor: Smith Brothers]
112110

113111
final id = idCR.get<Column>();
114112
print('');
115-
print(green('Retrieving a Column<Integer>:'));
113+
print('Retrieving a Column<Integer>:'.style(Ansi.green));
116114
print(id);
117115
// Prints:
118116
// Retrieving a [Column<Integer>]:
@@ -121,16 +119,17 @@ Future<void> main() async {
121119

122120
final greek = greekCR.get<Greek>();
123121
print('');
124-
print(green('Retrieving an instance of the '
125-
'enumeration: Greek{alpha, beta}.'));
122+
print('Retrieving an instance of the '
123+
'enumeration: Greek{alpha, beta}.'
124+
.style(Ansi.green));
126125
print(greek);
127126
// Prints:
128127
// 'Retrieving an instance of the enumeration: Greek{alpha, beta}.'
129128
// Greek.alpha
130129

131130
final map = mapCR.getMap<String, dynamic>();
132131
print('');
133-
print(green('Retrieving a Map<String, dynamic>:'));
132+
print('Retrieving a Map<String, dynamic>:'.style(Ansi.green));
134133
print(map);
135134
// Prints:
136135
// 'Retrieving a Map<String, dynamic>:'
@@ -139,7 +138,7 @@ Future<void> main() async {
139138
GenericReader.addDecoder<Greek>((cr) => cr.get<Greek>());
140139
final mapWithEnumEntry = mapWithEnumEntryCR.getMap<String, dynamic>();
141140
print('');
142-
print(green('Retrieving a Map<String, dynamic>:'));
141+
print('Retrieving a Map<String, dynamic>:'.style(Ansi.green));
143142
print(mapWithEnumEntry);
144143
// Prints:
145144
// 'Retrieving a Map<String, dynamic>:'
@@ -150,6 +149,6 @@ Future<void> main() async {
150149
GenericReader.addDecoder<List<int>>((cr) => cr.getList<int>());
151150

152151
final list = listCR.getList<List<int>>();
153-
print(green('\nRetrieving a List<List<int>>'));
152+
print('\nRetrieving a List<List<int>>'.style(Ansi.green));
154153
print(list);
155154
}

example/bin/user_example.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:analyzer/dart/element/element.dart';
2-
import 'package:ansicolor/ansicolor.dart';
2+
import 'package:ansi_modifier/ansi_modifier.dart';
33
import 'package:generic_reader/generic_reader.dart';
44
import 'package:source_gen/source_gen.dart' show ConstantReader;
55
import 'package:source_gen_test/source_gen_test.dart';
@@ -35,7 +35,7 @@ User userDecoder(ConstantReader constantReader) {
3535
/// of a compile-time constant expression
3636
/// represented by a [ConstantReader].
3737
Future<void> main() async {
38-
final green = AnsiPen()..green(bold: true);
38+
final green = Ansi.green + Ansi.bold;
3939

4040
/// Reading libraries.
4141
print('Reading example/src/user_instance.dart ...');
@@ -60,7 +60,7 @@ Future<void> main() async {
6060
GenericReader.addDecoder<Name>(nameDecoder);
6161
GenericReader.addDecoder<User>(userDecoder);
6262

63-
print(green('Retrieving a constant of type <User>:'));
63+
print('Retrieving a constant of type <User>:'.style(green));
6464
if (userCR != null) {
6565
print(userCR.get<User>());
6666
}

example/bin/wrapper_example.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:analyzer/dart/element/element.dart';
2-
import 'package:ansicolor/ansicolor.dart';
2+
import 'package:ansi_modifier/ansi_modifier.dart';
33
import 'package:generic_reader/generic_reader.dart';
44
import 'package:source_gen/source_gen.dart'; // show ConstantReader;
55
import 'package:source_gen_test/src/init_library_reader.dart';
@@ -33,15 +33,15 @@ Future<void> main() async {
3333
}
3434
}
3535

36-
final green = AnsiPen()..green(bold: true);
36+
final green = Ansi.bold + Ansi.green;
3737

3838
// Adding a decoder function for type [Wrapper].
3939
GenericReader.addDecoder<Wrapper>((ConstantReader cr) {
4040
return Wrapper(cr.read('value').get<dynamic>());
4141
});
4242

4343
print('');
44-
print(green('Retrieving a Wrapper<dynamic>:'));
44+
print('Retrieving a Wrapper<dynamic>:'.style(green));
4545
if (wrapperCR == null) {
4646
print('Could not read constant of type Wrapper<dynamic>');
4747
return;

example/test_types/pubspec.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ version: 0.0.2
77
publish_to: none
88

99
environment:
10-
sdk: '>=2.19.0 <3.0.0'
10+
sdk: '^3.0.0'
1111

1212
dependencies:
13-
meta: ^1.9.0
14-
13+
1514
dev_dependencies:
16-
lints: ^2.0.1
15+
lints: ^2.1.1

lib/src/extensions/generic_reader.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:mirrors';
33
import 'package:source_gen/source_gen.dart' show ConstantReader, TypeChecker;
44

55
import 'package:analyzer/dart/element/type.dart'
6-
show DartType, ParameterizedType;
6+
show DartType, DynamicType, ParameterizedType;
77
import 'package:exception_templates/exception_templates.dart';
88

99
import '../decoders/decoders.dart';
@@ -61,7 +61,7 @@ extension GenericReader on ConstantReader {
6161
if (dartType.isDartCoreInt) return int;
6262
if (dartType.isDartCoreDouble) return double;
6363
if (dartType.isDartCoreNum) return num;
64-
if (dartType.isDynamic) return dynamic;
64+
if (dartType is DynamicType) return dynamic;
6565
if (dartType.isDartCoreNull) return Null;
6666
if (dartType.isDartCoreSymbol) return Symbol;
6767
return _resolvedTypes[dartType] ?? UnknownType;
@@ -118,7 +118,7 @@ extension GenericReader on ConstantReader {
118118
if (dartType == null) return false;
119119
if (resolveType(dartType) == type) return true;
120120
if (type == dynamic) {
121-
return dartType.isDynamic ? true : false;
121+
return dartType is DynamicType ? true : false;
122122
}
123123
// Dart:mirrors must not be used with type `dynamic`.
124124
final checker = _checkers[type] ?? TypeChecker.fromRuntime(type);

lib/src/extensions/type_methods.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:source_gen/source_gen.dart' show ConstantReader;
55
extension TypeMethods on ConstantReader {
66
/// Returns `true` if `this` represents a constant expression
77
/// with type `dynamic`.
8-
bool get isDynamic => objectValue.type?.isDynamic ?? false;
8+
bool get isDynamic => objectValue.type is DynamicType;
99

1010
/// Returns `true` is `this` represents a constant expression with
1111
/// type exactly `Iterable`.

lib/src/types/unknown_type.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
import 'package:meta/meta.dart';
1+
/// A type is not registered and cannot be registered with GenericReader.
22
3-
/// A sealed type that is not and cannot be registered with GenericReader.
4-
@sealed
5-
class UnknownType {
3+
final class UnknownType {
64
const UnknownType();
75

86
@override

pubspec.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
name: generic_reader
22

3-
description: Extension providing methods for the systematic reading of
4-
enums, constant lists, maps, sets, and generic compile-time constant expressions.
3+
description: Extension providing methods for the systematic reading of enums,
4+
constant lists, maps, sets, and generic compile-time constant expressions.
55

6-
version: 0.3.2
6+
version: 0.4.0
77

88
homepage: https://github.com/simphotonics/generic_reader
99

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

1313
dependencies:
14-
analyzer: '>=5.2.0 <7.0.0'
15-
exception_templates: ^0.2.4
16-
meta: ^1.9.0
17-
source_gen: any
14+
analyzer: ^6.2.0
15+
exception_templates: ^0.3.0
16+
source_gen: ^1.4.0
1817

1918
dev_dependencies:
20-
ansicolor: ^2.0.1
21-
lints: ^2.0.1
19+
ansi_modifier: ^0.1.1
20+
lints: ^2.1.1
2221
source_gen_test: ^1.0.4
23-
test: ^1.22.2
22+
test: ^1.24.6
2423
test_types:
2524
path: example/test_types

0 commit comments

Comments
 (0)