Skip to content

Commit baf0b40

Browse files
committed
remove deprecated calls
1 parent 8a1da1f commit baf0b40

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

bin/dartdoc.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ library dartdoc.bin;
66

77
import 'dart:io';
88

9-
import 'package:analyzer/src/generated/java_io.dart';
9+
import 'package:analyzer/file_system/physical_file_system.dart';
10+
import 'package:analyzer/src/dart/sdk/sdk.dart';
1011
import 'package:analyzer/src/generated/sdk.dart';
11-
import 'package:analyzer/src/generated/sdk_io.dart';
1212
import 'package:args/args.dart';
1313
import 'package:cli_util/cli_util.dart' as cli_util;
1414
import 'package:dartdoc/dartdoc.dart';
@@ -135,7 +135,8 @@ main(List<String> arguments) async {
135135
var addCrossdart = args['add-crossdart'] as bool;
136136
var includeSource = args['include-source'] as bool;
137137

138-
DartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir.path));
138+
DartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
139+
PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path));
139140

140141
initializeConfig(
141142
addCrossdart: addCrossdart,

lib/dartdoc.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import 'package:analyzer/file_system/physical_file_system.dart';
1414
import 'package:analyzer/source/embedder.dart';
1515
import 'package:analyzer/source/package_map_resolver.dart';
1616
import 'package:analyzer/source/sdk_ext.dart';
17+
import 'package:analyzer/src/dart/sdk/sdk.dart';
1718
import 'package:analyzer/src/generated/engine.dart';
1819
import 'package:analyzer/src/generated/error.dart';
1920
import 'package:analyzer/src/generated/java_io.dart';
2021
import 'package:analyzer/src/generated/sdk.dart';
21-
import 'package:analyzer/src/generated/sdk_io.dart';
2222
import 'package:analyzer/src/generated/source.dart';
2323
import 'package:analyzer/src/generated/source_io.dart';
2424
import 'package:package_config/discovery.dart' as package_config;
@@ -152,7 +152,8 @@ class DartDoc {
152152
List<LibraryElement> _parseLibraries(
153153
List<String> files, List<String> includeExternals) {
154154
List<LibraryElement> libraries = [];
155-
DartSdk sdk = new DirectoryBasedDartSdk(new JavaFile(sdkDir.path));
155+
DartSdk sdk = new FolderBasedDartSdk(PhysicalResourceProvider.INSTANCE,
156+
PhysicalResourceProvider.INSTANCE.getFolder(sdkDir.path));
156157
List<UriResolver> resolvers = [];
157158

158159
fileSystem.Folder cwd =

lib/src/package_meta.dart

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,14 @@ class _FilePackageMeta extends PackageMeta {
9393

9494
@override
9595
void runPubGet() {
96+
String pubPath =
97+
path.join(path.dirname(Platform.resolvedExecutable), 'pub');
9698
ProcessResult result =
97-
Process.runSync('pub', ['get'], workingDirectory: dir.path);
99+
Process.runSync(pubPath, ['get'], workingDirectory: dir.path);
100+
101+
if (result.stdout.isNotEmpty) {
102+
print(result.stdout.trim());
103+
}
98104

99105
if (result.exitCode != 0) {
100106
StringBuffer buf = new StringBuffer();

test/dartdoc_test.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ void main() {
102102

103103
test('generate docs for package with embedder yaml', () async {
104104
PackageMeta meta = new PackageMeta.fromDir(testPackageWithEmbedderYaml);
105+
if (meta.needsPubGet) meta.runPubGet();
105106
DartDoc dartdoc = new DartDoc(
106107
testPackageWithEmbedderYaml, [], getSdkDir(), [], tempDir, meta, []);
107108

test/src/utils.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import 'dart:io';
99
import 'package:analyzer/dart/element/element.dart';
1010
import 'package:analyzer/file_system/file_system.dart';
1111
import 'package:analyzer/file_system/physical_file_system.dart';
12+
import 'package:analyzer/src/dart/sdk/sdk.dart';
1213
import 'package:analyzer/src/generated/engine.dart';
1314
import 'package:analyzer/src/generated/java_io.dart';
1415
import 'package:analyzer/src/generated/sdk.dart';
15-
import 'package:analyzer/src/generated/sdk_io.dart';
1616
import 'package:analyzer/src/generated/source_io.dart';
1717
import 'package:cli_util/cli_util.dart' as cli_util;
1818
import 'package:dartdoc/src/model.dart';
@@ -36,7 +36,9 @@ void delete(Directory dir) {
3636
}
3737

3838
void init() {
39-
sdkDir = new DirectoryBasedDartSdk(new JavaFile(cli_util.getSdkDir().path));
39+
ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
40+
sdkDir = new FolderBasedDartSdk(
41+
resourceProvider, resourceProvider.getFolder(cli_util.getSdkDir().path));
4042

4143
analyzerHelper = new AnalyzerHelper();
4244
var pathsForTestLib = [

0 commit comments

Comments
 (0)