From f7723198de8db4a53b6691b28de02e9ee5ef3a4d Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Mon, 13 Sep 2021 16:26:46 +0530
Subject: [PATCH] chore: fix dependency conflicts

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 melos.yaml                                          |  2 +-
 packages/stream_chat_flutter/example/pubspec.yaml   | 13 +++++++------
 .../stream_chat_flutter_core/example/pubspec.yaml   |  6 +++++-
 .../stream_chat_localizations/example/pubspec.yaml  |  8 ++++++--
 .../stream_chat_persistence/example/pubspec.yaml    |  4 ++--
 5 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/melos.yaml b/melos.yaml
index 9c5d4e4f..062f57a3 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -4,7 +4,7 @@ versioning:
   mode: independent
 
 packages:
-  - packages/**
+  - packages/stream_chat*/*
 
 scripts:
   lint:all:
diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index d3fec032..3afa4cc1 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -27,18 +27,19 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  #  stream_chat:
-  #    path: ../../stream_chat
-  #  stream_chat_flutter_core:
-  #    path: ../../stream_chat_flutter_core
+
+dependency_overrides:
+  stream_chat:
+    path: ../../stream_chat
   stream_chat_flutter:
-    path: ../
+    path: ../../stream_chat_flutter
+  stream_chat_flutter_core:
+    path: ../../stream_chat_flutter_core
   stream_chat_localizations:
     path: ../../stream_chat_localizations
   stream_chat_persistence:
     path: ../../stream_chat_persistence
 
-
 dev_dependencies:
   flutter_test:
     sdk: flutter
diff --git a/packages/stream_chat_flutter_core/example/pubspec.yaml b/packages/stream_chat_flutter_core/example/pubspec.yaml
index 6390abc4..9af602cc 100644
--- a/packages/stream_chat_flutter_core/example/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/example/pubspec.yaml
@@ -26,8 +26,12 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
+
+dependency_overrides:
+  stream_chat:
+    path: ../../stream_chat
   stream_chat_flutter_core:
-    path: ../
+    path: ../../stream_chat_flutter_core
 
 
 dev_dependencies:
diff --git a/packages/stream_chat_localizations/example/pubspec.yaml b/packages/stream_chat_localizations/example/pubspec.yaml
index a139831e..5d47ef36 100644
--- a/packages/stream_chat_localizations/example/pubspec.yaml
+++ b/packages/stream_chat_localizations/example/pubspec.yaml
@@ -11,12 +11,16 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  stream_chat_localizations:
-    path: ../
 
 dependency_overrides:
+  stream_chat:
+    path: ../../stream_chat
   stream_chat_flutter:
     path: ../../stream_chat_flutter
+  stream_chat_flutter_core:
+    path: ../../stream_chat_flutter_core
+  stream_chat_localizations:
+    path: ../../stream_chat_localizations
 
 dev_dependencies:
   flutter_test:
diff --git a/packages/stream_chat_persistence/example/pubspec.yaml b/packages/stream_chat_persistence/example/pubspec.yaml
index 8dd6a719..cbf48a8b 100644
--- a/packages/stream_chat_persistence/example/pubspec.yaml
+++ b/packages/stream_chat_persistence/example/pubspec.yaml
@@ -11,12 +11,12 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  stream_chat_persistence:
-    path: ../
 
 dependency_overrides:
   stream_chat:
     path: ../../stream_chat
+  stream_chat_persistence:
+    path: ../../stream_chat_persistence
 
 dev_dependencies:
   flutter_test: