Merge pull request #1711 from GetStream/chore/bump_min_3.10

GetStream · Aug 17, 2023 · 715c145 · 715c145
2 parents f7e676b + 20fe69c
commit 715c145
Show file tree

Hide file tree

Showing 50 changed files with 351 additions and 203 deletions.
diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
@@ -3,7 +3,7 @@ name: legacy_version_analyze
 env:
   # Note: The versions below should be manually updated after a new stable
   # version comes out.
-  flutter_version: "3.7.12"
+  flutter_version: "3.10.6"
 
 on:
   push:

diff --git a/.github/workflows/stream_flutter_workflow.yml b/.github/workflows/stream_flutter_workflow.yml
@@ -2,7 +2,7 @@ name: stream_flutter_workflow
 
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
-  flutter_version: "3.10.4"
+  flutter_channel: "stable"
 
 on:
   pull_request:
@@ -37,7 +37,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           cache: true
-          flutter-version: ${{ env.flutter_version }}
+          channel: ${{ env.flutter_channel }}
       - name: "Install Tools"
         run: |
           flutter pub global activate melos

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
@@ -9,6 +9,10 @@
 - Added support for `channel.countUnreadMentions()` to get the count of unread messages mentioning the current user on a
   channel. [#1692](https://github.com/GetStream/stream-chat-flutter/issues/1692)
 
+🔄 Changed
+
+- Updated minimum supported `SDK` version to Dart 3.0
+
 ## 6.7.0
 
 ✅ Added

diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml
@@ -5,8 +5,8 @@ publish_to: "none"
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
-  flutter: ">=3.7.0"
+  sdk: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"
 
 dependencies:
   cupertino_icons: ^1.0.5

diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
@@ -1696,7 +1696,7 @@ class ClientState {
   void updateUsers(List<User?> userList) {
     final newUsers = {
       ...users,
-      for (var user in userList)
+      for (final user in userList)
         if (user != null) user.id: user,
     };
     _usersController.add(newUsers);

diff --git a/packages/stream_chat/lib/src/ws/timer_helper.dart b/packages/stream_chat/lib/src/ws/timer_helper.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'package:uuid/uuid.dart';
 
 ///
-class TimerHelper {
+mixin class TimerHelper {
   final _uuid = const Uuid();
   late final _timers = <String, Timer>{};
 

diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
@@ -6,19 +6,19 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.19.0 <4.0.0'
+  sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  async: ^2.10.0
-  collection: ^1.17.0
-  dio: ^5.2.1+1
+  async: ^2.11.0
+  collection: ^1.17.1
+  dio: ^5.3.2
   equatable: ^2.0.5
-  freezed_annotation: ^2.2.0
+  freezed_annotation: ^2.4.1
   http_parser: ^4.0.2
-  jose: ^0.3.3
+  jose: ^0.3.4
   json_annotation: ^4.8.1
   logging: ^1.2.0
-  meta: ^1.8.0
+  meta: ^1.9.1
   mime: ^1.0.4
   rate_limiter: ^1.0.0
   rxdart: ^0.27.7
@@ -27,8 +27,8 @@ dependencies:
   web_socket_channel: ^2.4.0
 
 dev_dependencies:
-  build_runner: ^2.3.3
-  freezed: ^2.4.0
-  json_serializable: ^6.6.2
+  build_runner: ^2.4.6
+  freezed: ^2.4.2
+  json_serializable: ^6.7.1
   mocktail: ^1.0.0
-  test: ^1.24.3
+  test: ^1.24.6
diff --git a/packages/stream_chat/test/src/client/client_test.dart b/packages/stream_chat/test/src/client/client_test.dart
@@ -975,7 +975,7 @@ void main() {
         // skipping initial seed event -> {} users
         client.state.usersStream.skip(1),
         emitsInOrder([
-          {for (var user in users) user.id: user},
+          {for (final user in users) user.id: user},
         ]),
       );