From 4bfda7553d1ea48fa1c3faddc05f7a5c11f62b4c Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Jun 2021 15:33:05 +0530 Subject: [PATCH 1/5] fix stream_flutter_workflow.yml Signed-off-by: Sahil Kumar --- .github/workflows/stream_flutter_workflow.yml | 5 ++--- analysis_options.yaml | 14 ++++++-------- melos.yaml | 6 ++++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/stream_flutter_workflow.yml b/.github/workflows/stream_flutter_workflow.yml index daa29977..1022e0ee 100644 --- a/.github/workflows/stream_flutter_workflow.yml +++ b/.github/workflows/stream_flutter_workflow.yml @@ -26,7 +26,6 @@ jobs: - name: "Install Tools" run: | flutter pub global activate melos - flutter pub global activate tuneup - name: "Bootstrap Workspace" run: melos bootstrap - name: "Dart Analyze" @@ -78,7 +77,7 @@ jobs: - name: "Flutter Test" run: melos run test:all - name: "Collect Coverage" - run: melos run coverage:ignore-file + run: melos run coverage:ignore-file --no-select - name: "Upload Coverage" uses: codecov/codecov-action@v1 with: @@ -103,4 +102,4 @@ jobs: uses: VeryGoodOpenSource/very_good_coverage@v1.1.1 with: path: packages/stream_chat_flutter/coverage/lcov.info - min_coverage: 35 + min_coverage: 35 \ No newline at end of file diff --git a/analysis_options.yaml b/analysis_options.yaml index f0a87ea5..4b73086c 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1,12 +1,10 @@ analyzer: - enable-experiment: - - extension-methods exclude: - - lib/**/*.g.dart - - example/** - - lib/src/emoji - - lib/**/*.freezed.dart - - test/** + - packages/*/lib/**/*.g.dart + - packages/*/example/** + - packages/*/lib/src/emoji + - packages/*/lib/**/*.freezed.dart + - packages/*/test/** linter: rules: @@ -147,4 +145,4 @@ linter: - cast_nullable_to_non_nullable - unnecessary_null_checks - tighten_type_of_initializing_formals - - null_check_on_nullable_type_parameter + - null_check_on_nullable_type_parameter \ No newline at end of file diff --git a/melos.yaml b/melos.yaml index f50c136a..1fb51c38 100644 --- a/melos.yaml +++ b/melos.yaml @@ -64,9 +64,11 @@ scripts: coverage:ignore-file: run: | - melos exec -c 4 --fail-fast -- "\$MELOS_ROOT_PATH/.github/workflows/scripts/remove-from_coverage.sh" + melos exec -c 4 --fail-fast -- "\$MELOS_ROOT_PATH/.github/workflows/scripts/remove-from-coverage.sh" description: Removes all the ignored files from the coverage report. + select-package: + dir-exists: coverage environment: sdk: '>=2.12.0 <3.0.0' - flutter: '>=1.22.4 <2.0.0' + flutter: '>=1.22.4 <2.0.0' \ No newline at end of file From 69b0b86bc151c3497fe09ff359f6686feff72b46 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Jun 2021 15:35:03 +0530 Subject: [PATCH 2/5] change remove-from_coverage.sh to remove-from-coverage.sh Signed-off-by: Sahil Kumar --- .../scripts/{remove-from_coverage.sh => remove-from-coverage.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/scripts/{remove-from_coverage.sh => remove-from-coverage.sh} (100%) mode change 100755 => 100644 diff --git a/.github/workflows/scripts/remove-from_coverage.sh b/.github/workflows/scripts/remove-from-coverage.sh old mode 100755 new mode 100644 similarity index 100% rename from .github/workflows/scripts/remove-from_coverage.sh rename to .github/workflows/scripts/remove-from-coverage.sh From c6a4a99503e21067cb7a7524d7dc6fc0334a0e03 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Thu, 17 Jun 2021 19:36:44 +0200 Subject: [PATCH 3/5] fix permission --- .github/workflows/scripts/remove-from-coverage.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .github/workflows/scripts/remove-from-coverage.sh diff --git a/.github/workflows/scripts/remove-from-coverage.sh b/.github/workflows/scripts/remove-from-coverage.sh old mode 100644 new mode 100755 From 940a51691312fb7b5c850ef227a5e03683814590 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Fri, 18 Jun 2021 13:04:28 +0200 Subject: [PATCH 4/5] fix action --- .github/workflows/scripts/remove-from-coverage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scripts/remove-from-coverage.sh b/.github/workflows/scripts/remove-from-coverage.sh index c1190097..9ef430ac 100755 --- a/.github/workflows/scripts/remove-from-coverage.sh +++ b/.github/workflows/scripts/remove-from-coverage.sh @@ -3,5 +3,5 @@ # Fast fail the script on failures. set -e -pub global activate remove_from_coverage +pub global activate remove_from_coverage --overwrite pub global run remove_from_coverage:remove_from_coverage -f coverage/lcov.info -r '\.g\.dart$' -r '\.freezed\.dart$' \ No newline at end of file From 366e77ceb76cfd7dda066874900214969fa6f3f6 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Wed, 16 Jun 2021 10:48:19 +0200 Subject: [PATCH 5/5] fix reconnection logic --- .../stream_chat_flutter_core/lib/src/stream_chat_core.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart index aa23a959..e80472cd 100644 --- a/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart +++ b/packages/stream_chat_flutter_core/lib/src/stream_chat_core.dart @@ -125,7 +125,8 @@ class StreamChatCoreState extends State _isConnectionAvailable = result != ConnectivityResult.none; if (!_isInForeground) return; if (_isConnectionAvailable) { - if (client.wsConnectionStatus == ConnectionStatus.disconnected) { + if (client.wsConnectionStatus == ConnectionStatus.disconnected && + user != null) { client.openConnection(); } } else {