diff --git a/moor/pubspec.yaml b/moor/pubspec.yaml
index fb7e846e..aedd0ffd 100644
--- a/moor/pubspec.yaml
+++ b/moor/pubspec.yaml
@@ -15,14 +15,13 @@ dependencies:
 
 dev_dependencies:
   moor_generator: ^1.2.0
-  build_runner: ^1.2.0
+  build_runner: ^1.3.0
   build_test: ^0.10.6
-  test: ^1.5.3
-  test_api:
+  test: ^1.6.2
+  test_api: '>=0.2.0 <1.0.0'
   mockito: ^4.0.0
   grinder: ^0.8.0
   coverage: ^0.12.0
-  coveralls: ^5.1.0
 
 dependency_overrides:
   moor_generator:
diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml
index a120bffe..1bf16098 100644
--- a/moor_generator/pubspec.yaml
+++ b/moor_generator/pubspec.yaml
@@ -10,19 +10,22 @@ environment:
   sdk: '>=2.1.2-dev.0.0 <3.0.0'
 
 dependencies:
+  # for analyzer >=0.36, TableParser._readPrimaryKey needs to be adapted. It already supports SetOrMapLiteral, we just
+  # need to remove the cases for SetLiteral or MapLiteral (which only exist for backwards compatibility)
+  # also, built_value doesn't support it yet and everything depends on built_value
   analyzer: '>=0.34.0 <0.36.0'
   recase: ^2.0.1
-  built_value: ^6.3.0
+  built_value: '>=6.3.0 <6.5.0'
   source_gen: ^0.9.4
   build: ^1.1.0
-  build_runner: '>=1.1.0 <1.3.0'
+  build_runner: '>=1.1.0 <1.4.0'
   build_config: ^0.3.1
   moor: ^1.2.0
 
 dev_dependencies:
-  test: ^1.0.0
+  test: ^1.6.0
   test_api: ^0.2.0
-  built_value_generator: ^6.3.0
+  built_value_generator: ^6.4.0
   build_test: '>=0.10.0 <0.11.0'
 
 dependency_overrides: