diff --git a/extras/encryption/pubspec.yaml b/extras/encryption/pubspec.yaml
index 96a2f4bd..89dfb791 100644
--- a/extras/encryption/pubspec.yaml
+++ b/extras/encryption/pubspec.yaml
@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
-  moor: ^3.0.0
+  moor: ^4.0.0-nullsafety.0
   sqflite_sqlcipher: ^2.0.0-nullsafety
 
 dependency_overrides:
diff --git a/moor/pubspec.yaml b/moor/pubspec.yaml
index 41d64544..46530ed8 100644
--- a/moor/pubspec.yaml
+++ b/moor/pubspec.yaml
@@ -1,6 +1,6 @@
 name: moor
 description: Moor is a safe and reactive persistence library for Dart applications
-version: 3.5.0-dev
+version: 4.0.0-nullsafety.0
 repository: https://github.com/simolus3/moor
 homepage: https://moor.simonbinder.eu/
 issue_tracker: https://github.com/simolus3/moor/issues
diff --git a/moor_flutter/pubspec.yaml b/moor_flutter/pubspec.yaml
index 37bff2b7..2dd07f5c 100644
--- a/moor_flutter/pubspec.yaml
+++ b/moor_flutter/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
   sdk: '>=2.12.0-0 <3.0.0'
 
 dependencies:
-  moor: ^3.0.0
+  moor: ^4.0.0-nullsafety
   sqflite: '>=2.0.0-nullsafety <3.0.0'
   path: '>1.8.0-nullsafety <2.0.0'
   flutter:
diff --git a/moor_generator/lib/src/backends/build/build_backend.dart b/moor_generator/lib/src/backends/build/build_backend.dart
index d7f97511..2f61036b 100644
--- a/moor_generator/lib/src/backends/build/build_backend.dart
+++ b/moor_generator/lib/src/backends/build/build_backend.dart
@@ -95,6 +95,8 @@ class BuildBackendTask extends BackendTask {
           if (isLastTry) rethrow;
         }
       }
+
+      throw AssertionError('Unreachable, we rethrow in the last iteration');
     }
   }
 
diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml
index 6866c246..04a48cd3 100644
--- a/moor_generator/pubspec.yaml
+++ b/moor_generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: moor_generator
 description: Dev-dependency to generate table and dataclasses together with the moor package.
-version: 3.4.0
+version: 4.0.0-dev
 repository: https://github.com/simolus3/moor
 homepage: https://moor.simonbinder.eu/
 issue_tracker: https://github.com/simolus3/moor/issues