Merge branch 'main' into feat/add-tryRead

VeryGoodOpenSource · Dec 19, 2024 · 6f2a9a0 · 6f2a9a0
2 parents a2c8721 + fea901c
commit 6f2a9a0
Show file tree

Hide file tree

Showing 39 changed files with 40 additions and 31 deletions.
diff --git a/bricks/dart_frog_new/hooks/analysis_options.yaml b/bricks/dart_frog_new/hooks/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 
 linter:
   rules:

diff --git a/bricks/dart_frog_new/hooks/lib/post_gen.dart b/bricks/dart_frog_new/hooks/lib/post_gen.dart
@@ -28,7 +28,7 @@ Future<void> postGen(
     io.File(
       path.join(currentDirectory.path, filename),
     ).renameSync('$containingDirectoryPath/$filename');
-  } catch (error) {
+  } on Exception catch (error) {
     context.logger.err('$error');
     return exit(1);
   }

diff --git a/bricks/dart_frog_new/hooks/lib/pre_gen.dart b/bricks/dart_frog_new/hooks/lib/pre_gen.dart
@@ -29,7 +29,7 @@ void preGen(
   final RouteConfiguration routeConfiguration;
   try {
     routeConfiguration = buildConfiguration(projectDirectory);
-  } catch (error) {
+  } on Exception catch (error) {
     context.logger.err('$error');
     return exit(1);
   }

diff --git a/bricks/dart_frog_new/hooks/pubspec.yaml b/bricks/dart_frog_new/hooks/pubspec.yaml
@@ -12,4 +12,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.0
   test: ^1.19.2
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/counter/analysis_options.yaml b/examples/counter/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/counter/pubspec.yaml b/examples/counter/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/echo/analysis_options.yaml b/examples/echo/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/echo/pubspec.yaml b/examples/echo/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/hello_world/analysis_options.yaml b/examples/hello_world/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/hello_world/pubspec.yaml b/examples/hello_world/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/kitchen_sink/analysis_options.yaml b/examples/kitchen_sink/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/kitchen_sink/pubspec.yaml b/examples/kitchen_sink/pubspec.yaml
@@ -13,4 +13,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/kitchen_sink/test/routes/photos/upload_test.dart b/examples/kitchen_sink/test/routes/photos/upload_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test file
 // ignore_for_file: prefer_const_constructors
 
 import 'dart:io';

diff --git a/examples/todos/analysis_options.yaml b/examples/todos/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/todos/packages/in_memory_todos_data_source/analysis_options.yaml b/examples/todos/packages/in_memory_todos_data_source/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/examples/todos/packages/in_memory_todos_data_source/lib/in_memory_todos_data_source.dart b/examples/todos/packages/in_memory_todos_data_source/lib/in_memory_todos_data_source.dart
@@ -1,5 +1,5 @@
 /// An in-memory implementation of the TodosDataSource interface.
-library in_memory_todos_data_source;
+library;
 
 export 'package:todos_data_source/todos_data_source.dart';
 

diff --git a/examples/todos/packages/in_memory_todos_data_source/pubspec.yaml b/examples/todos/packages/in_memory_todos_data_source/pubspec.yaml
@@ -14,4 +14,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/todos/packages/todos_data_source/analysis_options.yaml b/examples/todos/packages/todos_data_source/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/examples/todos/packages/todos_data_source/lib/todos_data_source.dart b/examples/todos/packages/todos_data_source/lib/todos_data_source.dart
@@ -1,5 +1,5 @@
 /// A generic interface for managing todos.
-library todos_data_source;
+library;
 
 export 'src/models/models.dart';
 export 'src/todos_data_source.dart';
diff --git a/examples/todos/packages/todos_data_source/pubspec.yaml b/examples/todos/packages/todos_data_source/pubspec.yaml
@@ -16,4 +16,4 @@ dev_dependencies:
   json_serializable: ^6.3.1
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/todos/packages/todos_data_source/test/src/models/todo_test.dart b/examples/todos/packages/todos_data_source/test/src/models/todo_test.dart
@@ -1,3 +1,4 @@
+// Not required for test files
 // ignore_for_file: avoid_redundant_argument_values
 import 'package:test/test.dart';
 import 'package:todos_data_source/todos_data_source.dart';

diff --git a/examples/todos/packages/todos_data_source/test/src/todos_data_source_test.dart b/examples/todos/packages/todos_data_source/test/src/todos_data_source_test.dart
@@ -1,3 +1,4 @@
+// Not required for test files
 // ignore_for_file: prefer_const_constructors
 import 'package:test/test.dart';
 import 'package:todos_data_source/todos_data_source.dart';

diff --git a/examples/todos/pubspec.yaml b/examples/todos/pubspec.yaml
@@ -17,4 +17,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
diff --git a/examples/web_socket_counter/analysis_options.yaml b/examples/web_socket_counter/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
 analyzer:
   exclude:
     - build/**

diff --git a/examples/web_socket_counter/pubspec.yaml b/examples/web_socket_counter/pubspec.yaml
@@ -16,5 +16,5 @@ dev_dependencies:
   http: ^1.2.1
   mocktail: ^1.0.0
   test: ^1.25.0
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^7.0.0
   web_socket_client: ^0.1.0-dev.1
diff --git a/packages/dart_frog_auth/analysis_options.yaml b/packages/dart_frog_auth/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/packages/dart_frog_auth/lib/dart_frog_auth.dart b/packages/dart_frog_auth/lib/dart_frog_auth.dart
@@ -1,4 +1,4 @@
 /// Header auth based middlewares for Dart Frog
-library dart_frog_auth;
+library;
 
 export 'src/dart_frog_auth.dart';
diff --git a/packages/dart_frog_auth/pubspec.yaml b/packages/dart_frog_auth/pubspec.yaml
@@ -16,4 +16,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.0
   test: ^1.19.2
-  very_good_analysis: ">=5.1.0 <7.0.0"
+  very_good_analysis: ^7.0.0
diff --git a/packages/dart_frog_auth/test/src/dart_frog_auth_test.dart b/packages/dart_frog_auth/test/src/dart_frog_auth_test.dart
@@ -1,4 +1,6 @@
+// Not required for test files
 // ignore_for_file: prefer_const_constructors
+// Not required for test files
 // ignore_for_file: deprecated_member_use_from_same_package
 import 'dart:io';
 

diff --git a/packages/dart_frog_gen/analysis_options.yaml b/packages/dart_frog_gen/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/packages/dart_frog_gen/lib/dart_frog_gen.dart b/packages/dart_frog_gen/lib/dart_frog_gen.dart
@@ -1,5 +1,5 @@
 /// Code generation tooling for package:dart_frog
-library dart_frog_gen;
+library;
 
 export 'src/build_route_configuration.dart';
 export 'src/validate_route_configuration/validate_route_configuration.dart';
diff --git a/packages/dart_frog_gen/pubspec.yaml b/packages/dart_frog_gen/pubspec.yaml
@@ -18,4 +18,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.0
   test: ^1.19.2
-  very_good_analysis: ">=5.1.0 <7.0.0"
+  very_good_analysis: ^7.0.0
diff --git a/packages/dart_frog_gen/test/src/build_route_configuration_test.dart b/packages/dart_frog_gen/test/src/build_route_configuration_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test file
 // ignore_for_file: inference_failure_on_collection_literal
 
 import 'dart:io';

diff --git a/packages/dart_frog_gen/test/src/middleware_file_test.dart b/packages/dart_frog_gen/test/src/middleware_file_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test file
 // ignore_for_file: prefer_const_constructors
 
 import 'package:dart_frog_gen/dart_frog_gen.dart';

diff --git a/packages/dart_frog_gen/test/src/route_directory_test.dart b/packages/dart_frog_gen/test/src/route_directory_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test file
 // ignore_for_file: prefer_const_constructors
 
 import 'package:dart_frog_gen/dart_frog_gen.dart';

diff --git a/packages/dart_frog_gen/test/src/route_file_test.dart b/packages/dart_frog_gen/test/src/route_file_test.dart
@@ -1,3 +1,4 @@
+// Not needed for test file
 // ignore_for_file: prefer_const_constructors
 
 import 'package:dart_frog_gen/dart_frog_gen.dart';

diff --git a/packages/dart_frog_web_socket/analysis_options.yaml b/packages/dart_frog_web_socket/analysis_options.yaml
@@ -1 +1 @@
-include: package:very_good_analysis/analysis_options.6.0.0.yaml
+include: package:very_good_analysis/analysis_options.7.0.0.yaml
diff --git a/packages/dart_frog_web_socket/lib/dart_frog_web_socket.dart b/packages/dart_frog_web_socket/lib/dart_frog_web_socket.dart
@@ -1,5 +1,5 @@
 /// WebSocket support for package:dart_frog
-library dart_frog_web_socket;
+library;
 
 export 'package:web_socket_channel/web_socket_channel.dart';
 

diff --git a/packages/dart_frog_web_socket/pubspec.yaml b/packages/dart_frog_web_socket/pubspec.yaml
@@ -19,4 +19,4 @@ dev_dependencies:
   http: ^1.0.0
   mocktail: ^1.0.0
   test: ^1.19.2
-  very_good_analysis: ">=5.1.0 <7.0.0"
+  very_good_analysis: ^7.0.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include: package:very_good_analysis/analysis_options.6.0.0.yaml
		include: package:very_good_analysis/analysis_options.7.0.0.yaml