Add more dependency overrides

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       - run: dart analyze --fatal-infos --fatal-warnings
         working-directory: moor/
       # build, test and upload coverage
-      - run: dart build_runner build
+      - run: dart run build_runner build
         working-directory: moor
       - run: dart --no-sound-null-safety test --coverage=coverage
         working-directory: moor
@@ -42,6 +42,8 @@ jobs:
     # setup
     - uses: actions/checkout@v2
     - uses: cedx/setup-dart@v2
+      with:
+        release-channel: beta
     - run: dart pub upgrade
       working-directory: moor_generator
     # analysis
@@ -79,6 +81,8 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: cedx/setup-dart@v2
+        with:
+          release-channel: beta
       - run: sudo apt-get install -y libsqlite3-dev
         name: Install sqlite3 for tests
       - run: tool/misc_integration_test.sh

extras/integration_tests/vm/pubspec.yaml

@@ -17,3 +17,4 @@ dev_dependencies:
 dependency_overrides:
   moor:
     path: ../../../moor
+  convert: ^3.0.0-nullsafety

extras/with_built_value/pubspec.yaml

@@ -23,4 +23,5 @@ dependency_overrides:
     path: ../../sqlparser
 
   # todo: Remove after built_value supports analyzer ^0.40
-  analyzer: 0.40.4
+  analyzer: 0.40.4
+  convert: ^3.0.0-nullsafety

tool/misc_integration_test.sh

@@ -4,14 +4,14 @@ EXIT_CODE=0
 
 pushd extras/integration_tests/vm
 echo "Running integration tests with moor_ffi & VM"
-pub upgrade
+dart pub upgrade
-pub run test || EXIT_CODE=$?
+dart test || EXIT_CODE=$?
 popd
 
 pushd extras/with_built_value
 echo "Running build runner in with_built_value"
-pub upgrade
+dart pub upgrade
-pub run build_runner build --delete-conflicting-outputs || EXIT_CODE=$?
+dart run build_runner build --delete-conflicting-outputs || EXIT_CODE=$?
 popd
 
 exit $EXIT_CODE