diff --git a/moor_generator/lib/src/parser/table_parser.dart b/moor_generator/lib/src/parser/table_parser.dart
index 395d2592..9d42ba89 100644
--- a/moor_generator/lib/src/parser/table_parser.dart
+++ b/moor_generator/lib/src/parser/table_parser.dart
@@ -87,8 +87,6 @@ class TableParser extends ParserBase {
     final expression = (body as ExpressionFunctionBody).expression;
     final parsedPrimaryKey = <SpecifiedColumn>{};
 
-    // todo no longer support SetLiteral / MapLiteral when we can afford
-    // dropping support for older analyzer versions
     if (expression is SetOrMapLiteral) {
       for (var entry in expression.elements2) {
         if (entry is Identifier) {
@@ -101,21 +99,6 @@ class TableParser extends ParserBase {
           print('Unexpected entry in expression.elements2: $entry');
         }
       }
-      // ignore: deprecated_member_use
-    } else if (expression is MapLiteral) {
-      for (var entry in expression.entries) {
-        final key = entry.key as Identifier;
-        final column =
-            columns.singleWhere((column) => column.dartGetterName == key.name);
-        parsedPrimaryKey.add(column);
-      }
-      // ignore: deprecated_member_use
-    } else if (expression is SetLiteral) {
-      for (var entry in expression.elements) {
-        final column = columns.singleWhere(
-            (column) => column.dartGetterName == (entry as Identifier).name);
-        parsedPrimaryKey.add(column);
-      }
     } else {
       generator.errors.add(MoorError(
           affectedElement: primaryKeyGetter,
diff --git a/moor_generator/pubspec.yaml b/moor_generator/pubspec.yaml
index d220c41a..43a638fb 100644
--- a/moor_generator/pubspec.yaml
+++ b/moor_generator/pubspec.yaml
@@ -10,10 +10,7 @@ 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'
+  analyzer: '>=0.35.2 <0.37.0'
   recase: ^2.0.1
   built_value: '>=6.3.0 <6.5.0'
   source_gen: ^0.9.4