From 44b53611a0350f3d17ca6a089b14cd7eb1f41c24 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 6 Jul 2023 02:44:15 +0530
Subject: [PATCH 01/16] chore(llc, core, persistence, ui, localization):
 updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md                       | 6 ++++++
 packages/stream_chat/example/pubspec.yaml               | 4 ++--
 packages/stream_chat/pubspec.yaml                       | 2 +-
 packages/stream_chat_flutter/CHANGELOG.md               | 6 ++++++
 packages/stream_chat_flutter/example/pubspec.yaml       | 4 ++--
 packages/stream_chat_flutter/pubspec.yaml               | 4 ++--
 packages/stream_chat_flutter_core/CHANGELOG.md          | 4 ++++
 packages/stream_chat_flutter_core/example/pubspec.yaml  | 4 ++--
 packages/stream_chat_flutter_core/pubspec.yaml          | 4 ++--
 packages/stream_chat_localizations/CHANGELOG.md         | 4 ++++
 packages/stream_chat_localizations/example/pubspec.yaml | 3 ++-
 packages/stream_chat_localizations/pubspec.yaml         | 4 ++--
 packages/stream_chat_persistence/CHANGELOG.md           | 4 ++++
 packages/stream_chat_persistence/example/pubspec.yaml   | 4 ++--
 packages/stream_chat_persistence/pubspec.yaml           | 4 ++--
 15 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 573e21f8d..e8f5c67cb 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Upcoming
+
+🔄 Changed
+
+- Updated minimum supported `SDK` version to Dart 2.18
+
 ## 6.4.0
 
 🐞 Fixed
diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml
index dfedc5b2f..725c05499 100644
--- 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.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: '>=2.18.0 <4.0.0'
+  flutter: ">=3.3.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index 7156199c0..ebd77c17c 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -6,7 +6,7 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
+  sdk: '>=2.18.0 <4.0.0'
 
 dependencies:
   async: ^2.10.0
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 8705e9c65..0e27b8f1f 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Upcoming
+
+🔄 Changed
+
+- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+
 ## 6.5.0
 
 🐞 Fixed
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index dfc36a084..b367a66ad 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -18,8 +18,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   # The following adds the Cupertino Icons font to your application.
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 3d298d837..fcd24a0fb 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.17.0 <4.0.0"
-  flutter: ">=1.20.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   cached_network_image: ^3.0.0
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index dbab96110..0cc5486a3 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Upcoming
+
+- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+
 ## 6.4.0
 
 - Updated `stream_chat` dependency to [`6.4.0`](https://pub.dev/packages/stream_chat/changelog).
diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml
index a67d6c9b9..e61f872ae 100644
--- a/packages/stream_chat_flutter_core/example/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/example/pubspec.yaml
@@ -18,8 +18,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   # The following adds the Cupertino Icons font to your application.
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index b3448b07b..4d01809ad 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   collection: ^1.17.0
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index 86b6a739b..f2ad2fd80 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Upcoming
+
+- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+
 ## 5.5.0
 
 * Updated `stream_chat_flutter` dependency to [`6.5.0`](https://pub.dev/packages/stream_chat_flutter/changelog).
diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml
index 0d98bfa71..bded01875 100644
--- a/packages/stream_chat_localizations/example/pubspec.yaml
+++ b/packages/stream_chat_localizations/example/pubspec.yaml
@@ -5,7 +5,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_localizations/pubspec.yaml b/packages/stream_chat_localizations/pubspec.yaml
index 85a2cd4d1..d9d076642 100644
--- a/packages/stream_chat_localizations/pubspec.yaml
+++ b/packages/stream_chat_localizations/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.20.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   flutter:
diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md
index 152ed2560..393a17ef0 100644
--- a/packages/stream_chat_persistence/CHANGELOG.md
+++ b/packages/stream_chat_persistence/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Upcoming
+
+- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+
 ## 6.4.0
 
 - Updated `stream_chat` dependency to [`6.4.0`](https://pub.dev/packages/stream_chat/changelog).
diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml
index 4f20ad85e..a288d679b 100644
--- a/packages/stream_chat_persistence/example/pubspec.yaml
+++ b/packages/stream_chat_persistence/example/pubspec.yaml
@@ -5,8 +5,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index cb76edad6..2cc62b15d 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.17.0 <4.0.0'
-  flutter: ">=1.17.0"
+  sdk: ">=2.18.0 <4.0.0"
+  flutter: ">=3.3.0"
 
 dependencies:
   drift: ^2.7.0

From bb38fd384ff2ba2a47d59c1e7b18940f7b68789c Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 6 Jul 2023 03:22:12 +0530
Subject: [PATCH 02/16] ci(repo): add legacy_version_analyze.yml

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .github/workflows/legacy_version_analyze.yml | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 .github/workflows/legacy_version_analyze.yml

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
new file mode 100644
index 000000000..fa196935d
--- /dev/null
+++ b/.github/workflows/legacy_version_analyze.yml
@@ -0,0 +1,57 @@
+name: legacy_version_analyze
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+    paths:
+      - 'packages/**'
+      - '.github/workflows/legacy_version_analyze.yml'
+  pull_request:
+    branches:
+      - master
+      - develop
+    paths:
+      - 'packages/**'
+      - '.github/workflows/legacy_version_analyze.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # Does a sanity check that packages at least pass analysis on the N-1 and N-2
+  # versions of Flutter stable if the package claims to support that version.
+  # This is to minimize accidentally making changes that break old versions
+  # (which we don't commit to supporting, but don't want to actively break)
+  # without updating the constraints.
+  analyze_legacy_versions:
+    timeout-minutes: 15
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+
+    # Note: The versions below should be manually updated after a new stable
+    # version comes out.
+    strategy:
+      matrix:
+        flutter_version:
+          - "3.7.12"
+          - "3.3.10"
+
+    steps:
+      - name: "Git Checkout"
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: "Install Flutter"
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          flutter-version: ${{ matrix.flutter_version }}
+      - name: "Install Tools"
+        run: flutter pub global activate melos
+      - name: "Bootstrap Workspace"
+        run: melos bootstrap --verbose
+      - name: "Dart Analyze"
+        run: melos run analyze
\ No newline at end of file

From e76f3e922717cd31fb6a631a9fd679687e87cf12 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 6 Jul 2023 03:35:56 +0530
Subject: [PATCH 03/16] chore: remove flutter test deps from examples.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/example/pubspec.yaml     |  4 --
 .../stream_chat_flutter/example/pubspec.yaml  | 59 +-----------------
 .../example/pubspec.yaml                      | 61 +------------------
 .../example/pubspec.yaml                      |  4 --
 .../example/pubspec.yaml                      |  5 --
 5 files changed, 2 insertions(+), 131 deletions(-)

diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml
index 725c05499..b2855d2a0 100644
--- a/packages/stream_chat/example/pubspec.yaml
+++ b/packages/stream_chat/example/pubspec.yaml
@@ -14,9 +14,5 @@ dependencies:
     sdk: flutter
   stream_chat: ^6.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
 flutter:
   uses-material-design: true
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index b367a66ad..1b42acec1 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -1,20 +1,6 @@
 name: stream_chat_flutter_example
 description: A new Flutter project.
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+publish_to: 'none'
 version: 1.0.0+1
 
 environment:
@@ -22,8 +8,6 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
   collection: ^1.15.0
   cupertino_icons: ^1.0.4
   flutter:
@@ -33,48 +17,7 @@ dependencies:
   stream_chat_localizations: ^5.4.0
   stream_chat_persistence: ^6.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
   assets:
     - assets/background_doodle.png
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml
index e61f872ae..ed9e59b67 100644
--- a/packages/stream_chat_flutter_core/example/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/example/pubspec.yaml
@@ -1,20 +1,6 @@
 name: stream_chat_flutter_core_example
 description: Example app for testing stream_chat_flutter_core
-
-# The following line prevents the package from being accidentally published to
-# pub.dev using `pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
+publish_to: 'none'
 version: 1.0.0+1
 
 environment:
@@ -22,55 +8,10 @@ environment:
   flutter: ">=3.3.0"
 
 dependencies:
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
   stream_chat_flutter_core: ^6.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter.
 flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
   uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware.
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages
diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml
index bded01875..252b0b6f7 100644
--- a/packages/stream_chat_localizations/example/pubspec.yaml
+++ b/packages/stream_chat_localizations/example/pubspec.yaml
@@ -15,9 +15,5 @@ dependencies:
   stream_chat_flutter: ^6.4.0
   stream_chat_localizations: ^5.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
 flutter:
   uses-material-design: true
\ No newline at end of file
diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml
index a288d679b..e7cb4a8d2 100644
--- a/packages/stream_chat_persistence/example/pubspec.yaml
+++ b/packages/stream_chat_persistence/example/pubspec.yaml
@@ -1,6 +1,5 @@
 name: stream_chat_persistence_example
 description: A new Flutter project.
-
 publish_to: 'none' 
 version: 1.0.0+1
 
@@ -15,9 +14,5 @@ dependencies:
   stream_chat: ^6.4.0
   stream_chat_persistence: ^6.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
 flutter:
   uses-material-design: true
\ No newline at end of file

From 7ac020bc0ac127c9328fd938cb17943c6c60f37e Mon Sep 17 00:00:00 2001
From: xsahil03x <xdsahil@gmail.com>
Date: Thu, 6 Jul 2023 15:25:39 +0530
Subject: [PATCH 04/16] Revert "ci(repo): add legacy_version_analyze.yml"

This reverts commit bb38fd384ff2ba2a47d59c1e7b18940f7b68789c.
---
 .github/workflows/legacy_version_analyze.yml | 57 --------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 .github/workflows/legacy_version_analyze.yml

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
deleted file mode 100644
index fa196935d..000000000
--- a/.github/workflows/legacy_version_analyze.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: legacy_version_analyze
-
-on:
-  push:
-    branches:
-      - master
-      - develop
-    paths:
-      - 'packages/**'
-      - '.github/workflows/legacy_version_analyze.yml'
-  pull_request:
-    branches:
-      - master
-      - develop
-    paths:
-      - 'packages/**'
-      - '.github/workflows/legacy_version_analyze.yml'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  # Does a sanity check that packages at least pass analysis on the N-1 and N-2
-  # versions of Flutter stable if the package claims to support that version.
-  # This is to minimize accidentally making changes that break old versions
-  # (which we don't commit to supporting, but don't want to actively break)
-  # without updating the constraints.
-  analyze_legacy_versions:
-    timeout-minutes: 15
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-
-    # Note: The versions below should be manually updated after a new stable
-    # version comes out.
-    strategy:
-      matrix:
-        flutter_version:
-          - "3.7.12"
-          - "3.3.10"
-
-    steps:
-      - name: "Git Checkout"
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: "Install Flutter"
-        uses: subosito/flutter-action@v2
-        with:
-          cache: true
-          flutter-version: ${{ matrix.flutter_version }}
-      - name: "Install Tools"
-        run: flutter pub global activate melos
-      - name: "Bootstrap Workspace"
-        run: melos bootstrap --verbose
-      - name: "Dart Analyze"
-        run: melos run analyze
\ No newline at end of file

From 6dc6fdc116c2462ac6d70c5cbd391e2a205c54cb Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 18:46:12 +0530
Subject: [PATCH 05/16] chore(repo): updated minimum supported SDK version to
 Flutter 3.7/Dart 2.19

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .github/workflows/legacy_version_analyze.yml  | 53 +++++++++++++++++++
 packages/stream_chat/pubspec.yaml             | 18 +++----
 .../stream_message_input_attachment_list.dart |  2 +-
 packages/stream_chat_flutter/pubspec.yaml     | 46 ++++++++--------
 .../stream_chat_flutter_core/pubspec.yaml     | 14 ++---
 packages/stream_chat_persistence/pubspec.yaml | 14 ++---
 6 files changed, 100 insertions(+), 47 deletions(-)
 create mode 100644 .github/workflows/legacy_version_analyze.yml

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
new file mode 100644
index 000000000..2454e09ca
--- /dev/null
+++ b/.github/workflows/legacy_version_analyze.yml
@@ -0,0 +1,53 @@
+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"
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+    paths:
+      - 'packages/**'
+      - '.github/workflows/legacy_version_analyze.yml'
+  pull_request:
+    branches:
+      - master
+      - develop
+    paths:
+      - 'packages/**'
+      - '.github/workflows/legacy_version_analyze.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # Does a sanity check that packages at least pass analysis on the N-1
+  # versions of Flutter stable if the package claims to support that version.
+  # This is to minimize accidentally making changes that break old versions
+  # (which we don't commit to supporting, but don't want to actively break)
+  # without updating the constraints.
+  analyze_legacy_versions:
+    timeout-minutes: 15
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Git Checkout"
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: "Install Flutter"
+        uses: subosito/flutter-action@v2
+        with:
+          cache: true
+          flutter-version: ${{ env.flutter_version }}
+      - name: "Install Tools"
+        run: flutter pub global activate melos
+      - name: "Bootstrap Workspace"
+        run: melos bootstrap --verbose
+      - name: "Dart Analyze"
+        run: melos run analyze
\ No newline at end of file
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index ebd77c17c..b52f7bfd2 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -6,29 +6,29 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: '>=2.18.0 <4.0.0'
+  sdk: '>=2.19.0 <4.0.0'
 
 dependencies:
   async: ^2.10.0
   collection: ^1.17.0
-  dio: ^5.2.0
+  dio: ^5.2.1+1
   equatable: ^2.0.5
   freezed_annotation: ^2.2.0
   http_parser: ^4.0.2
   jose: ^0.3.3
-  json_annotation: ^4.8.0
-  logging: ^1.1.1
+  json_annotation: ^4.8.1
+  logging: ^1.2.0
   meta: ^1.8.0
   mime: ^1.0.4
   rate_limiter: ^1.0.0
   rxdart: ^0.27.7
-  synchronized: ^3.0.0
+  synchronized: ^3.1.0
   uuid: ^3.0.7
-  web_socket_channel: ^2.3.0
+  web_socket_channel: ^2.4.0
 
 dev_dependencies:
   build_runner: ^2.3.3
-  freezed: ^2.3.2
-  json_serializable: ^6.6.1
+  freezed: ^2.4.0
+  json_serializable: ^6.6.2
   mocktail: ^0.3.0
-  test: ^1.24.1
+  test: ^1.24.3
diff --git a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart
index a849bffc2..46ebbd85f 100644
--- a/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input/stream_message_input_attachment_list.dart
@@ -208,7 +208,7 @@ class MessageInputFileAttachments extends StatelessWidget {
               message: Message(), // dummy message
               attachment: attachment,
               constraints: BoxConstraints.loose(Size(
-                MediaQuery.sizeOf(context).width * 0.65,
+                MediaQuery.of(context).size.width * 0.65,
                 56,
               )),
               trailing: Padding(
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index fcd24a0fb..6b022c118 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -6,45 +6,45 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
-  cached_network_image: ^3.0.0
-  chewie: ^1.6.0
+  cached_network_image: ^3.2.3
+  chewie: ^1.7.0
   collection: ^1.17.0
   contextmenu: ^3.0.0
   dart_vlc: ^0.4.0
-  desktop_drop: ^0.4.0
-  diacritic: ^0.1.3
-  dio: ^5.2.0
+  desktop_drop: ^0.4.1
+  diacritic: ^0.1.4
+  dio: ^5.2.1+1
   ezanimation: ^0.6.0
-  file_picker: ^5.2.4
-  file_selector: ^0.9.0
+  file_picker: ^5.3.1
+  file_selector: ^1.0.0
   flutter:
     sdk: flutter
-  flutter_markdown: ^0.6.1
-  flutter_portal: ^1.0.0
-  flutter_svg: ^2.0.4
-  http_parser: ^4.0.0
-  image_gallery_saver: ^2.0.1
-  image_picker: ">=0.8.2 <2.0.0"
+  flutter_markdown: ^0.6.15
+  flutter_portal: ^1.1.4
+  flutter_svg: ^2.0.5
+  http_parser: ^4.0.2
+  image_gallery_saver: ^2.0.3
+  image_picker: ^1.0.0
   jiffy: ^6.2.1
-  lottie: ^2.0.0
+  lottie: ^2.3.2
   meta: ^1.8.0
-  path_provider: ^2.0.9
-  photo_manager: ^2.5.2
+  path_provider: ^2.0.15
+  photo_manager: ^2.6.0
   photo_view: ^0.14.0
-  rxdart: ^0.27.0
+  rxdart: ^0.27.7
   share_plus: ^7.0.2
   shimmer: ^3.0.0
   stream_chat_flutter_core: ^6.4.0
-  synchronized: ^3.0.0
+  synchronized: ^3.1.0
   thumblr: ^0.0.4
-  url_launcher: ^6.1.0
+  url_launcher: ^6.1.11
   video_player: ^2.7.0
   video_player_macos: ^2.0.1
-  video_thumbnail: ^0.5.0
+  video_thumbnail: ^0.5.3
 
 flutter:
   plugin:
@@ -74,4 +74,4 @@ dev_dependencies:
     sdk: flutter
   golden_toolkit: ^0.15.0
   mocktail: ^0.3.0
-  path: ^1.8.2
+  path: ^1.8.3
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 4d01809ad..16902a1cc 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -6,24 +6,24 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
   collection: ^1.17.0
-  connectivity_plus: ^4.0.0
+  connectivity_plus: ^4.0.1
   flutter:
     sdk: flutter
-  freezed_annotation: ^2.0.3
+  freezed_annotation: ^2.2.0
   meta: ^1.8.0
-  rxdart: ^0.27.0
+  rxdart: ^0.27.7
   stream_chat: ^6.4.0
 
 dev_dependencies:
   build_runner: ^2.3.3
-  fake_async: ^1.2.0
+  fake_async: ^1.3.1
   flutter_test:
     sdk: flutter
-  freezed: ^2.3.2
+  freezed: ^2.4.0
   mocktail: ^0.3.0
 
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 2cc62b15d..6ff7ac156 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -6,23 +6,23 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
-  drift: ^2.7.0
+  drift: ^2.8.0
   flutter:
     sdk: flutter
-  logging: ^1.0.1
+  logging: ^1.2.0
   meta: ^1.8.0
   path: ^1.8.2
-  path_provider: ^2.0.1
-  sqlite3_flutter_libs: ^0.5.0
+  path_provider: ^2.0.15
+  sqlite3_flutter_libs: ^0.5.15
   stream_chat: ^6.4.0
 
 dev_dependencies:
   build_runner: ^2.3.3
-  drift_dev: ^2.7.0
+  drift_dev: ^2.8.3
   flutter_test:
     sdk: flutter
   mocktail: ^0.3.0

From 58891a4da04c493e33cb150a6271fba399f7a42c Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 18:54:54 +0530
Subject: [PATCH 06/16] chore(ui): remove path dev dependency.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/pubspec.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 6b022c118..c78d7dbac 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -73,5 +73,4 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   golden_toolkit: ^0.15.0
-  mocktail: ^0.3.0
-  path: ^1.8.3
+  mocktail: ^0.3.0
\ No newline at end of file

From 0e3eef7e1b6a029c0cda01c7c118841d0a994f3f Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 19:21:57 +0530
Subject: [PATCH 07/16] chore(ui, localization): revert "bump jiffy to v6.2.1"

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/CHANGELOG.md     |  1 -
 .../lib/src/channel/channel_info.dart         |  3 +--
 .../lib/src/channel/channel_preview.dart      |  6 ++---
 .../lib/src/localization/translations.dart    |  8 +++----
 .../message_list_view/message_list_view.dart  | 22 ++++++-------------
 .../lib/src/message_widget/bottom_row.dart    |  2 +-
 .../lib/src/misc/date_divider.dart            | 12 +++++-----
 .../stream_channel_list_tile.dart             |  6 ++---
 .../stream_message_search_list_tile.dart      |  4 ++--
 .../stream_user_list_tile.dart                |  3 +--
 .../lib/src/stream_chat.dart                  |  4 ++--
 packages/stream_chat_flutter/pubspec.yaml     |  2 +-
 .../example/lib/add_new_lang.dart             |  8 +++----
 .../lib/src/stream_chat_localizations_ca.dart |  8 +++----
 .../lib/src/stream_chat_localizations_de.dart |  8 +++----
 .../lib/src/stream_chat_localizations_en.dart |  8 +++----
 .../lib/src/stream_chat_localizations_es.dart |  8 +++----
 .../lib/src/stream_chat_localizations_fr.dart |  8 +++----
 .../lib/src/stream_chat_localizations_hi.dart |  8 +++----
 .../lib/src/stream_chat_localizations_it.dart |  8 +++----
 .../lib/src/stream_chat_localizations_ja.dart |  8 +++----
 .../lib/src/stream_chat_localizations_ko.dart |  8 +++----
 .../lib/src/stream_chat_localizations_no.dart |  8 +++----
 .../lib/src/stream_chat_localizations_pt.dart |  8 +++----
 24 files changed, 66 insertions(+), 103 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 0e27b8f1f..00e97bd84 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -104,7 +104,6 @@
 - Updated `chewie` dependency to `^1.6.0`.
 - Updated `share_plus` dependency to `^7.0.2`.
 - Deprecated `StreamUserItem` in favor of `StreamUserListTile`.
-- Updated `jiffy` dependency to `^6.2.1`.
 
 ## 6.4.0
 
diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
index abab5ad93..5c32d2789 100644
--- a/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/channel_info.dart
@@ -106,10 +106,9 @@ class _ConnectedTitleState extends StatelessWidget {
             style: textStyle,
           );
         } else {
-          final lastActive = otherMember.user?.lastActive ?? DateTime.now();
           alternativeWidget = Text(
             '${context.translations.userLastOnlineText} '
-            '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
+            '${Jiffy(otherMember.user?.lastActive).fromNow()}',
             style: textStyle,
           );
         }
diff --git a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
index f64b9dc95..ae6247ea2 100644
--- a/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
+++ b/packages/stream_chat_flutter/lib/src/channel/channel_preview.dart
@@ -349,16 +349,16 @@ class _Date extends StatelessWidget {
 
         if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay.millisecondsSinceEpoch) {
-          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm;
+          stringDate = Jiffy(lastMessageAt.toLocal()).jm;
         } else if (lastMessageAt.millisecondsSinceEpoch >=
             startOfDay
                 .subtract(const Duration(days: 1))
                 .millisecondsSinceEpoch) {
           stringDate = context.translations.yesterdayLabel;
         } else if (startOfDay.difference(lastMessageAt).inDays < 7) {
-          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE;
+          stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
         } else {
-          stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd;
+          stringDate = Jiffy(lastMessageAt.toLocal()).yMd;
         }
 
         return Text(
diff --git a/packages/stream_chat_flutter/lib/src/localization/translations.dart b/packages/stream_chat_flutter/lib/src/localization/translations.dart
index e6bb87d97..61c3441a2 100644
--- a/packages/stream_chat_flutter/lib/src/localization/translations.dart
+++ b/packages/stream_chat_flutter/lib/src/localization/translations.dart
@@ -611,15 +611,13 @@ class DefaultTranslations implements Translations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'on ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Sent ${_getDay(date)} at ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
index f9de17876..5a5075f88 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view/message_list_view.dart
@@ -669,20 +669,14 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
                     final isPartOfThread = message.replyCount! > 0 ||
                         message.showInChannel == true;
 
-                    final createdAt = Jiffy.parseFromDateTime(
-                      message.createdAt.toLocal(),
-                    );
-
-                    final nextCreatedAt = Jiffy.parseFromDateTime(
-                      nextMessage.createdAt.toLocal(),
-                    );
-
-                    if (!createdAt.isSame(nextCreatedAt, unit: Unit.day)) {
+                    final createdAt = message.createdAt.toLocal();
+                    final nextCreatedAt = nextMessage.createdAt.toLocal();
+                    if (!Jiffy(createdAt).isSame(nextCreatedAt, Units.DAY)) {
                       separator = _buildDateDivider(nextMessage);
                     } else {
-                      final hasTimeDiff = !createdAt.isSame(
+                      final hasTimeDiff = !Jiffy(createdAt).isSame(
                         nextCreatedAt,
-                        unit: Unit.minute,
+                        Units.MINUTE,
                       );
 
                       final isNextUserSame =
@@ -1077,12 +1071,10 @@ class _StreamMessageListViewState extends State<StreamMessageListView> {
 
     var hasTimeDiff = false;
     if (nextMessage != null) {
-      final createdAt = Jiffy.parseFromDateTime(message.createdAt.toLocal());
-      final nextCreatedAt = Jiffy.parseFromDateTime(
+      hasTimeDiff = !Jiffy(message.createdAt.toLocal()).isSame(
         nextMessage.createdAt.toLocal(),
+        Units.MINUTE,
       );
-
-      hasTimeDiff = !createdAt.isSame(nextCreatedAt, unit: Unit.minute);
     }
 
     final hasFileAttachment =
diff --git a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
index 7092dadf5..5ca2462a5 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget/bottom_row.dart
@@ -191,7 +191,7 @@ class BottomRow extends StatelessWidget {
             ),
       if (showTimeStamp)
         Text(
-          Jiffy.parseFromDateTime(message.createdAt.toLocal()).jm,
+          Jiffy(message.createdAt.toLocal()).jm,
           style: messageTheme.createdAtStyle,
         ),
       if (showSendingIndicator)
diff --git a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
index 24c0c9a73..24af4f3f2 100644
--- a/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
+++ b/packages/stream_chat_flutter/lib/src/misc/date_divider.dart
@@ -20,17 +20,17 @@ class StreamDateDivider extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final createdAt = Jiffy.parseFromDateTime(dateTime);
-    final now = Jiffy.parseFromDateTime(DateTime.now());
+    final createdAt = Jiffy(dateTime);
+    final now = Jiffy(DateTime.now());
 
     var dayInfo = createdAt.MMMd;
-    if (createdAt.isSame(now, unit: Unit.day)) {
+    if (createdAt.isSame(now, Units.DAY)) {
       dayInfo = context.translations.todayLabel;
-    } else if (createdAt.isSame(now.subtract(days: 1), unit: Unit.day)) {
+    } else if (createdAt.isSame(now.subtract(days: 1), Units.DAY)) {
       dayInfo = context.translations.yesterdayLabel;
-    } else if (createdAt.isAfter(now.subtract(days: 7), unit: Unit.day)) {
+    } else if (createdAt.isAfter(now.subtract(days: 7), Units.DAY)) {
       dayInfo = createdAt.EEEE;
-    } else if (createdAt.isAfter(now.subtract(years: 1), unit: Unit.day)) {
+    } else if (createdAt.isAfter(now.subtract(years: 1), Units.DAY)) {
       dayInfo = createdAt.MMMd;
     }
 
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
index b5261802d..6b2a9b4fe 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/channel_scroll_view/stream_channel_list_tile.dart
@@ -287,16 +287,16 @@ class ChannelLastMessageDate extends StatelessWidget {
 
           if (lastMessageAt.millisecondsSinceEpoch >=
               startOfDay.millisecondsSinceEpoch) {
-            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).jm;
+            stringDate = Jiffy(lastMessageAt.toLocal()).jm;
           } else if (lastMessageAt.millisecondsSinceEpoch >=
               startOfDay
                   .subtract(const Duration(days: 1))
                   .millisecondsSinceEpoch) {
             stringDate = context.translations.yesterdayLabel;
           } else if (startOfDay.difference(lastMessageAt).inDays < 7) {
-            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).EEEE;
+            stringDate = Jiffy(lastMessageAt.toLocal()).EEEE;
           } else {
-            stringDate = Jiffy.parseFromDateTime(lastMessageAt.toLocal()).yMd;
+            stringDate = Jiffy(lastMessageAt.toLocal()).yMd;
           }
 
           return Text(
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
index 3eb03aec1..5aab3b2d4 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/message_search_scroll_view/stream_message_search_list_tile.dart
@@ -227,9 +227,9 @@ class MessageSearchTileMessageDate extends StatelessWidget {
     if (now.year != createdAt.year ||
         now.month != createdAt.month ||
         now.day != createdAt.day) {
-      stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).yMd;
+      stringDate = Jiffy(createdAt.toLocal()).yMd;
     } else {
-      stringDate = Jiffy.parseFromDateTime(createdAt.toLocal()).jm;
+      stringDate = Jiffy(createdAt.toLocal()).jm;
     }
 
     return Text(
diff --git a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
index 1b0251f6a..5ee49dccb 100644
--- a/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
+++ b/packages/stream_chat_flutter/lib/src/scroll_view/user_scroll_view/stream_user_list_tile.dart
@@ -176,12 +176,11 @@ class UserLastActive extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final chatTheme = StreamChatTheme.of(context);
-    final lastActive = user.lastActive ?? DateTime.now();
     return Text(
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
+              '${Jiffy(user.lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),
diff --git a/packages/stream_chat_flutter/lib/src/stream_chat.dart b/packages/stream_chat_flutter/lib/src/stream_chat.dart
index 6b0d0e609..73a0d0a0a 100644
--- a/packages/stream_chat_flutter/lib/src/stream_chat.dart
+++ b/packages/stream_chat_flutter/lib/src/stream_chat.dart
@@ -165,9 +165,9 @@ class StreamChatState extends State<StreamChat> {
   @override
   void didChangeDependencies() {
     final currentLocale = Localizations.localeOf(context).toString();
-    final availableLocales = Jiffy.getSupportedLocales();
+    final availableLocales = Jiffy.getAllAvailableLocales();
     if (availableLocales.contains(currentLocale)) {
-      Jiffy.setLocale(currentLocale);
+      Jiffy.locale(currentLocale);
     }
     super.didChangeDependencies();
   }
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index c78d7dbac..bacecae3c 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -29,7 +29,7 @@ dependencies:
   http_parser: ^4.0.2
   image_gallery_saver: ^2.0.3
   image_picker: ^1.0.0
-  jiffy: ^6.2.1
+  jiffy: ^5.0.0
   lottie: ^2.3.2
   meta: ^1.8.0
   path_provider: ^2.0.15
diff --git a/packages/stream_chat_localizations/example/lib/add_new_lang.dart b/packages/stream_chat_localizations/example/lib/add_new_lang.dart
index e1d1335ac..bab8101b8 100644
--- a/packages/stream_chat_localizations/example/lib/add_new_lang.dart
+++ b/packages/stream_chat_localizations/example/lib/add_new_lang.dart
@@ -270,15 +270,13 @@ class NnStreamChatLocalizations extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'on ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Sent ${_getDay(date)} at ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
index ed2d3d7ed..3c471e051 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ca.dart
@@ -249,15 +249,13 @@ class StreamChatLocalizationsCa extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'ahir';
     } else {
-      return 'el ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'el ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Enviat el ${_getDay(date)} a les ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '''Enviat el ${_getDay(date)} a les ${Jiffy(time.toLocal()).format('HH:mm')}''';
 
   @override
   String get todayLabel => 'Avui';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
index fe95f0f7f..df2a7766b 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_de.dart
@@ -239,15 +239,13 @@ class StreamChatLocalizationsDe extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'Gestern';
     } else {
-      return 'am ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'am ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Gesendet ${_getDay(date)} am ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Gesendet ${_getDay(date)} am ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => 'Heute';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
index a744ff2ae..c55bbf49d 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_en.dart
@@ -246,15 +246,13 @@ class StreamChatLocalizationsEn extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'yesterday';
     } else {
-      return 'on ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'on ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Sent ${_getDay(date)} at ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Sent ${_getDay(date)} at ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => 'Today';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
index 2d75b1028..107e26166 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_es.dart
@@ -250,15 +250,13 @@ class StreamChatLocalizationsEs extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'ayer';
     } else {
-      return 'el ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'el ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Enviado el ${_getDay(date)} a las ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '''Enviado el ${_getDay(date)} a las ${Jiffy(time.toLocal()).format('HH:mm')}''';
 
   @override
   String get todayLabel => 'Hoy';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
index 6a474b8a6..8b501184e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_fr.dart
@@ -249,15 +249,13 @@ class StreamChatLocalizationsFr extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'hier';
     } else {
-      return 'le ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'le ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Envoyé ${_getDay(date)} à ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Envoyé ${_getDay(date)} à ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => "Aujourd'hui";
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
index 4e056ab22..4f27717a7 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_hi.dart
@@ -243,15 +243,13 @@ class StreamChatLocalizationsHi extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'कल';
     } else {
-      return '${Jiffy.parseFromDateTime(date).MMMd} को';
+      return '${Jiffy(date).MMMd} को';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return '${_getDay(date)} ${atTime.jm} बजे भेजा गया';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '${_getDay(date)} ${Jiffy(time.toLocal()).format('HH:mm')} बजे भेजा गया';
 
   @override
   String get todayLabel => 'आज';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
index 51a808972..b407629d1 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_it.dart
@@ -252,15 +252,13 @@ Il file è troppo grande per essere caricato. Il limite è di $limitInMB MB.''';
     } else if (date == yesterday) {
       return 'ieri';
     } else {
-      return 'il ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'il ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Inviato ${_getDay(date)} alle ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      "Inviato ${_getDay(date)} alle ${Jiffy(time.toLocal()).format('HH:mm')}";
 
   @override
   String get todayLabel => 'Oggi';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
index 17285f6aa..26a5e8b3e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ja.dart
@@ -236,15 +236,13 @@ class StreamChatLocalizationsJa extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return '昨日';
     } else {
-      return '${Jiffy.parseFromDateTime(date).MMMd}に';
+      return '${Jiffy(date).MMMd}に';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return '${_getDay(date)}の${atTime.jm}に送信しました ';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '${_getDay(date)}の${Jiffy(time.toLocal()).format('HH:mm')}に送信しました ';
 
   @override
   String get todayLabel => '今日';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
index acf1f79f9..7b907584e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_ko.dart
@@ -235,15 +235,13 @@ class StreamChatLocalizationsKo extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return '어제';
     } else {
-      return '${Jiffy.parseFromDateTime(date).MMMd}에';
+      return '${Jiffy(date).MMMd}에';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return '${_getDay(date)} ${atTime.jm}에 보냈습니다';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '${_getDay(date)} ${Jiffy(time.toLocal()).format('HH:mm')}에 보냈습니다';
 
   @override
   String get todayLabel => '오늘';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
index 8a6c4db31..88350979e 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_no.dart
@@ -242,15 +242,13 @@ class StreamChatLocalizationsNo extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'i går';
     } else {
-      return 'på ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'på ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Sent ${_getDay(date)} kl. ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      'Sent ${_getDay(date)} kl. ${Jiffy(time.toLocal()).format('HH:mm')}';
 
   @override
   String get todayLabel => 'I dag';
diff --git a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
index f359808b2..874eb1189 100644
--- a/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
+++ b/packages/stream_chat_localizations/lib/src/stream_chat_localizations_pt.dart
@@ -244,15 +244,13 @@ class StreamChatLocalizationsPt extends GlobalStreamChatLocalizations {
     } else if (date == yesterday) {
       return 'Ontem';
     } else {
-      return 'o ${Jiffy.parseFromDateTime(date).MMMd}';
+      return 'o ${Jiffy(date).MMMd}';
     }
   }
 
   @override
-  String sentAtText({required DateTime date, required DateTime time}) {
-    final atTime = Jiffy.parseFromDateTime(time.toLocal());
-    return 'Enviado ${_getDay(date)} às ${atTime.jm}';
-  }
+  String sentAtText({required DateTime date, required DateTime time}) =>
+      '''Enviado ${_getDay(date)} às ${Jiffy(time.toLocal()).format('HH:mm')}''';
 
   @override
   String get todayLabel => 'Hoje';

From 45f06fc0a17750a4b40d2142f94ab74c38803b64 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 19:24:45 +0530
Subject: [PATCH 08/16] chore: more revert.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/lib/src/user/user_item.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/user/user_item.dart b/packages/stream_chat_flutter/lib/src/user/user_item.dart
index 0c13d95ec..019322d9b 100644
--- a/packages/stream_chat_flutter/lib/src/user/user_item.dart
+++ b/packages/stream_chat_flutter/lib/src/user/user_item.dart
@@ -74,12 +74,11 @@ class StreamUserItem extends StatelessWidget {
 
   Widget _buildLastActive(BuildContext context) {
     final chatTheme = StreamChatTheme.of(context);
-    final lastActive = user.lastActive ?? DateTime.now();
     return Text(
       user.online
           ? context.translations.userOnlineText
           : '${context.translations.userLastOnlineText} '
-              '${Jiffy.parseFromDateTime(lastActive).fromNow()}',
+              '${Jiffy(user.lastActive).fromNow()}',
       style: chatTheme.textTheme.footnote.copyWith(
         color: chatTheme.colorTheme.textHighEmphasis.withOpacity(0.5),
       ),

From f312cd20366c6bc4516426d167ac771a64b9734c Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 19:25:48 +0530
Subject: [PATCH 09/16] chore(localization): bump min flutter version to 3.7

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_localizations/pubspec.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat_localizations/pubspec.yaml b/packages/stream_chat_localizations/pubspec.yaml
index d9d076642..c72032ea4 100644
--- a/packages/stream_chat_localizations/pubspec.yaml
+++ b/packages/stream_chat_localizations/pubspec.yaml
@@ -6,8 +6,8 @@ repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: ">=2.19.0 <4.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
   flutter:

From 857542536e49baf24677b1bdd8ef786b60e04138 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 20:09:31 +0530
Subject: [PATCH 10/16] chore: fix analysis.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .github/workflows/legacy_version_analyze.yml  | 22 +++++++++++++++++--
 .../lib/src/utils/typedefs.dart               |  2 +-
 pubspec.yaml                                  |  4 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
index 2454e09ca..3c5954bb2 100644
--- a/.github/workflows/legacy_version_analyze.yml
+++ b/.github/workflows/legacy_version_analyze.yml
@@ -40,14 +40,32 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
+
       - name: "Install Flutter"
         uses: subosito/flutter-action@v2
         with:
           cache: true
           flutter-version: ${{ env.flutter_version }}
+
       - name: "Install Tools"
         run: flutter pub global activate melos
+
       - name: "Bootstrap Workspace"
         run: melos bootstrap --verbose
-      - name: "Dart Analyze"
-        run: melos run analyze
\ No newline at end of file
+
+      # Only analyze lib/; non-client code doesn't need to work on
+      # all supported legacy version.
+      - name: "Stream Chat Analyze"
+        run: cd packages/stream_chat/lib && dart analyze --fatal-infos .
+
+      - name: "Stream Chat Flutter Core Analyze"
+        run: cd packages/stream_chat_core/lib && dart analyze --fatal-infos .
+
+      - name: "Stream Chat Flutter Analyze"
+        run: cd packages/stream_chat_flutter/lib && dart analyze --fatal-infos .
+
+      - name: "Stream Chat Persistence Analyze"
+        run: cd packages/stream_chat_persistence/lib && dart analyze --fatal-infos .
+
+      - name: "Stream Chat Localizations Analyze"
+        run: cd packages/stream_chat_localizations/lib && dart analyze --fatal-infos .
\ No newline at end of file
diff --git a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
index 17cab8209..64f18e1ad 100644
--- a/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
+++ b/packages/stream_chat_flutter/lib/src/utils/typedefs.dart
@@ -88,7 +88,7 @@ typedef ChannelTapCallback = void Function(Channel, Widget?);
 typedef ChannelInfoCallback = void Function(Channel);
 
 /// {@template channelPreviewBuilder}
-/// Builder used to create a custom [ChannelPreview] for a [Channel]
+/// Builder used to create a custom ChannelPreview for a [Channel]
 /// {@endtemplate}
 @Deprecated('Use StreamChannelListViewIndexedWidgetBuilder instead')
 typedef ChannelPreviewBuilder = Widget Function(BuildContext, Channel);
diff --git a/pubspec.yaml b/pubspec.yaml
index 9016fa8f7..cf418d76f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_workspace
 
 environment:
-  sdk: '>=2.18.0 <3.0.0'
+  sdk: '>=2.19.0 <4.0.0'
 
 dev_dependencies:
-  melos: ^3.0.0
+  melos: ^3.1.0

From b96475920c319797dbf2d2afe6a2a87c7dfddf8c Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 20:12:29 +0530
Subject: [PATCH 11/16] chore: fix legacy workflow

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .github/workflows/legacy_version_analyze.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/legacy_version_analyze.yml b/.github/workflows/legacy_version_analyze.yml
index 3c5954bb2..89c195dfe 100644
--- a/.github/workflows/legacy_version_analyze.yml
+++ b/.github/workflows/legacy_version_analyze.yml
@@ -59,7 +59,7 @@ jobs:
         run: cd packages/stream_chat/lib && dart analyze --fatal-infos .
 
       - name: "Stream Chat Flutter Core Analyze"
-        run: cd packages/stream_chat_core/lib && dart analyze --fatal-infos .
+        run: cd packages/stream_chat_flutter_core/lib && dart analyze --fatal-infos .
 
       - name: "Stream Chat Flutter Analyze"
         run: cd packages/stream_chat_flutter/lib && dart analyze --fatal-infos .

From 3a9f0b01478f42b5bf8f2ee85e7a77af38e96870 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 11 Jul 2023 20:24:01 +0530
Subject: [PATCH 12/16] chore: update CHANGELOG.md

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md               | 2 +-
 packages/stream_chat_flutter/CHANGELOG.md       | 2 +-
 packages/stream_chat_flutter_core/CHANGELOG.md  | 2 +-
 packages/stream_chat_localizations/CHANGELOG.md | 2 +-
 packages/stream_chat_persistence/CHANGELOG.md   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index e8f5c67cb..21f6caa5e 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 🔄 Changed
 
-- Updated minimum supported `SDK` version to Dart 2.18
+- Updated minimum supported `SDK` version to Dart 2.19
 
 ## 6.4.0
 
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 00e97bd84..e00716edc 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 🔄 Changed
 
-- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+- Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
 ## 6.5.0
 
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index 0cc5486a3..fd21268b8 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Upcoming
 
-- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+- Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
 ## 6.4.0
 
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index f2ad2fd80..f6ff49391 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Upcoming
 
-- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+- Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
 ## 5.5.0
 
diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md
index 393a17ef0..76623ba7b 100644
--- a/packages/stream_chat_persistence/CHANGELOG.md
+++ b/packages/stream_chat_persistence/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## Upcoming
 
-- Updated minimum supported `SDK` version to Flutter 3.3/Dart 2.18
+- Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
 ## 6.4.0
 

From 99c656be1f4c85f1e7a5d2ba684dbafdf6916f7b Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 12 Jul 2023 15:50:55 +0530
Subject: [PATCH 13/16] chore(repo): prepare for release.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md               | 2 +-
 packages/stream_chat/lib/version.dart           | 2 +-
 packages/stream_chat/pubspec.yaml               | 2 +-
 packages/stream_chat_flutter/CHANGELOG.md       | 2 +-
 packages/stream_chat_flutter/pubspec.yaml       | 4 ++--
 packages/stream_chat_flutter_core/CHANGELOG.md  | 2 +-
 packages/stream_chat_flutter_core/pubspec.yaml  | 4 ++--
 packages/stream_chat_localizations/CHANGELOG.md | 2 +-
 packages/stream_chat_localizations/pubspec.yaml | 4 ++--
 packages/stream_chat_persistence/CHANGELOG.md   | 2 +-
 packages/stream_chat_persistence/pubspec.yaml   | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 21f6caa5e..6be503a3a 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 6.5.0
 
 🔄 Changed
 
diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart
index a2fb6fe6b..6b1c214db 100644
--- a/packages/stream_chat/lib/version.dart
+++ b/packages/stream_chat/lib/version.dart
@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '6.4.0';
+const PACKAGE_VERSION = '6.5.0';
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index b52f7bfd2..469f6b19a 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-version: 6.4.0
+version: 6.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index e00716edc..1263c4fe9 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 6.6.0
 
 🔄 Changed
 
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index bacecae3c..8bf55582f 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 6.5.0
+version: 6.6.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -38,7 +38,7 @@ dependencies:
   rxdart: ^0.27.7
   share_plus: ^7.0.2
   shimmer: ^3.0.0
-  stream_chat_flutter_core: ^6.4.0
+  stream_chat_flutter_core: ^6.5.0
   synchronized: ^3.1.0
   thumblr: ^0.0.4
   url_launcher: ^6.1.11
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index fd21268b8..edb10b9aa 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 6.5.0
 
 - Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 16902a1cc..5f30475c6 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_core
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK Core. Build your own chat experience using Dart and Flutter.
-version: 6.4.0
+version: 6.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -17,7 +17,7 @@ dependencies:
   freezed_annotation: ^2.2.0
   meta: ^1.8.0
   rxdart: ^0.27.7
-  stream_chat: ^6.4.0
+  stream_chat: ^6.5.0
 
 dev_dependencies:
   build_runner: ^2.3.3
diff --git a/packages/stream_chat_localizations/CHANGELOG.md b/packages/stream_chat_localizations/CHANGELOG.md
index f6ff49391..85d391961 100644
--- a/packages/stream_chat_localizations/CHANGELOG.md
+++ b/packages/stream_chat_localizations/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 5.6.0
 
 - Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
diff --git a/packages/stream_chat_localizations/pubspec.yaml b/packages/stream_chat_localizations/pubspec.yaml
index c72032ea4..a933f4925 100644
--- a/packages/stream_chat_localizations/pubspec.yaml
+++ b/packages/stream_chat_localizations/pubspec.yaml
@@ -1,6 +1,6 @@
 name: stream_chat_localizations
 description: The Official localizations for Stream Chat Flutter, a service for building chat applications
-version: 5.5.0
+version: 5.6.0
 homepage: https://github.com/GetStream/stream-chat-flutter
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
@@ -14,7 +14,7 @@ dependencies:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-  stream_chat_flutter: ^6.5.0
+  stream_chat_flutter: ^6.6.0
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/stream_chat_persistence/CHANGELOG.md b/packages/stream_chat_persistence/CHANGELOG.md
index 76623ba7b..245797b79 100644
--- a/packages/stream_chat_persistence/CHANGELOG.md
+++ b/packages/stream_chat_persistence/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 6.5.0
 
 - Updated minimum supported `SDK` version to Flutter 3.7/Dart 2.19
 
diff --git a/packages/stream_chat_persistence/pubspec.yaml b/packages/stream_chat_persistence/pubspec.yaml
index 6ff7ac156..aa4ae55ff 100644
--- a/packages/stream_chat_persistence/pubspec.yaml
+++ b/packages/stream_chat_persistence/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_persistence
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Official Stream Chat Persistence library. Build your own chat experience using Dart and Flutter.
-version: 6.4.0
+version: 6.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -18,7 +18,7 @@ dependencies:
   path: ^1.8.2
   path_provider: ^2.0.15
   sqlite3_flutter_libs: ^0.5.15
-  stream_chat: ^6.4.0
+  stream_chat: ^6.5.0
 
 dev_dependencies:
   build_runner: ^2.3.3

From aff7c3b62b49df01f904a7600a9b245f09aff7e0 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 12 Jul 2023 15:53:34 +0530
Subject: [PATCH 14/16] chore: bump example min version.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/example/pubspec.yaml               | 4 ++--
 packages/stream_chat_flutter/example/pubspec.yaml       | 4 ++--
 packages/stream_chat_flutter_core/example/pubspec.yaml  | 4 ++--
 packages/stream_chat_localizations/example/pubspec.yaml | 4 ++--
 packages/stream_chat_persistence/example/pubspec.yaml   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/stream_chat/example/pubspec.yaml b/packages/stream_chat/example/pubspec.yaml
index b2855d2a0..16362f020 100644
--- 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.18.0 <4.0.0'
-  flutter: ">=3.3.0"
+  sdk: '>=2.19.0 <4.0.0'
+  flutter: ">=3.7.0"
 
 dependencies:
   cupertino_icons: ^1.0.5
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index 1b42acec1..075e8132f 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: '>=2.19.0 <4.0.0'
+  flutter: ">=3.7.0"
 
 dependencies:
   collection: ^1.15.0
diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml
index ed9e59b67..c92a4fc6f 100644
--- a/packages/stream_chat_flutter_core/example/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: '>=2.19.0 <4.0.0'
+  flutter: ">=3.7.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml
index 252b0b6f7..c23b28b1d 100644
--- a/packages/stream_chat_localizations/example/pubspec.yaml
+++ b/packages/stream_chat_localizations/example/pubspec.yaml
@@ -5,8 +5,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: '>=2.19.0 <4.0.0'
+  flutter: ">=3.7.0"
 
 dependencies:
   cupertino_icons: ^1.0.3
diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml
index e7cb4a8d2..f67961aa5 100644
--- a/packages/stream_chat_persistence/example/pubspec.yaml
+++ b/packages/stream_chat_persistence/example/pubspec.yaml
@@ -4,8 +4,8 @@ publish_to: 'none'
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.18.0 <4.0.0"
-  flutter: ">=3.3.0"
+  sdk: '>=2.19.0 <4.0.0'
+  flutter: ">=3.7.0"
 
 dependencies:
   cupertino_icons: ^1.0.3

From 8f84c843d5fadf56e2092ab7ef896a38c2014a2d Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 12 Jul 2023 16:15:15 +0530
Subject: [PATCH 15/16] chore: add path in dev deps.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/pubspec.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 8bf55582f..a308ca6db 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -73,4 +73,5 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   golden_toolkit: ^0.15.0
-  mocktail: ^0.3.0
\ No newline at end of file
+  mocktail: ^0.3.0
+  path: ^1.8.3
\ No newline at end of file

From c742abce5e500952a0ce764d3061a208c35709b2 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 12 Jul 2023 16:17:59 +0530
Subject: [PATCH 16/16] chore: reduce path dev version to 1.8.2

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index a308ca6db..f120f931c 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -74,4 +74,4 @@ dev_dependencies:
     sdk: flutter
   golden_toolkit: ^0.15.0
   mocktail: ^0.3.0
-  path: ^1.8.3
\ No newline at end of file
+  path: ^1.8.2
\ No newline at end of file