From 41d83a274b0b213602870faac655c313e8eede40 Mon Sep 17 00:00:00 2001
From: "thomashii@dukefirehawk.com" <thomashii@dukefirehawk.com>
Date: Sat, 1 May 2021 12:07:15 +0800
Subject: [PATCH] Migrated to NNBD

---
 pubspec.yaml       | 25 +++++++++++++------------
 test/all_test.dart |  4 ++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index 8d6cb5b..7ce2fd7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,59 +1,60 @@
 name: angel
+version: 4.0.0
 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.10.0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 homepage: https://github.com/angel-dart/angel
 dependencies:
   angel_auth:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/auth
   angel_configuration:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/configuration
   angel_framework:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/framework
   angel_jael:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/jael/angel_jael
   angel_production:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/production
   angel_static:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/static
   angel_validate:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/validate
 dev_dependencies:
   angel_hot:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/hot
   angel_test:
     git: 
       url: https://github.com/dukefirehawk/angel.git
-      ref: sdk-2.12.x
+      ref: sdk-2.12.x_nnbd
       path: packages/test
-  io: ^0.3.5 # For pretty printing.
+  io: ^1.0.0 # For pretty printing.
   pedantic: ^1.11.0 # Enforces Dart style conventions.
-  test: ^1.16.5 # For unit testing.
+  test: ^1.17.3 # For unit testing.
 
 
 
diff --git a/test/all_test.dart b/test/all_test.dart
index f059daf..6529b07 100644
--- a/test/all_test.dart
+++ b/test/all_test.dart
@@ -20,7 +20,7 @@ import 'package:test/test.dart';
 // https://github.com/dart-lang/test
 
 main() async {
-  TestClient client;
+  late TestClient client;
 
   setUp(() async {
     var app = Angel();
@@ -35,7 +35,7 @@ main() async {
 
   test('index returns 200', () async {
     // Request a resource at the given path.
-    var response = await client.get('/');
+    var response = await client.get(Uri.parse('/'));
 
     // Expect a 200 response.
     expect(response, hasStatus(200));