From 233f10b3849c39185f210315e496b632f105f26c Mon Sep 17 00:00:00 2001
From: thomashii <thomashii@dukefirehawk.com>
Date: Fri, 19 Feb 2021 22:34:24 +0800
Subject: [PATCH] Updated dependencies

---
 .gitignore                     |  3 +++
 bin/dev.dart                   |  2 +-
 bin/migrate.dart               |  2 +-
 bin/prod.dart                  |  2 +-
 config/default.yaml            |  8 +++----
 lib/src/models/greeting.g.dart |  4 ++--
 pubspec.yaml                   | 38 +++++++++++++++++++++++++++++++++-
 7 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d88b0df..e1e5311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,6 @@ logs/
 *.pem
 .DS_Store
 server_log.txt
+
+.metals/
+.vscode/
diff --git a/bin/dev.dart b/bin/dev.dart
index e22cba9..034a416 100644
--- a/bin/dev.dart
+++ b/bin/dev.dart
@@ -6,7 +6,7 @@ import 'package:angel_framework/angel_framework.dart';
 import 'package:angel_hot/angel_hot.dart';
 import 'package:logging/logging.dart';
 
-main() async {
+void main() async {
   // Watch the config/ and web/ directories for changes, and hot-reload the server.
   hierarchicalLoggingEnabled = true;
 
diff --git a/bin/migrate.dart b/bin/migrate.dart
index 49ed6f9..c89bc49 100644
--- a/bin/migrate.dart
+++ b/bin/migrate.dart
@@ -5,7 +5,7 @@ import 'package:angel_migration_runner/angel_migration_runner.dart';
 import 'package:angel_migration_runner/postgres.dart';
 import 'package:file/local.dart';
 
-main(List<String> args) async {
+void main(List<String> args) async {
   var fs = LocalFileSystem();
   var configuration = await loadStandaloneConfiguration(fs);
   var connection = await connectToPostgres(configuration);
diff --git a/bin/prod.dart b/bin/prod.dart
index db0ec67..fb7de39 100644
--- a/bin/prod.dart
+++ b/bin/prod.dart
@@ -25,6 +25,6 @@ import 'package:angel_production/angel_production.dart';
 // so in the meantime, visit the Angel chat for further questions:
 //
 // https://gitter.im/angel_dart/discussion
-main(List<String> args) =>
+void main(List<String> args) =>
     Runner('{{angel}}', configureServer, reflector: MirrorsReflector())
         .run(args);
diff --git a/config/default.yaml b/config/default.yaml
index c33077d..c171e6e 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -1,9 +1,9 @@
 # Default server configuration.
 jwt_secret: INSECURE_DEFAULT_SECRET
 host: 127.0.0.1
-mongo_db: mongodb://localhost:27017/angel
+# mongo_db: mongodb://localhost:27017/angel
 port: 3000
 postgres:
-  # database_name: angel
-  username: postgres
-  password: postgres
+  database_name: angel
+  username: angel
+  password: angel2020
diff --git a/lib/src/models/greeting.g.dart b/lib/src/models/greeting.g.dart
index f00039f..f219fb2 100644
--- a/lib/src/models/greeting.g.dart
+++ b/lib/src/models/greeting.g.dart
@@ -8,7 +8,7 @@ part of 'greeting.dart';
 
 class GreetingMigration extends Migration {
   @override
-  up(Schema schema) {
+  void up(Schema schema) {
     schema.create('greetings', (table) {
       table.serial('id')..primaryKey();
       table.varChar('message');
@@ -18,7 +18,7 @@ class GreetingMigration extends Migration {
   }
 
   @override
-  down(Schema schema) {
+  void down(Schema schema) {
     schema.drop('greetings');
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index a75b3ba..335b5cc 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,7 +2,7 @@ name: angel
 description: An app that's going to be amazing pretty soon.
 publish_to: none # Ensure we don't accidentally publish our private code! ;)
 environment:
-  sdk: '>=2.0.0-dev <3.0.0'
+  sdk: '>=2.10.0 <2.12.0'
 homepage: https://github.com/angel-dart/angel
 dependencies:
   angel_auth: ^2.0.0 # Supports stateless authentication via JWT
@@ -26,3 +26,39 @@ dev_dependencies:
   io: ^0.3.2 # For pretty printing.
   pedantic: ^1.0.0 # Enforces Dart style conventions.
   test: ^1.0.0 # For unit testing.
+dependency_overrides:
+  angel_auth:
+    path: ../angel/packages/auth
+  angel_configuration:
+    path: ../angel/packages/configuration
+  angel_framework:
+    path: ../angel/packages/framework
+  angel_jael:
+    path: ../angel/packages/jael/angel_jael
+  angel_migration: 
+    path: ../angel/packages/orm/angel_migration
+  angel_orm: 
+    path: ../angel/packages/orm/angel_orm
+  angel_orm_postgres: 
+    path: ../angel/packages/orm/angel_orm_postgres
+  angel_serialize:
+    path: ../angel/packages/serialize/angel_serialize
+  angel_production:
+    path: ../angel/packages/production
+  angel_static:
+    path: ../angel/packages/static
+  angel_validate:
+    path: ../angel/packages/validate
+  angel_hot:
+    path: ../angel/packages/hot
+  angel_test:
+    path: ../angel/packages/test
+  angel_migration_runner:
+    path: ../angel/packages/orm/angel_migration_runner
+  angel_orm_generator:
+    path: ../angel/packages/orm/angel_orm_generator
+  angel_serialize_generator:
+    path: ../angel/packages/serialize/angel_serialize_generator
+
+
+