diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40292ba2..8c909d3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# [6.3.0]
+* Support Flutter 3.7.
+
 # [6.2.2]
 * Fix: nextLine getter null where no assertion.
 
diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 5b11d5f3..85987338 100644
--- a/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -7,7 +7,7 @@ import Foundation
 
 import device_info_plus
 import pasteboard
-import path_provider_macos
+import path_provider_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
diff --git a/lib/src/widgets/raw_editor.dart b/lib/src/widgets/raw_editor.dart
index a26dfa48..1cd69e22 100644
--- a/lib/src/widgets/raw_editor.dart
+++ b/lib/src/widgets/raw_editor.dart
@@ -237,7 +237,8 @@ class RawEditor extends StatefulWidget {
   State<StatefulWidget> createState() => RawEditorState();
 }
 
-class RawEditorState extends EditorState with
+class RawEditorState extends EditorState
+    with
         AutomaticKeepAliveClientMixin<RawEditor>,
         WidgetsBindingObserver,
         TickerProviderStateMixin<RawEditor>,
@@ -1421,12 +1422,13 @@ class RawEditorState extends EditorState with
     // this is needed for Scribble (Stylus input) in Apple platforms
     // and this package does not implement this feature
   }
-  
+
   @override
-  void didChangeInputControl(TextInputControl? oldControl, TextInputControl? newControl) {
+  void didChangeInputControl(
+      TextInputControl? oldControl, TextInputControl? newControl) {
     // TODO: implement didChangeInputControl
   }
-  
+
   @override
   void performSelector(String selectorName) {
     // TODO: implement performSelector
diff --git a/lib/src/widgets/text_selection.dart b/lib/src/widgets/text_selection.dart
index 770c3b3d..dd6d6c18 100644
--- a/lib/src/widgets/text_selection.dart
+++ b/lib/src/widgets/text_selection.dart
@@ -4,7 +4,6 @@ import 'dart:math' as math;
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
 
 import '../models/documents/nodes/node.dart';
@@ -82,7 +81,7 @@ class EditorTextSelectionOverlay {
     this.dragStartBehavior = DragStartBehavior.start,
     this.handlesVisible = false,
   }) {
-    final overlay = Overlay.of(context, rootOverlay: true)!;
+    final overlay = Overlay.of(context, rootOverlay: true);
 
     _toolbarController = AnimationController(
         duration: const Duration(milliseconds: 150), vsync: overlay);
@@ -222,7 +221,7 @@ class EditorTextSelectionOverlay {
   void showToolbar() {
     assert(toolbar == null);
     toolbar = OverlayEntry(builder: _buildToolbar);
-    Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor)!
+    Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor)
         .insert(toolbar!);
     _toolbarController.forward(from: 0);
 
@@ -407,7 +406,7 @@ class EditorTextSelectionOverlay {
               _buildHandle(context, _TextSelectionHandlePosition.END)),
     ];
 
-    Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor)!
+    Overlay.of(context, rootOverlay: true, debugRequiredFor: debugRequiredFor)
         .insertAll(_handles!);
   }
 
diff --git a/lib/src/widgets/toolbar/arrow_indicated_button_list.dart b/lib/src/widgets/toolbar/arrow_indicated_button_list.dart
index 52098099..1c6917a1 100644
--- a/lib/src/widgets/toolbar/arrow_indicated_button_list.dart
+++ b/lib/src/widgets/toolbar/arrow_indicated_button_list.dart
@@ -120,7 +120,6 @@ class _ArrowIndicatedButtonListState extends State<ArrowIndicatedButtonList>
 
 /// ScrollBehavior without the Material glow effect.
 class _NoGlowBehavior extends ScrollBehavior {
-  @override
   Widget buildViewportChrome(BuildContext _, Widget child, AxisDirection __) {
     return child;
   }
diff --git a/lib/src/widgets/toolbar/quill_font_family_button.dart b/lib/src/widgets/toolbar/quill_font_family_button.dart
index 065daf7d..88b3dda4 100644
--- a/lib/src/widgets/toolbar/quill_font_family_button.dart
+++ b/lib/src/widgets/toolbar/quill_font_family_button.dart
@@ -109,8 +109,7 @@ class _QuillFontFamilyButtonState extends State<QuillFontFamilyButton> {
   void _showMenu() {
     final popupMenuTheme = PopupMenuTheme.of(context);
     final button = context.findRenderObject() as RenderBox;
-    final overlay =
-        Overlay.of(context)!.context.findRenderObject() as RenderBox;
+    final overlay = Overlay.of(context).context.findRenderObject() as RenderBox;
     final position = RelativeRect.fromRect(
       Rect.fromPoints(
         button.localToGlobal(Offset.zero, ancestor: overlay),
diff --git a/lib/src/widgets/toolbar/quill_font_size_button.dart b/lib/src/widgets/toolbar/quill_font_size_button.dart
index fc99618c..da6fa187 100644
--- a/lib/src/widgets/toolbar/quill_font_size_button.dart
+++ b/lib/src/widgets/toolbar/quill_font_size_button.dart
@@ -110,8 +110,7 @@ class _QuillFontSizeButtonState extends State<QuillFontSizeButton> {
   void _showMenu() {
     final popupMenuTheme = PopupMenuTheme.of(context);
     final button = context.findRenderObject() as RenderBox;
-    final overlay =
-        Overlay.of(context)!.context.findRenderObject() as RenderBox;
+    final overlay = Overlay.of(context).context.findRenderObject() as RenderBox;
     final position = RelativeRect.fromRect(
       Rect.fromPoints(
         button.localToGlobal(Offset.zero, ancestor: overlay),
diff --git a/pubspec.yaml b/pubspec.yaml
index 51686145..466d5486 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_quill
 description: A rich text editor supporting mobile and web (Demo App @ bulletjournal.us)
-version: 6.2.2
+version: 6.3.0
 #author: bulletjournal
 homepage: https://bulletjournal.us/home/index.html
 repository: https://github.com/singerdmx/flutter-quill