Merge branch 'develop' into ffi

moor/pubspec.yaml

@@ -34,4 +34,4 @@ dependency_overrides:
     path: ../sqlparser
   # Temporarily use my fork because it can collect coverage when running tests with the test runner
   coverage:
-    git: https://github.com/simolus3/coverage.git
+    git: https://github.com/simolus3/coverage.git

moor/tool/tester.dart

@@ -2,8 +2,11 @@ import 'package:test_core/src/executable.dart' as test;
 import '../.dart_tool/build/entrypoint/build.dart' as builder;
 
 void main() async {
+  print('inside test file');
   // Run the build runner
   await builder.main(['build', '--delete-conflicting-outputs']);
+  print('done with build runner, now starting with tests');
   // Run tests
   await test.main([]);
+  print('done, script should terminate after coverage is collected');
 }

moor_generator/lib/src/parser/table_parser.dart

@@ -88,18 +88,13 @@ class TableParser extends ParserBase {
     final parsedPrimaryKey = <SpecifiedColumn>{};
 
     if (expression is SetOrMapLiteral) {
-      // todo replace with just "elements" when dropping support for analyzer
-      // 0.35.0
-      // ignore: deprecated_member_use
-      for (var entry in expression.elements2) {
+      for (var entry in expression.elements) {
         if (entry is Identifier) {
           final column = columns
               .singleWhere((column) => column.dartGetterName == entry.name);
           parsedPrimaryKey.add(column);
         } else {
-          // Don't add an error, these features aren't on a stable dart release
-          // yet.
-          print('Unexpected entry in expression.elements2: $entry');
+          print('Unexpected entry in expression.elements: $entry');
         }
       }
     } else {

moor_generator/pubspec.yaml

@@ -12,7 +12,7 @@ environment:
   sdk: '>=2.2.0 <3.0.0'
 
 dependencies:
-  analyzer: '>=0.35.2 <0.38.0'
+  analyzer: '>=0.36.0 <0.38.0'
   recase: ^2.0.1
   built_value: '>=6.3.0 <7.0.0'
   source_gen: ^0.9.4