Merge remote-tracking branch 'origin/main' into release/v0.36.0

famedly · Dec 18, 2024 · a3b9f40 · a3b9f40
2 parents 157fec4 + 01e6633
commit a3b9f40
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
@@ -129,7 +129,7 @@ jobs:
       - name: Run tests
         run: |
           dart pub get
-          dart test test/box_test.dart --platform chrome --fail-fast
+          dart test test/box_test.dart --platform chrome
 
   pub-dev-dry-run:
     runs-on: ubuntu-latest

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -35,12 +35,10 @@ dependencies:
   webrtc_interface: ^1.2.0
 
 dev_dependencies:
-  build_runner: ^2.4.13
   coverage: ">=0.15.0 <2.0.0"
-  enhanced_enum_generator: ^0.2.4
   file: ">=6.1.1 <8.0.0"
   import_sorter: ^4.6.0
   lints: ^5.0.0
-  path: ^1.9.0
-  sqflite_common_ffi: ^2.3.2+1 # sqflite_common_ffi aggressively requires newer dart versions
-  test: ^1.15.7
+  path: ^1.9.1
+  sqflite_common_ffi: ^2.3.4+4 # sqflite_common_ffi aggressively requires newer dart versions
+  test: ^1.25.13
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -6,7 +6,7 @@ if [ -n "$NO_OLM" ]; then
     tagFlag="-x olm"
 fi
 
-dart test --concurrency=$thread_count --coverage=coverage_dir $tagFlag --fail-fast
+dart test --concurrency=$thread_count --coverage=coverage_dir $tagFlag
 TEST_CODE=$?
 
 # lets you do more stuff like reporton

diff --git a/test/client_test.dart b/test/client_test.dart
@@ -109,7 +109,7 @@ void main() {
     });
 
     test('Login', () async {
-      final matrix = Client(
+      matrix = Client(
         'testclient',
         httpClient: FakeMatrixApi(),
         databaseBuilder: getDatabase,