Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Require analyzer 3.4.1, prepare for future breaking changes. #3269

Merged
merged 3 commits into from Mar 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_modules/lib/src/errors.dart
Expand Up @@ -104,7 +104,7 @@ Future<String?> _missingImportMessage(
return id == missingId;
});
if (import == null) return null;
var lineInfo = parsed.lineInfo!.getLocation(import.offset);
var lineInfo = parsed.lineInfo.getLocation(import.offset);
return '`$import` from $sourceId at $lineInfo';
}

Expand Down
2 changes: 1 addition & 1 deletion build_modules/pubspec.yaml
Expand Up @@ -7,7 +7,7 @@ environment:
sdk: ">=2.14.0 <3.0.0"

dependencies:
analyzer: ">=1.0.0 <4.0.0"
analyzer: ">=3.4.1 <4.0.0"
async: ^2.5.0
bazel_worker: ^1.0.0
build: ^2.0.0
Expand Down
1 change: 1 addition & 0 deletions build_resolvers/lib/src/build_asset_uri_resolver.dart
Expand Up @@ -80,6 +80,7 @@ class BuildAssetUriResolver extends UriResolver {
driver.changeFile(state.path);
}
}
await driver.applyPendingFileChanges();
}

/// Updates the internal state for [id], if it has changed.
Expand Down
7 changes: 5 additions & 2 deletions build_resolvers/lib/src/resolver.dart
Expand Up @@ -402,10 +402,13 @@ Future<String> _defaultSdkSummaryGenerator() async {
await summaryFile.create(recursive: true);
final embedderYamlPath =
isFlutter ? p.join(_dartUiPath, '_embedder.yaml') : null;
await summaryFile.writeAsBytes(buildSdkSummary(
await summaryFile.writeAsBytes(
await buildSdkSummary2(
sdkPath: _runningDartSdkPath,
resourceProvider: PhysicalResourceProvider.INSTANCE,
embedderYamlPath: embedderYamlPath));
embedderYamlPath: embedderYamlPath,
),
);

await _createDepsFile(depsFile, currentDeps);
watch.stop();
Expand Down
2 changes: 1 addition & 1 deletion build_resolvers/pubspec.yaml
Expand Up @@ -7,7 +7,7 @@ environment:
sdk: ">=2.14.0 <3.0.0"

dependencies:
analyzer: ">=2.8.0 <4.0.0"
analyzer: ">=3.4.1 <4.0.0"
async: ^2.5.0
build: ^2.0.0
crypto: ^3.0.0
Expand Down