Update to analyzer 0.28.0

- Fix breaking changes
  - Use FolderBasedDartSdk instead of DirectoryBasedDartSdk
  - Construct FolderBasedDartSdk manually since `defaultInstance` no
    longer exists
- Bump version and changelog

Closes #92

Author: natebosch

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.5.1+3
+
+* Upgrade to be compatible with the breaking changes in analyzer 0.28.0
+
 ## 0.5.1+2
 
 * Avoid calling `computeNode()` while instantiating annotation values

lib/src/annotation.dart

@@ -207,8 +207,8 @@ bool matchAnnotation(Type annotationType, ElementAnnotation annotation) {
 
   var annotationValueType = annotation.constantValue?.type;
   if (annotationValueType == null) {
-      throw new ArgumentError.value(annotation, 'annotation',
-          'Could not determine type of annotation. Are you missing a dependency?');
+    throw new ArgumentError.value(annotation, 'annotation',
+        'Could not determine type of annotation. Are you missing a dependency?');
   }
 
   var annTypeName = annotationValueType.name;

lib/src/utils.dart

@@ -15,10 +15,10 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/package_map_provider.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/pub_package_map_provider.dart';
+import 'package:analyzer/src/dart/sdk/sdk.dart' show FolderBasedDartSdk;
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart' show DartSdk;
-import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:cli_util/cli_util.dart' as cli;
@@ -83,9 +83,11 @@ Future<AnalysisContext> getAnalysisContextForProjectPath(
   var sdkPath = cli.getSdkDir().path;
 
   JavaSystemIO.setProperty("com.google.dart.sdk", sdkPath);
-  DartSdk sdk = DirectoryBasedDartSdk.defaultSdk;
+  var resourceProvider = PhysicalResourceProvider.INSTANCE;
+  DartSdk sdk = new FolderBasedDartSdk(
+      resourceProvider, resourceProvider.getFolder(sdkPath));
 
-  var packageResolver = _getPackageResolver(projectPath);
+  var packageResolver = _getPackageResolver(projectPath, sdk);
 
   var resolvers = [
     new DartUriResolver(sdk),
@@ -107,14 +109,14 @@ Future<AnalysisContext> getAnalysisContextForProjectPath(
   return context;
 }
 
-UriResolver _getPackageResolver(String projectPath) {
+UriResolver _getPackageResolver(String projectPath, DartSdk sdk) {
   // is there a .packages file? If yes, use that!
 
   var dotPackagesPath = p.join(projectPath, '.packages');
 
   if (FileSystemEntity.isFileSync(dotPackagesPath)) {
-    PubPackageMapProvider pubPackageMapProvider = new PubPackageMapProvider(
-        PhysicalResourceProvider.INSTANCE, DirectoryBasedDartSdk.defaultSdk);
+    PubPackageMapProvider pubPackageMapProvider =
+        new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
     PackageMapInfo packageMapInfo = pubPackageMapProvider
         .computePackageMap(PhysicalResourceProvider.INSTANCE.getResource('.'));
     Map<String, List<Folder>> packageMap = packageMapInfo.packageMap;

pubspec.yaml

@@ -1,12 +1,12 @@
 name: source_gen
-version: 0.5.1+2
+version: 0.5.1+3
 author: Dart Team <[email protected]>
 description: Automatic sourcecode generation for Dart
 homepage: https://github.com/dart-lang/source_gen
 environment:
   sdk: '>=1.12.0 <2.0.0'
 dependencies:
-  analyzer: '^0.27.3'
+  analyzer: ^0.28.0
   build: '>=0.2.1 <0.5.0'
   cli_util: ^0.0.1
   dart_style: '>=0.1.7 <0.3.0'

test/builder_test.dart

@@ -22,26 +22,29 @@ void main() {
         new GeneratorBuilder([const _BadOutputGenerator()]),
         new InputSet(pkgName, ['lib/test_lib.dart']));
 
-    await testPhases(phaseGroup, pkgName, srcs,
-        {'$pkgName|lib/test_lib.g.dart': contains('not valid code!'),});
+    await testPhases(phaseGroup, pkgName, srcs, {
+      '$pkgName|lib/test_lib.g.dart': contains('not valid code!'),
+    });
   });
 
   test('Generate standalone output file', () async {
     var srcs = _createPackageStub(pkgName);
     var phaseGroup = new PhaseGroup.singleAction(
         new GeneratorBuilder([const CommentGenerator()], isStandalone: true),
         new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs,
-        {'$pkgName|lib/test_lib.g.dart': _testGenStandaloneContent,});
+    await testPhases(phaseGroup, pkgName, srcs, {
+      '$pkgName|lib/test_lib.g.dart': _testGenStandaloneContent,
+    });
   });
 
   test('Generate explicitly non-standalone output file', () async {
     var srcs = _createPackageStub(pkgName);
     var phaseGroup = new PhaseGroup.singleAction(
         new GeneratorBuilder([const CommentGenerator()], isStandalone: false),
         new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs,
-        {'$pkgName|lib/test_lib.g.dart': _testGenPartContent,});
+    await testPhases(phaseGroup, pkgName, srcs, {
+      '$pkgName|lib/test_lib.g.dart': _testGenPartContent,
+    });
   });
 
   test('Expect error when multiple generators used on a standalone builder',
@@ -88,8 +91,9 @@ void main() {
     var phaseGroup = new PhaseGroup.singleAction(
         new GeneratorBuilder([const CommentGenerator()]),
         new InputSet(pkgName, ['lib/test_lib.dart']));
-    await testPhases(phaseGroup, pkgName, srcs,
-        {'$pkgName|lib/test_lib.g.dart': _testGenPartContentError,});
+    await testPhases(phaseGroup, pkgName, srcs, {
+      '$pkgName|lib/test_lib.g.dart': _testGenPartContentError,
+    });
   });
 }
 
@@ -102,8 +106,9 @@ Future _generateTest(CommentGenerator gen, String expectedContent) async {
   var phaseGroup = new PhaseGroup.singleAction(new GeneratorBuilder([gen]),
       new InputSet(pkgName, ['lib/test_lib.dart']));
 
-  await testPhases(phaseGroup, pkgName, srcs,
-      {'$pkgName|lib/test_lib.g.dart': expectedContent,});
+  await testPhases(phaseGroup, pkgName, srcs, {
+    '$pkgName|lib/test_lib.g.dart': expectedContent,
+  });
 }
 
 /// Creates a package using [pkgName].

test/find_libraries_test.dart

@@ -6,7 +6,6 @@
 library source_gen.test.find_libraries;
 
 import 'package:analyzer/src/generated/engine.dart';
-import 'package:analyzer/src/generated/source_io.dart';
 import 'package:path/path.dart' as p;
 import 'package:source_gen/src/utils.dart';
 import 'package:test/test.dart';
@@ -35,12 +34,10 @@ void main() {
         var fullInputPath = _testFilePath(inputPath);
 
         var libElement = getLibraryElementForSourceFile(context, fullInputPath);
-
-        var libSource = libElement.source as FileBasedSource;
-
+        
         var fullLibPath = _testFilePath(expectedLibPath);
 
-        expect(p.fromUri(libSource.uri), fullLibPath);
+        expect(p.fromUri(libElement.source.uri), fullLibPath);
       });
     });
   });