diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index fffbe52c..5d16959e 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: dart-lang/setup-dart@v1
         with:
-          sdk: "2.17.0"
+          sdk: "2.18.0"
           
       - id: angel3_container_upgrade
         name: angel3_container; Upgrade depedencies
@@ -87,7 +87,7 @@ jobs:
 
       - uses: dart-lang/setup-dart@v1
         with:
-          sdk: "2.17.0"
+          sdk: "2.18.0"
 
       # Angel3 ORM
       - id: angel3_orm_upgrade
diff --git a/packages/orm/angel_orm_generator/CHANGELOG.md b/packages/orm/angel_orm_generator/CHANGELOG.md
index be179786..701bba6d 100644
--- a/packages/orm/angel_orm_generator/CHANGELOG.md
+++ b/packages/orm/angel_orm_generator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 7.1.0
 
+* [Breaking] Require Dart >= 2.18
 * Upgraded to `analyzer` 5.x.x
 * Replaced deprecated `element2` with `element`
 
diff --git a/packages/orm/angel_orm_generator/pubspec.yaml b/packages/orm/angel_orm_generator/pubspec.yaml
index 6f327e1f..39ddfa7a 100644
--- a/packages/orm/angel_orm_generator/pubspec.yaml
+++ b/packages/orm/angel_orm_generator/pubspec.yaml
@@ -4,7 +4,7 @@ description: Code generators for Angel3 ORM. Generates query builder classes.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_generator
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 dependencies:
   angel3_model: ^7.0.0
   angel3_serialize: ^7.0.0
diff --git a/packages/serialize/angel_serialize_generator/CHANGELOG.md b/packages/serialize/angel_serialize_generator/CHANGELOG.md
index 0e6eb935..1bbaa7c0 100644
--- a/packages/serialize/angel_serialize_generator/CHANGELOG.md
+++ b/packages/serialize/angel_serialize_generator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 7.1.0
 
+* [Breaking] Require Dart >= 2.18
 * Upgraded to `analyzer` 5.x.x
 * Replaced deprecated `element2` with `element`
 
diff --git a/packages/serialize/angel_serialize_generator/pubspec.yaml b/packages/serialize/angel_serialize_generator/pubspec.yaml
index bcb2a032..a1305c6e 100644
--- a/packages/serialize/angel_serialize_generator/pubspec.yaml
+++ b/packages/serialize/angel_serialize_generator/pubspec.yaml
@@ -4,7 +4,7 @@ description: Angel3 model serialization generators, designed for use with Angel.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/serialize/angel_serialize_generator
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.18.0 <3.0.0'
 dependencies:
   analyzer: ^5.0.0
   angel3_model: ^7.0.0
diff --git a/packages/serialize/angel_serialize_generator/test/models/book.g.dart b/packages/serialize/angel_serialize_generator/test/models/book.g.dart
index bd2f4488..92623179 100644
--- a/packages/serialize/angel_serialize_generator/test/models/book.g.dart
+++ b/packages/serialize/angel_serialize_generator/test/models/book.g.dart
@@ -620,8 +620,8 @@ class LibrarySerializer extends Codec<Library, Map> {
       'created_at': model.createdAt?.toIso8601String(),
       'updated_at': model.updatedAt?.toIso8601String(),
       'collection': model.collection.keys.fold({}, (map, key) {
-        return (map as Map<dynamic, dynamic>?)
-          ?..[key] = BookSerializer.toMap(model.collection[key]);
+        return (map as Map<dynamic, dynamic>)
+          ..[key] = BookSerializer.toMap(model.collection[key]);
       })
     };
   }