Skip to content

Commit 7b3274a

Browse files
authored
Do not require FLUTTER_ROOT any longer, even for flutter packages (#3688)
1 parent d25dfca commit 7b3274a

File tree

5 files changed

+0
-64
lines changed

5 files changed

+0
-64
lines changed

lib/src/model/package_builder.dart

-9
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ class PubPackageBuilder implements PackageBuilder {
5353

5454
@override
5555
Future<PackageGraph> buildPackageGraph() async {
56-
if (!_config.sdkDocs) {
57-
if (_config.topLevelPackageMeta.requiresFlutter &&
58-
_config.flutterRoot == null) {
59-
// TODO(devoncarew): We may no longer need to emit this error.
60-
throw DartdocOptionError(
61-
'Top level package requires Flutter but FLUTTER_ROOT environment variable not set');
62-
}
63-
}
64-
6556
runtimeStats.resetAccumulators([
6657
'elementTypeInstantiation',
6758
'modelElementCacheInsertion',

test/end2end/dartdoc_integration_test.dart

-30
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ library;
77

88
import 'dart:async';
99
import 'dart:io';
10-
import 'dart:mirrors';
1110

1211
import 'package:dartdoc/src/package_meta.dart';
1312
import 'package:path/path.dart' as path;
@@ -17,11 +16,6 @@ import 'package:test_process/test_process.dart';
1716
import '../src/test_descriptor_utils.dart' as d;
1817
import '../src/utils.dart';
1918

20-
Uri get _currentFileUri =>
21-
(reflect(main) as ClosureMirror).function.location!.sourceUri;
22-
String get _testPackageFlutterPluginPath => path.fromUri(_currentFileUri
23-
.resolve('../../testing/flutter_packages/test_package_flutter_plugin'));
24-
2519
var _dartdocPath = path.canonicalize(path.join('bin', 'dartdoc.dart'));
2620

2721
/// Runs dartdoc via [TestProcess.start].
@@ -103,28 +97,4 @@ void main() {
10397
);
10498
await process.shouldExit(1);
10599
});
106-
107-
test('with missing FLUTTER_ROOT exception reports an error', () async {
108-
// TODO(srawlins): Remove test_package_flutter_plugin and generate afresh.
109-
var dartTool =
110-
Directory(path.join(_testPackageFlutterPluginPath, '.dart_tool'));
111-
if (dartTool.existsSync()) dartTool.deleteSync(recursive: true);
112-
var process = await runDartdoc(
113-
[],
114-
workingDirectory: _testPackageFlutterPluginPath,
115-
environment: {...Platform.environment}..remove('FLUTTER_ROOT'),
116-
includeParentEnvironment: false,
117-
);
118-
await expectLater(
119-
process.stderr,
120-
emitsThrough(
121-
matches(
122-
'Top level package requires Flutter but FLUTTER_ROOT environment '
123-
'variable not set|test_package_flutter_plugin requires the Flutter '
124-
'SDK, version solving failed',
125-
),
126-
),
127-
);
128-
await process.shouldExit(1);
129-
});
130100
}

testing/flutter_packages/test_package_flutter_plugin/.gitignore

-1
This file was deleted.

testing/flutter_packages/test_package_flutter_plugin/lib/testlib.dart

-12
This file was deleted.

testing/flutter_packages/test_package_flutter_plugin/pubspec.yaml

-12
This file was deleted.

0 commit comments

Comments
 (0)