Updated to version 7.0.0

.gitignore

@@ -58,5 +58,5 @@ sample-project
 .dart_tool
 .metals
 
-.vscode
+#.vscode
-!.vscode/settings.json
+#!.vscode/settings.json

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "files.watcherExclude": {
         "**/target": true
-    }
+    },
+    "cmake.configureOnOpen": false
 }

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 7.0.0
+
+* Required Dart >= 2.17.x
+* Updated packages versions
+
 ## 6.1.0
 
 * Updated to `analyzer` 4.x.x
@@ -11,7 +16,7 @@
 
 ## 6.0.0
 
-* Updated SDK to 2.16.x
+* Required Dart >= 2.16.x
 
 ## 5.0.0
 

lib/src/commands/init.dart

@@ -286,28 +286,28 @@ const BoilerplateInfo graphQLBoilerplate = BoilerplateInfo(
   'GraphQL',
   'A starter application with GraphQL support.',
   '$repoLocation/boilerplates.git',
-  ref: 'angel3-graphql',
+  ref: 'v7/angel3-graphql',
 );
 
 const BoilerplateInfo ormBoilerplate = BoilerplateInfo(
   'ORM for PostgreSQL',
   'A starter application with ORM support for PostgreSQL.',
   '$repoLocation/boilerplates.git',
-  ref: 'angel3-orm',
+  ref: 'v7/angel3-orm',
 );
 
 const BoilerplateInfo ormMySqlBoilerplate = BoilerplateInfo(
-  'ORM for MariaDB',
+  'ORM for MySQL/MariaDB',
-  'A starter application with ORM support for MariaDB.',
+  'A starter application with ORM support for MySQL/MariaDB.',
   '$repoLocation/boilerplates.git',
-  ref: 'angel3-orm-mysql',
+  ref: 'v7/angel3-orm-mysql',
 );
 
 const BoilerplateInfo basicBoilerplate = BoilerplateInfo(
     'Basic',
     'A basic starter application with minimal packages.',
     '$repoLocation/boilerplates.git',
-    ref: 'angel3-basic');
+    ref: 'v7/angel3-basic');
 
 const BoilerplateInfo sharedBoilerplate = BoilerplateInfo(
     'Shared',

lib/src/commands/make/controller.dart

@@ -41,7 +41,7 @@ class ControllerCommand extends Command {
     }
 
     var deps = <MakerDependency>[
-      const MakerDependency('angel3_framework', '^4.1.0')
+      const MakerDependency('angel3_framework', '^7.0.0')
     ];
 
     //${pubspec.name}.src.models.${rc.snakeCase}
@@ -49,7 +49,7 @@ class ControllerCommand extends Command {
     var rc = ReCase(name!);
     var controllerLib = Library((controllerLib) {
       if (argResults?['websocket'] as bool) {
-        deps.add(const MakerDependency('angel3_websocket', '^4.0.0'));
+        deps.add(const MakerDependency('angel3_websocket', '^7.0.0'));
         controllerLib.directives
             .add(Directive.import('package:angel3_websocket/server.dart'));
       } else {

lib/src/commands/make/migration.dart

@@ -37,7 +37,7 @@ class MigrationCommand extends Command {
       name = prompts.get('Name of model class');
     }
 
-    var deps = [const MakerDependency('angel3_migration', '^4.0.0')];
+    var deps = [const MakerDependency('angel3_migration', '^7.0.0')];
     var rc = ReCase(name!);
 
     var migrationLib = Library((migrationLib) {

lib/src/commands/make/model.dart

@@ -62,9 +62,9 @@ class ModelCommand extends Command {
       if (needsSerialize) {
         modelLib.directives.add(
             Directive.import('package:angel3_serialize/angel3_serialize.dart'));
-        deps.add(const MakerDependency('angel3_serialize', '^4.0.0'));
+        deps.add(const MakerDependency('angel3_serialize', '^7.0.0'));
-        deps.add(const MakerDependency('angel3_serialize_generator', '^4.0.0'));
+        deps.add(const MakerDependency('angel3_serialize_generator', '^7.0.0'));
-        deps.add(const MakerDependency('build_runner', '^2.0.0'));
+        deps.add(const MakerDependency('build_runner', '^2.2.0'));
       }
 
       // else {
@@ -77,7 +77,7 @@ class ModelCommand extends Command {
         modelLib.directives.addAll([
           Directive.import('package:angel3_orm/angel3_orm.dart'),
         ]);
-        deps.add(const MakerDependency('angel3_orm', '^4.0.0'));
+        deps.add(const MakerDependency('angel3_orm', '^7.0.0'));
       }
 
       modelLib.body.addAll([

lib/src/commands/make/plugin.dart

@@ -37,7 +37,7 @@ class PluginCommand extends Command {
     }
 
     var deps = <MakerDependency>[
-      const MakerDependency('angel3_framework', '^4.1.0')
+      const MakerDependency('angel3_framework', '^7.0.0')
     ];
 
     var rc = ReCase(name!);

lib/src/commands/make/service.dart

@@ -43,7 +43,7 @@ class ServiceCommand extends Command {
     }
 
     var deps = <MakerDependency>[
-      const MakerDependency('angel3_framework', '^4.1.0')
+      const MakerDependency('angel3_framework', '^7.0.0')
     ];
 
     // '${pubspec.name}.src.services.${rc.snakeCase}'

lib/src/commands/make/test.dart

@@ -40,9 +40,9 @@ class TestCommand extends Command {
     }
 
     var deps = <MakerDependency>[
-      const MakerDependency('angel3_framework', '^4.2.0'),
+      const MakerDependency('angel3_framework', '^7.0.0'),
-      const MakerDependency('angel3_test', '^4.1.0', dev: true),
+      const MakerDependency('angel3_test', '^7.0.0', dev: true),
-      const MakerDependency('test', '^1.17.0', dev: true),
+      const MakerDependency('test', '^1.21.0', dev: true),
     ];
 
     var rc = ReCase(name!);

lib/src/commands/service_generators/file_service.dart

@@ -8,7 +8,7 @@ class FileServiceGenerator extends ServiceGenerator {
 
   @override
   List<MakerDependency> get dependencies =>
-      const [MakerDependency('angel3_file_service', '^4.0.0')];
+      const [MakerDependency('angel3_file_service', '^7.0.0')];
 
   @override
   bool get goesFirst => true;
@@ -41,7 +41,7 @@ class FileServiceGenerator extends ServiceGenerator {
     return refer('JsonFileService').newInstance([
       refer('dbDirectory')
           .property('childFile')
-          .call([literal(pluralize(lower) + '_db.json')])
+          .call([literal('${pluralize(lower)}_db.json')])
     ]);
   }
 }

lib/src/commands/service_generators/mongo.dart

@@ -8,7 +8,7 @@ class MongoServiceGenerator extends ServiceGenerator {
 
   @override
   List<MakerDependency> get dependencies =>
-      const [MakerDependency('angel3_mongo', '^4.0.0')];
+      const [MakerDependency('angel3_mongo', '^7.0.0')];
 
   @override
   bool get createsModel => false;

pubspec.yaml

@@ -1,10 +1,10 @@
 name: angel3_cli
-version: 6.1.0
+version: 7.0.0
 description: Command line tools for the Angel3 framework, including scaffolding.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel3-cli
 environment: 
-  sdk: '>=2.16.0 <3.0.0'
+  sdk: '>=2.17.0 <3.0.0'
 dependencies: 
   analyzer: ^4.0.0
   args: ^2.1.1