Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	moor_generator/CHANGELOG.md

moor/pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
   pedantic: ^1.0.0
 
 dev_dependencies:
-  moor_generator: ^1.7.0
+  moor_generator: ^2.0.0
   build_runner: '>=1.3.0 <2.0.0'
   build_test: ^0.10.8
   test: ^1.6.4

moor/tools/analyzer_plugin/pubspec.yaml

@@ -3,7 +3,7 @@ version: 1.0.0
 description: This pubspec is a part of moor and determines the version of the moor analyzer to load
 
 dependencies:
- moor_generator:
+ moor_generator: ^2.0.0
  web_socket_channel: ^1.0.15
 
 # These overrides are only needed when working on the plugin with useDebuggingVariant = false (not recommended)

moor_generator/CHANGELOG.md

@@ -3,6 +3,11 @@
 - Escape `\r` characters in generated Dart literals
 - Fix for [an analyzer bug on constant expressions](https://dartbug.com/38658) in generated code
 
+## 2.0.0
+- Rewritten generator with looser coupling to the build package
+- Implementation of an SQL IDE as analyzer plugin
+- Support `sqlparser` 0.3.0 and updated grammar for `moor` files
+
 ## 1.7.1
 - Drop support for analyzer versions `<0.36.4`. They weren't supported in version 1.7.0 either, but
   the `pubspec.yaml` did not specify this correctly.
@@ -15,8 +20,8 @@
 ## 1.6.0+2
 - Generate code to expand array variables
 
-_The +1 release has no changes to 1.6.0, there were issues while uploading to pub. +2
-tightens the analyzer dependency to avoid compilation errors_
+_The +1 release has no changes to 1.6.0, there were issues while uploading to pub. +2 fixes
+delivers on the promise of supporting the analyze 0.37_
 
 ## 1.5.0
 - Parse custom queries and write generated mapping code.
@@ -49,4 +54,4 @@ use a custom `ValueSerializer`
 - The generated data classes now implement `toString()`
 
 ## 1.0.0
-- Initial version of the Moor generator
+- Initial version of the Moor generator

moor_generator/pubspec.yaml

@@ -24,7 +24,8 @@ dependencies:
   build_config: '>=0.3.1 <1.0.0'
   moor: ^2.0.0
   meta: ^1.1.0
-  sqlparser: ^0.2.0
+  path: ^1.6.0
+  sqlparser: ^0.3.0
 dev_dependencies:
   test: ^1.6.0
   test_core: ^0.2.0