Skip to content

Commit 3673391

Browse files
authored
update to build 0.7.0 (#128)
1 parent f811322 commit 3673391

File tree

4 files changed

+20
-22
lines changed

4 files changed

+20
-22
lines changed

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.5.4
2+
3+
* Update to latest `build`, `build_runner`, and `build_test` releases.
4+
15
## 0.5.3+2
26

37
* BugFix: Always release the Resolver instance, even when generation does not
@@ -55,7 +59,7 @@
5559

5660
## 0.5.1
5761

58-
* Added GeneratorBuilder option isStandalone to generate files that aren't
62+
* Added GeneratorBuilder option isStandalone to generate files that aren't
5963
part of source file.
6064

6165
## 0.5.0+3
@@ -86,7 +90,7 @@
8690
files via the `BuildStep` class, and that is now also provided to
8791
`Generator#generate` and `GeneratorForAnnotation#generateForAnnotatedElement`
8892
as a second argument.
89-
93+
9094
* Timestamps are no longer included in generated code.
9195

9296
* There is no longer a need to specify the files related to an individual
@@ -102,7 +106,7 @@
102106

103107
## 0.4.7+2
104108

105-
* Upgrade to `analyzer '^0.27.1'` and removed a work-around for a fixed
109+
* Upgrade to `analyzer '^0.27.1'` and removed a work-around for a fixed
106110
`analyzer` issue.
107111

108112
## 0.4.7+1

lib/generators/json_literal_generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class JsonLiteralGenerator extends GeneratorForAnnotation<JsonLiteral> {
2424
throw 'must be relative path to the source file';
2525
}
2626

27-
var sourcePathDir = p.dirname(buildStep.input.id.path);
27+
var sourcePathDir = p.dirname(buildStep.inputId.path);
2828
var fileId = new AssetId(
29-
buildStep.input.id.package, p.join(sourcePathDir, annotation.path));
29+
buildStep.inputId.package, p.join(sourcePathDir, annotation.path));
3030
var content = JSON.decode(await buildStep.readAsString(fileId));
3131

3232
var thing = JSON.encode(content);

lib/src/builder.dart

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@ class GeneratorBuilder extends Builder {
2828

2929
@override
3030
Future build(BuildStep buildStep) async {
31-
var id = buildStep.input.id;
32-
var resolver = await buildStep.resolve(id, resolveAllConstants: false);
33-
try {
34-
var lib = resolver.getLibrary(id);
35-
if (lib == null) return;
36-
await _generateForLibrary(lib, buildStep);
37-
} finally {
38-
resolver.release();
39-
}
31+
var resolver = await buildStep.resolver;
32+
if (!resolver.isLibrary(buildStep.inputId)) return;
33+
var lib = resolver.getLibrary(buildStep.inputId);
34+
await _generateForLibrary(lib, buildStep);
4035
}
4136

4237
@override
@@ -50,7 +45,7 @@ class GeneratorBuilder extends Builder {
5045

5146
Future _generateForLibrary(
5247
LibraryElement library, BuildStep buildStep) async {
53-
buildStep.logger.fine('Running $generators for ${buildStep.input.id}');
48+
buildStep.logger.fine('Running $generators for ${buildStep.inputId}');
5449
var generatedOutputs =
5550
await _generate(library, generators, buildStep).toList();
5651

@@ -91,9 +86,8 @@ if approppriate.""",
9186
stack);
9287
}
9388

94-
var outputId = _generatedFile(buildStep.input.id);
95-
var output = new Asset(outputId, '$_topHeader$genPartContent');
96-
buildStep.writeAsString(output);
89+
buildStep.writeAsString(
90+
_generatedFile(buildStep.inputId), '$_topHeader$genPartContent');
9791
}
9892

9993
@override

pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name: source_gen
2-
version: 0.5.3+2
2+
version: 0.5.4
33
author: Dart Team <[email protected]>
44
description: Automatic sourcecode generation for Dart
55
homepage: https://github.com/dart-lang/source_gen
66
environment:
77
sdk: '>=1.12.0 <2.0.0'
88
dependencies:
99
analyzer: ^0.29.2
10-
build: '>=0.2.1 <0.7.0'
10+
build: ^0.7.0
1111
dart_style: '>=0.1.7 <0.3.0'
1212
path: ^1.3.2
1313
dev_dependencies:
14-
build_runner: ^0.1.0
15-
build_test: ^0.3.0
14+
build_runner: ^0.2.0
15+
build_test: ^0.4.0
1616
cli_util: ^0.0.1
1717
collection: ^1.1.2
1818
mockito: '>=0.11.0 <2.0.0'

0 commit comments

Comments
 (0)