From 461ca001fe616918113ffb5f4e19b6272e454496 Mon Sep 17 00:00:00 2001
From: Sam Rawlins <srawlins@google.com>
Date: Tue, 27 Feb 2024 15:18:31 -0800
Subject: [PATCH] Do not require FLUTTER_ROOT any longer, even for flutter
 packages

---
 lib/src/model/package_builder.dart            |  9 ------
 test/end2end/dartdoc_integration_test.dart    | 30 -------------------
 .../test_package_flutter_plugin/.gitignore    |  1 -
 .../lib/testlib.dart                          | 12 --------
 .../test_package_flutter_plugin/pubspec.yaml  | 12 --------
 5 files changed, 64 deletions(-)
 delete mode 100644 testing/flutter_packages/test_package_flutter_plugin/.gitignore
 delete mode 100644 testing/flutter_packages/test_package_flutter_plugin/lib/testlib.dart
 delete mode 100644 testing/flutter_packages/test_package_flutter_plugin/pubspec.yaml

diff --git a/lib/src/model/package_builder.dart b/lib/src/model/package_builder.dart
index 98c91195c5..06053650e3 100644
--- a/lib/src/model/package_builder.dart
+++ b/lib/src/model/package_builder.dart
@@ -53,15 +53,6 @@ class PubPackageBuilder implements PackageBuilder {
 
   @override
   Future<PackageGraph> buildPackageGraph() async {
-    if (!_config.sdkDocs) {
-      if (_config.topLevelPackageMeta.requiresFlutter &&
-          _config.flutterRoot == null) {
-        // TODO(devoncarew): We may no longer need to emit this error.
-        throw DartdocOptionError(
-            'Top level package requires Flutter but FLUTTER_ROOT environment variable not set');
-      }
-    }
-
     runtimeStats.resetAccumulators([
       'elementTypeInstantiation',
       'modelElementCacheInsertion',
diff --git a/test/end2end/dartdoc_integration_test.dart b/test/end2end/dartdoc_integration_test.dart
index cc029ae95f..5493a88e58 100644
--- a/test/end2end/dartdoc_integration_test.dart
+++ b/test/end2end/dartdoc_integration_test.dart
@@ -7,7 +7,6 @@ library;
 
 import 'dart:async';
 import 'dart:io';
-import 'dart:mirrors';
 
 import 'package:dartdoc/src/package_meta.dart';
 import 'package:path/path.dart' as path;
@@ -17,11 +16,6 @@ import 'package:test_process/test_process.dart';
 import '../src/test_descriptor_utils.dart' as d;
 import '../src/utils.dart';
 
-Uri get _currentFileUri =>
-    (reflect(main) as ClosureMirror).function.location!.sourceUri;
-String get _testPackageFlutterPluginPath => path.fromUri(_currentFileUri
-    .resolve('../../testing/flutter_packages/test_package_flutter_plugin'));
-
 var _dartdocPath = path.canonicalize(path.join('bin', 'dartdoc.dart'));
 
 /// Runs dartdoc via [TestProcess.start].
@@ -103,28 +97,4 @@ void main() {
     );
     await process.shouldExit(1);
   });
-
-  test('with missing FLUTTER_ROOT exception reports an error', () async {
-    // TODO(srawlins): Remove test_package_flutter_plugin and generate afresh.
-    var dartTool =
-        Directory(path.join(_testPackageFlutterPluginPath, '.dart_tool'));
-    if (dartTool.existsSync()) dartTool.deleteSync(recursive: true);
-    var process = await runDartdoc(
-      [],
-      workingDirectory: _testPackageFlutterPluginPath,
-      environment: {...Platform.environment}..remove('FLUTTER_ROOT'),
-      includeParentEnvironment: false,
-    );
-    await expectLater(
-      process.stderr,
-      emitsThrough(
-        matches(
-          'Top level package requires Flutter but FLUTTER_ROOT environment '
-          'variable not set|test_package_flutter_plugin requires the Flutter '
-          'SDK, version solving failed',
-        ),
-      ),
-    );
-    await process.shouldExit(1);
-  });
 }
diff --git a/testing/flutter_packages/test_package_flutter_plugin/.gitignore b/testing/flutter_packages/test_package_flutter_plugin/.gitignore
deleted file mode 100644
index cb172e9e44..0000000000
--- a/testing/flutter_packages/test_package_flutter_plugin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-android/**
diff --git a/testing/flutter_packages/test_package_flutter_plugin/lib/testlib.dart b/testing/flutter_packages/test_package_flutter_plugin/lib/testlib.dart
deleted file mode 100644
index 27d1031803..0000000000
--- a/testing/flutter_packages/test_package_flutter_plugin/lib/testlib.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-/// This is a demonstration of interlinking with Flutter-using pub packages.
-library testlib;
-
-import 'package:flutter/material.dart';
-
-/// This widget is the best stateful widget ever.
-class MyAwesomeWidget extends StatefulWidget {
-  MyAwesomeWidget({required Key key}) : super(key: key) {}
-
-  @override
-  State<MyAwesomeWidget> createState() => throw UnimplementedError();
-}
diff --git a/testing/flutter_packages/test_package_flutter_plugin/pubspec.yaml b/testing/flutter_packages/test_package_flutter_plugin/pubspec.yaml
deleted file mode 100644
index 1147757465..0000000000
--- a/testing/flutter_packages/test_package_flutter_plugin/pubspec.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: test_package_flutter_plugin
-version: 0.1.0
-description: A happy flutter almost plugin being documented
-homepage: http://github.com/dart-lang/dartdoc/tree/main/testing/test_package_flutter_plugin
-
-dependencies:
-  flutter:
-    sdk: flutter
-
-environment:
-  sdk: ">2.12.0 <4.0.0"
-  flutter: ">=0.1.4 <4.0.0"