Merge pull request #1264 from zino-hofmann/macros/connectivity_plus

fix(graphql_flutter): increase connectivity_plus version to v3

.github/workflows/build.yml

@@ -11,18 +11,16 @@ jobs:
     strategy:
       matrix:
         channel: 
-          - beta
           - stable
-          - dev
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: subosito/flutter-action@v1
+      - uses: subosito/flutter-action@v2
         with:
           channel: ${{matrix.channel}}
       - name: Install dependencies
         run: make dep
       - name: Code formatting check
         run: make ci_fmt_client
       - name: Code formatting check (flutter)
-        run: make ci_fmt_flutter
+        run: make ci_fmt_flutter

Makefile

@@ -1,6 +1,5 @@
 CC=dart pub global run melos
 #CC_TEST=spec
-CC_TEST=for d in ./packages/*/ ; do (echo $$d && cd $$d && dart test); done
 CC_CHANGELOG=dart pub global run changelog_cmd
 
 default: analyze check
@@ -10,14 +9,14 @@ dep:
 	dart pub global activate changelog_cmd;
 	$(CC) bootstrap
 
-check:
-	$(CC_TEST)
+check: ci_check_client ci_check_flutter
 
 fmt:
 	$(CC) run format --no-select
 
 analyze: fmt
-	$(CC) run analyze --no-select
+	$(CC) run client_analyze --no-select
+	$(CC) run flutter_analyze --no-select
 
 client: ci_check_client ci_fmt_client
 

melos.yaml

@@ -7,12 +7,6 @@ packages:
   - packages/**
 
 scripts:
-  analyze:
-    run: melos exec -c 1 -- "dart format --set-exit-if-changed . && dart analyze . --fatal-infos"
-    description: Run dart analyzer in a specific package.
-    select-package:
-      flutter: false
-
   flutter_analyze:
     run: melos exec --depends-on="graphql" -c 1 -- "flutter format --set-exit-if-changed . && flutter analyze . --fatal-infos"
     description: Run dart analyzer in a specific package.
@@ -25,16 +19,6 @@ scripts:
     select-package:
       flutter: false
 
-  test:
-    description: Run tests in a specific package.
-    run: melos exec -- "dart pub get && dart pub run test"
-    select-package:
-      flutter: false
-      dir-exists:
-        - "test/"
-    env:
-      MELOS_TEST: true
-
   flutter_test:
     description: Run tests in a specific package.
     run: melos exec --depends-on="graphql" -- "flutter test"

packages/graphql_flutter/example/pubspec.yaml

@@ -29,3 +29,4 @@ dependency_overrides:
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
+  flutter: ">=2.11.0"

packages/graphql_flutter/pubspec.yaml

@@ -9,10 +9,10 @@ dependencies:
   gql_exec: ^0.4.0
   flutter:
     sdk: flutter
-  meta: ^1.3.0
+  meta: ^1.7.0
   path_provider: ^2.0.1
   path: ^1.8.0
-  connectivity_plus: ^2.0.3
+  connectivity_plus: ^3.0.0
   hive: ^2.0.0
   plugin_platform_interface: ^2.0.0
   flutter_hooks: ^0.18.2
@@ -27,6 +27,7 @@ dev_dependencies:
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
+  flutter: ">=2.11.0"
 
 platforms:
   android: