diff --git a/packages/shorebird_cli/analysis_options.yaml b/packages/shorebird_cli/analysis_options.yaml
index df87ad5e..3cd7edfd 100644
--- a/packages/shorebird_cli/analysis_options.yaml
+++ b/packages/shorebird_cli/analysis_options.yaml
@@ -4,6 +4,9 @@ linter:
     # Disabling in favor of the new Dart 3.7 format.
     # https://github.com/VeryGoodOpenSource/very_good_analysis/issues/136
     require_trailing_commas: false
+    # Dart 3.7 format sometimes produces lines longer than 80 characters.
+    # https://github.com/dart-lang/sdk/issues/60173
+    lines_longer_than_80_chars: false
 analyzer:
   exclude:
     - lib/**.g.dart
diff --git a/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart b/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart
index 9cebc950..1dafe0d5 100644
--- a/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart
+++ b/packages/shorebird_cli/lib/src/artifact_builder/artifact_builder.dart
@@ -25,10 +25,10 @@ export 'artifact_build_exception.dart';
 /// Flutter.
 typedef ShorebirdBuildCommand = Future<void> Function();
 
-// FIXME: The following three apple BuildResult classes are identical and
-// should be merged. They are all capturing the idea that we want to get the
-// kernel (app.dill) file generated during a build so we can use it to link
-// when patching.
+// TODO(bryanoltman): The following three apple BuildResult classes are
+// identical and should be merged. They are all capturing the idea that we want
+// to get the kernel (app.dill) file generated during a build so we can use it
+// to link when patching.
 
 /// {@template ipa_build_result}
 /// Metadata about the result of a `flutter build ipa` invocation.
diff --git a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
index 3affe490..d5739992 100644
--- a/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
+++ b/packages/shorebird_cli/lib/src/commands/patch/macos_patcher.dart
@@ -75,8 +75,8 @@ class MacosPatcher extends Patcher {
     }
   }
 
-  // FIXME: this is a direct copy of IosPatcher's implementation. We should
-  // consolidate this and other copied code.
+  // TODO(bryanoltman): this is a direct copy of IosPatcher's implementation. We
+  // should consolidate this and other copied code.
   @override
   Future<DiffStatus> assertUnpatchableDiffs({
     required ReleaseArtifact releaseArtifact,
diff --git a/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart b/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart
index 1c9d54b6..53f089ff 100644
--- a/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart
+++ b/packages/shorebird_cli/test/src/commands/patch/patch_command_test.dart
@@ -963,7 +963,8 @@ void main() {
             ),
           ]);
 
-          // Verify that the logger.chooseOne<Release> display function is correct
+          // Verify that the logger.chooseOne<Release> display function is
+          // correct
           final displayFunctionCapture =
               verificationResult.captured.flattened
                   .whereType<String Function(Release)>()
diff --git a/packages/shorebird_code_push_protocol/analysis_options.yaml b/packages/shorebird_code_push_protocol/analysis_options.yaml
index 9493204b..aac47d51 100644
--- a/packages/shorebird_code_push_protocol/analysis_options.yaml
+++ b/packages/shorebird_code_push_protocol/analysis_options.yaml
@@ -2,4 +2,4 @@ include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**
-    - lib/**.g.dart
\ No newline at end of file
+    - lib/**.g.dart