diff --git a/.gitignore b/.gitignore
index 0e813521..f38af7cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,15 @@ unlinked_spec.ds
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 
+# Linux related
+**/linux/flutter/ephemeral/
+
+# Windows related
+**/windows/flutter/ephemeral/
+
+# macOS related
+**/macos/Flutter/ephemeral/
+
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
 !**/ios/**/default.mode2v3
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 7c6617f2..ca51c373 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -5,6 +5,10 @@
 # "DIFFERENT FROM FLUTTER/FLUTTER" below.
 
 analyzer:
+  exclude:
+    - "packages/**/linux/flutter/ephemeral/**"
+    - "packages/**/windows/flutter/ephemeral/**"
+    - "packages/**/macos/Flutter/ephemeral/**"
   language:
     strict-casts: true
     strict-raw-types: true
diff --git a/assets/logos/flutter.png b/assets/logos/flutter.png
new file mode 100644
index 00000000..df6cb5cf
Binary files /dev/null and b/assets/logos/flutter.png differ
diff --git a/ci/allowed_custom_analysis.yaml b/ci/allowed_custom_analysis.yaml
new file mode 100644
index 00000000..39667265
--- /dev/null
+++ b/ci/allowed_custom_analysis.yaml
@@ -0,0 +1,5 @@
+- animation_metadata
+- diagram_capture
+- diagram_generator
+- diagram_viewer
+- diagrams
diff --git a/ci/check b/ci/check
index 81e998c8..8c3b99aa 100755
--- a/ci/check
+++ b/ci/check
@@ -62,5 +62,12 @@ fi
 
 for check in "${CHECKS[@]}"; do
   echo "Running $check"
-  dart pub global run flutter_plugin_tools "$check" --run-on-changed-packages
+  EXTRA_ARGS=""
+  if [[ "$check" == "analyze" ]]; then
+    # Remove ephemeral directories that may contain extra analysis_options.yaml files
+    # symlinked by plugins, which causes flutter_plugin_tools to fail.
+    find . -name "ephemeral" -type d -prune -exec rm -rf {} +
+    EXTRA_ARGS="--custom-analysis=ci/allowed_custom_analysis.yaml"
+  fi
+  dart pub global run flutter_plugin_tools "$check" --run-on-changed-packages $EXTRA_ARGS
 done
diff --git a/packages/diagram_capture/lib/diagram_capture.dart b/packages/diagram_capture/lib/diagram_capture.dart
index c91ff344..329abb42 100644
--- a/packages/diagram_capture/lib/diagram_capture.dart
+++ b/packages/diagram_capture/lib/diagram_capture.dart
@@ -341,8 +341,10 @@ typedef DiagramKeyframe = void Function(Duration duration);
 
 /// A callback given to drawAnimatedDiagramToFiles that is called for each
 /// frame.
-typedef DiagramGestureCallback =
-    void Function(DiagramController diagram, Duration now);
+typedef DiagramGestureCallback = void Function(
+  DiagramController diagram,
+  Duration now,
+);
 
 /// A controller for creating diagrams generated by using Flutter widgets.
 ///
diff --git a/packages/diagram_capture/test/diagram_capture_test.dart b/packages/diagram_capture/test/diagram_capture_test.dart
index c6edf92b..6d897c3c 100644
--- a/packages/diagram_capture/test/diagram_capture_test.dart
+++ b/packages/diagram_capture/test/diagram_capture_test.dart
@@ -128,9 +128,9 @@ void main() {
       expect(outputFile.lengthSync(), greaterThan(0));
 
       Map<String, dynamic> loadMetadata(File metadataFile) {
-        final Map<String, dynamic> metadata =
-            json.decode(metadataFile.readAsStringSync())
-                as Map<String, dynamic>;
+        final Map<String, dynamic> metadata = json.decode(
+          metadataFile.readAsStringSync(),
+        ) as Map<String, dynamic>;
         final String baseDir = path.dirname(metadataFile.absolute.path);
         final List<File> frameFiles =
             (metadata['frame_files']! as List<dynamic>)
diff --git a/packages/diagram_viewer/.gitignore b/packages/diagram_viewer/.gitignore
index 7e2ead20..4cf67f7e 100644
--- a/packages/diagram_viewer/.gitignore
+++ b/packages/diagram_viewer/.gitignore
@@ -66,6 +66,15 @@ build/
 **/ios/ServiceDefinitions.json
 **/ios/Runner/GeneratedPluginRegistrant.*
 
+# Linux related
+**/linux/flutter/ephemeral/
+
+# Windows related
+**/windows/flutter/ephemeral/
+
+# macOS related
+**/macos/Flutter/ephemeral/
+
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3
 !**/ios/**/default.mode2v3
diff --git a/packages/diagram_viewer/linux/flutter/generated_plugins.cmake b/packages/diagram_viewer/linux/flutter/generated_plugins.cmake
index 2e1de87a..be1ee3e5 100644
--- a/packages/diagram_viewer/linux/flutter/generated_plugins.cmake
+++ b/packages/diagram_viewer/linux/flutter/generated_plugins.cmake
@@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)
diff --git a/packages/diagram_viewer/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/diagram_viewer/macos/Flutter/GeneratedPluginRegistrant.swift
index b8e2b22f..724bb2ac 100644
--- a/packages/diagram_viewer/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/diagram_viewer/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -5,10 +5,8 @@
 import FlutterMacOS
 import Foundation
 
-import path_provider_foundation
 import shared_preferences_foundation
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
 }
diff --git a/packages/diagram_viewer/windows/flutter/generated_plugins.cmake b/packages/diagram_viewer/windows/flutter/generated_plugins.cmake
index b93c4c30..3ad69c61 100644
--- a/packages/diagram_viewer/windows/flutter/generated_plugins.cmake
+++ b/packages/diagram_viewer/windows/flutter/generated_plugins.cmake
@@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
+  jni
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)