diff --git a/.gitignore b/.gitignore index 5876e8c..060200d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,5 +58,5 @@ sample-project .dart_tool .metals -.vscode -!.vscode/settings.json \ No newline at end of file +#.vscode +#!.vscode/settings.json \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 32cfc61..57d6762 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.watcherExclude": { "**/target": true - } + }, + "cmake.configureOnOpen": false } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 66fa9f1..071ad77 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/lib/src/commands/init.dart b/lib/src/commands/init.dart index 8bca097..466cae0 100644 --- a/lib/src/commands/init.dart +++ b/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', - 'A starter application with ORM support for MariaDB.', + 'ORM for MySQL/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', diff --git a/lib/src/commands/make/controller.dart b/lib/src/commands/make/controller.dart index 536ca97..1783953 100644 --- a/lib/src/commands/make/controller.dart +++ b/lib/src/commands/make/controller.dart @@ -41,7 +41,7 @@ class ControllerCommand extends Command { } var deps = [ - 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 { diff --git a/lib/src/commands/make/migration.dart b/lib/src/commands/make/migration.dart index 18520e2..f6a7790 100644 --- a/lib/src/commands/make/migration.dart +++ b/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) { diff --git a/lib/src/commands/make/model.dart b/lib/src/commands/make/model.dart index f2e6a17..0e400a0 100644 --- a/lib/src/commands/make/model.dart +++ b/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_generator', '^4.0.0')); - deps.add(const MakerDependency('build_runner', '^2.0.0')); + deps.add(const MakerDependency('angel3_serialize', '^7.0.0')); + deps.add(const MakerDependency('angel3_serialize_generator', '^7.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([ diff --git a/lib/src/commands/make/plugin.dart b/lib/src/commands/make/plugin.dart index 59766fa..10e718e 100644 --- a/lib/src/commands/make/plugin.dart +++ b/lib/src/commands/make/plugin.dart @@ -37,7 +37,7 @@ class PluginCommand extends Command { } var deps = [ - const MakerDependency('angel3_framework', '^4.1.0') + const MakerDependency('angel3_framework', '^7.0.0') ]; var rc = ReCase(name!); diff --git a/lib/src/commands/make/service.dart b/lib/src/commands/make/service.dart index 87d9bb8..fbd0f41 100644 --- a/lib/src/commands/make/service.dart +++ b/lib/src/commands/make/service.dart @@ -43,7 +43,7 @@ class ServiceCommand extends Command { } var deps = [ - const MakerDependency('angel3_framework', '^4.1.0') + const MakerDependency('angel3_framework', '^7.0.0') ]; // '${pubspec.name}.src.services.${rc.snakeCase}' diff --git a/lib/src/commands/make/test.dart b/lib/src/commands/make/test.dart index ca3e820..698d9e1 100644 --- a/lib/src/commands/make/test.dart +++ b/lib/src/commands/make/test.dart @@ -40,9 +40,9 @@ class TestCommand extends Command { } var deps = [ - const MakerDependency('angel3_framework', '^4.2.0'), - const MakerDependency('angel3_test', '^4.1.0', dev: true), - const MakerDependency('test', '^1.17.0', dev: true), + const MakerDependency('angel3_framework', '^7.0.0'), + const MakerDependency('angel3_test', '^7.0.0', dev: true), + const MakerDependency('test', '^1.21.0', dev: true), ]; var rc = ReCase(name!); diff --git a/lib/src/commands/service_generators/file_service.dart b/lib/src/commands/service_generators/file_service.dart index e4e2fa5..072b71d 100644 --- a/lib/src/commands/service_generators/file_service.dart +++ b/lib/src/commands/service_generators/file_service.dart @@ -8,7 +8,7 @@ class FileServiceGenerator extends ServiceGenerator { @override List 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')]) ]); } } diff --git a/lib/src/commands/service_generators/mongo.dart b/lib/src/commands/service_generators/mongo.dart index be09079..0e84fce 100644 --- a/lib/src/commands/service_generators/mongo.dart +++ b/lib/src/commands/service_generators/mongo.dart @@ -8,7 +8,7 @@ class MongoServiceGenerator extends ServiceGenerator { @override List get dependencies => - const [MakerDependency('angel3_mongo', '^4.0.0')]; + const [MakerDependency('angel3_mongo', '^7.0.0')]; @override bool get createsModel => false; diff --git a/pubspec.yaml b/pubspec.yaml index 5be8e1b..28695bc 100644 --- a/pubspec.yaml +++ b/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