Upgraded pub packages for Flutter v3.13.6 (#256)

* upgraded for flutter v3.13.6 * Update dart.yaml: updated flutter_version from 3.10.2 to 3.13.6 * Update dart.yaml: added flutter clean * Update dart.yaml * downgraded meta back to v1.9.1 because of ci workflow * collection: ^1.17.2 * cleared dart analyze --fatal-infos and checked flutter test * using replacedText instead of self-assignment
akvelon · Oct 17, 2023 · d7e4beb · d7e4beb
1 parent 149888a
commit d7e4beb
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 17 deletions.
diff --git a/.github/workflows/dart.yaml b/.github/workflows/dart.yaml
@@ -7,7 +7,7 @@ on:
     branches: [ '**' ]
 
 env:
-  flutter_version: 3.10.2
+  flutter_version: 3.13.6
 
 jobs:
   build:
@@ -29,9 +29,13 @@ jobs:
 
       - run: flutter --version
 
+      - run: flutter clean
+
       - name: Install Dependencies
         run: flutter pub get
 
+      - run: flutter pub outdated
+
       - name: Analyze
         run: dart analyze --fatal-infos
 

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -5,18 +5,18 @@ version: 1.0.0+1
 
 environment:
   sdk: '>=2.17.0 <3.0.0'
-  flutter: '>=3.0.0'
+  flutter: ">=3.13.6"
 
 dependencies:
   flutter: { sdk: flutter }
   flutter_code_editor: { path: ../ }
   flutter_highlight: ^0.7.0
   highlight: ^0.7.0
-  http: ^0.13.5
+  http: ^1.1.0
 
 dev_dependencies:
   flutter_test: { sdk: flutter }
-  total_lints: ^2.17.4
+  total_lints: ^3.1.1
 
 flutter:
   uses-material-design: true

diff --git a/lib/src/search/controller.dart b/lib/src/search/controller.dart
@@ -73,7 +73,7 @@ class CodeSearchController extends ChangeNotifier {
     patternFocusNode.unfocus();
     _hidingTimer?.cancel();
 
-    if (returnFocusToCodeField == true) {
+    if (returnFocusToCodeField) {
       _codeFieldFocusNode?.requestFocus();
     }
 
@@ -160,8 +160,8 @@ class CodeSearchController extends ChangeNotifier {
       return;
     }
 
-    final shouldDismiss = patternFocusNode.hasFocus == false &&
-        _codeFieldFocusNode?.hasFocus == false;
+    final shouldDismiss =
+        !patternFocusNode.hasFocus && _codeFieldFocusNode?.hasFocus == false;
 
     if (shouldDismiss) {
       hideSearch(returnFocusToCodeField: false);

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -11,23 +11,23 @@ dependencies:
   autotrie: ^2.0.0
   characters: ^1.2.1
   charcode: ^1.3.1
-  collection: ^1.16.0
+  collection: ^1.17.2
   equatable: ^2.0.5
   flutter: { sdk: flutter }
   flutter_highlight: ^0.7.0
   highlight: ^0.7.0
-  http: ^0.13.5
+  http: ^1.1.0
   linked_scroll_controller: ^0.2.0
-  meta: ^1.7.0
-  mocktail: ^0.3.0
+  meta: ^1.9.1
+  mocktail: ^1.0.1
   scrollable_positioned_list: ^0.3.5
   tuple: ^2.0.1
   url_launcher: ^6.1.8
 
 dev_dependencies:
   fake_async: ^1.3.1
   flutter_test: { sdk: flutter }
-  total_lints: ^2.18.0
+  total_lints: ^3.1.1
 
 flutter:
   uses-material-design: true
diff --git a/test/src/code/string_get_changed_range_test.dart b/test/src/code/string_get_changed_range_test.dart
@@ -82,7 +82,7 @@ void main() {
         str1: 'abccde',
         str2: 'abcde',
         expected: [TextRange(start: 2, end: 2), TextRange(start: 3, end: 3)],
-      )
+      ),
     ];
     const affinities = [TextAffinity.upstream, TextAffinity.downstream];
 

diff --git a/test/src/folding/parsers/highlight_parser_go_test.dart b/test/src/folding/parsers/highlight_parser_go_test.dart
@@ -58,7 +58,7 @@ func (
         InvalidFoldableBlock(endLine: 6, type: FBT.braces),
         InvalidFoldableBlock(endLine: 6, type: FBT.braces),
         InvalidFoldableBlock(startLine: 6, type: FBT.parentheses),
-        InvalidFoldableBlock(endLine: 8, type: FBT.braces)
+        InvalidFoldableBlock(endLine: 8, type: FBT.braces),
       ];
       _Tester.parseAndCheck(
         mode: go,

diff --git a/test/src/folding/parsers/indent_parser_test.dart b/test/src/folding/parsers/indent_parser_test.dart
@@ -169,7 +169,7 @@ numbers = [1,
     5
 ]''',
           expected: [_FB(firstLine: 0, lastLine: 4, type: _T.indent)],
-        )
+        ),
       ];
 
       for (final example in examples) {

diff --git a/test/src/history/code_history_controller_test.dart b/test/src/history/code_history_controller_test.dart
@@ -76,10 +76,14 @@ void main() {
           final controller = await pumpController(wt, MethodSnippet.full);
           await wt.cursorEnd();
 
-          controller.value = controller.value;
+          controller.value = controller.value.replacedText(
+            controller.value.text,
+          );
           controller.value = controller.value.typed('a');
           controller.value = controller.value.typed('b');
-          controller.value = controller.value;
+          controller.value = controller.value.replacedText(
+            controller.value.text,
+          );
           controller.foldAt(0);
           controller.unfoldAt(0);