Merge branch 'master' into feature/v8
This commit is contained in:
commit
4405b41acd
9 changed files with 21 additions and 20 deletions
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"files.watcherExclude": {
|
||||
"**/target": true
|
||||
}
|
||||
},
|
||||
"cmake.configureOnOpen": false
|
||||
}
|
|
@ -287,28 +287,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',
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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([
|
||||
|
|
|
@ -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!);
|
||||
|
|
|
@ -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}'
|
||||
|
|
|
@ -40,9 +40,9 @@ class TestCommand extends Command {
|
|||
}
|
||||
|
||||
var deps = <MakerDependency>[
|
||||
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!);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue