remove deprecated calls

Author: devoncarew

bin/dartdoc.dart

@@ -6,9 +6,9 @@ library dartdoc.bin;
 
 import 'dart:io';
 
-import 'package:analyzer/src/generated/java_io.dart';
+import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:args/args.dart';
 import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:dartdoc/dartdoc.dart';
@@ -135,7 +135,8 @@ main(List<String> arguments) async {
   var addCrossdart = args['add-crossdart'] as bool;
   var includeSource = args['include-source'] as bool;
 
-  DartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir.path));
+  DartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
+      PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path));
 
   initializeConfig(
       addCrossdart: addCrossdart,

lib/dartdoc.dart

@@ -14,11 +14,11 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/embedder.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
 import 'package:analyzer/source/sdk_ext.dart';
+import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:package_config/discovery.dart' as package_config;
@@ -152,7 +152,8 @@ class DartDoc {
   List<LibraryElement> _parseLibraries(
       List<String> files, List<String> includeExternals) {
     List<LibraryElement> libraries = [];
-    DartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir.path));
+    DartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
+        PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path));
     List<UriResolver> resolvers = [];
 
     fileSystem.Folder cwd =

lib/src/package_meta.dart

@@ -93,8 +93,14 @@ class _FilePackageMeta extends PackageMeta {
 
   @override
   void runPubGet() {
+    String pubPath =
+        path.join(path.dirname(Platform.resolvedExecutable), 'pub');
     ProcessResult result =
-        Process.runSync('pub', ['get'], workingDirectory: dir.path);
+        Process.runSync(pubPath, ['get'], workingDirectory: dir.path);
+
+    if (result.stdout.isNotEmpty) {
+      print(result.stdout.trim());
+    }
 
     if (result.exitCode != 0) {
       StringBuffer buf = new StringBuffer();

test/dartdoc_test.dart

@@ -102,6 +102,7 @@ void main() {
 
     test('generate docs for package with embedder yaml', () async {
       PackageMeta meta = new PackageMeta.fromDir(testPackageWithEmbedderYaml);
+      if (meta.needsPubGet) meta.runPubGet();
       DartDoc dartdoc = new DartDoc(
           testPackageWithEmbedderYaml, [], getSdkDir(), [], tempDir, meta, []);
 

test/src/utils.dart

@@ -9,10 +9,10 @@ import 'dart:io';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
-import 'package:analyzer/src/generated/sdk_io.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:dartdoc/src/model.dart';
@@ -36,7 +36,9 @@ void delete(Directory dir) {
 }
 
 void init() {
-  sdkDir = new DirectoryBasedDartSdk(new JavaFile(cli_util.getSdkDir().path));
+  ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
+  sdkDir = new FolderBasedDartSdk(
+      resourceProvider, resourceProvider.getFolder(cli_util.getSdkDir().path));
 
   analyzerHelper = new AnalyzerHelper();
   var pathsForTestLib = [