Merge pull request zino-hofmann#358 from zino-app/beta

Promote beta to stable
nnnnmkaka · Jul 13, 2019 · 75d02c2 · 75d02c2
2 parents 0c176ad + 33f01be
commit 75d02c2
Show file tree

Hide file tree

Showing 79 changed files with 2,160 additions and 2,919 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,14 +1,14 @@
 version: 2.1
 aliases:
   - &flutter_environment
-    - image: cirrusci/flutter:beta
+    - image: cirrusci/flutter:latest-web
   - &node_environment
     - image: circleci/node:10
   - &restore_cache
     keys:
       # when lock file changes, use increasingly general patterns to restore cache
-      - pub-packages-v1-{{ checksum "packages/graphql/pubspec.lock" }}-{{ checksum "packages/graphql_flutter/pubspec.lock" }}
-      - pub-packages-v1-{{ checksum "packages/graphql/pubspec.lock" }}
+      - pub-packages-v1-{{ checksum "packages/graphql/pubspec.yaml" }}-{{ checksum "packages/graphql_flutter/pubspec.yaml" }}
+      - pub-packages-v1-{{ checksum "packages/graphql/pubspec.yaml" }}
       - pub-packages-v1-
   - &install_yaml_processor
     name: Install yq yaml processor
@@ -67,7 +67,7 @@ jobs:
             cd packages/graphql_flutter
             flutter packages get
       - save_cache:
-          key: pub-packages-v1-{{ checksum "packages/graphql/pubspec.lock" }}-{{ checksum "packages/graphql_flutter/pubspec.lock" }}
+          key: pub-packages-v1-{{ checksum "packages/graphql/pubspec.yaml" }}-{{ checksum "packages/graphql_flutter/pubspec.yaml" }}
           paths:
             - ~/.pub-cache
   lint:
@@ -78,15 +78,17 @@ jobs:
       - run: *install_yaml_processor
       - run: *graphql_from_path
       - run:
-          name: Code linting (graphql)
+          name: Code formating and analyzing (graphql)
           command: |
             cd packages/graphql
             dartfmt **/*.dart -n --set-exit-if-changed
+            flutter analyze
       - run:
-          name: Code linting (graphql_flutter)
+          name: Code formating and analyzing (graphql_flutter)
           command: |
             cd packages/graphql_flutter
             dartfmt **/*.dart -n --set-exit-if-changed
+            flutter analyze
   coverage:
     docker: *flutter_environment
     steps:
@@ -95,21 +97,29 @@ jobs:
       - run: *install_yaml_processor
       - run: *graphql_from_path
       - run:
-          name: Code coverage (graphql)
+          name: Code coverage (graphql, vm only)
           command: |
             cd packages/graphql
             pub global activate coverage
             pub get
             pub run test_coverage
-      # - run:
-      #     name: Code coverage (graphql_flutter)
-      #     command: |
-      #       cd packages/graphql_flutter
-      #       flutter test --coverage
+            # cannot `run pub run test test/.test_coverage.dart -p chromium`
+            # it randomly fails compiling some dart files to js
+            # test/.test_coverage.dart is a by product of running
+            # `pub run test_coverage`
+            pub run test test/.test_coverage.dart -p chromium
+      - run:
+          name: Code coverage (graphql_flutter)
+          command: |
+            cd packages/graphql_flutter
+            flutter test --coverage
       - run:
           name: Upload coverage
           command: |
-            bash <(curl -s https://codecov.io/bash)
+            bash <(curl -s https://codecov.io/bash) -F graphql_flutter
+            bash <(curl -s https://codecov.io/bash) -F graphql_flutter -B `git rev-parse --abbrev-ref HEAD`_pseudo_branch_package_graphql_flutter
+            bash <(curl -s https://codecov.io/bash) -F graphql_client
+            bash <(curl -s https://codecov.io/bash) -F graphql_client -B `git rev-parse --abbrev-ref HEAD`_pseudo_branch_package_graphql_client
   release:
     docker: *node_environment
     steps:
@@ -176,7 +186,6 @@ jobs:
             git checkout $BRANCH
 
             git add packages/graphql/pubspec.yaml packages/graphql_flutter/pubspec.yaml
-            git add packages/graphql/pubspec.lock packages/graphql_flutter/pubspec.lock
             git commit --allow-empty -m "build(Pub): Bump version numbers [skip ci]"
 
             # Push quietly to prevent showing the token in log

diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1,7 @@
+flags:
+  graphql_flutter:
+    paths:
+      - packages/graphql_flutter/
+  graphql_client:
+    paths:
+      - packages/graphql/
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,7 @@ ios/.generated/
 ios/Flutter/Generated.xcconfig
 ios/Runner/GeneratedPluginRegistrant.*
 .flutter-plugins
+pubspec.lock
 
 # Coverage
 coverage.json
@@ -30,3 +31,6 @@ packages/graphql_flutter/example/android/.settings/
 packages/graphql_flutter/example/android/app/.classpath
 packages/graphql_flutter/example/android/app/.project
 packages/graphql_flutter/example/android/app/.settings/
+
+packages/graphql/example/android
+packages/graphql/example/ios
diff --git a/README.md b/README.md
@@ -1,15 +1,12 @@
 [![MIT License][license-badge]][license-link]
 [![All Contributors](https://img.shields.io/badge/all_contributors-31-orange.svg?style=flat-square)](#contributors)
-[![PRs Welcome][prs-badge]](http://makeapullrequest.com)
+[![PRs Welcome][prs-badge]][prs-link]
 
-[![Watch on GitHub](https://img.shields.io/github/watchers/zino-app/graphql-flutter.svg?style=flat&logo=github&colorB=deeppink&label=Watchers)](https://github.com/zino-app/graphql-flutter)
-[![Star on GitHub](https://img.shields.io/github/stars/zino-app/graphql-flutter.svg?style=flat&logo=github&colorB=deeppink&label=Stars)](https://github.com/zino-app/graphql-flutter)
-[![Discord](https://img.shields.io/discord/559455668810153989.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/tXTtBfC)
+[![Star on GitHub][github-star-badge]][github-star-link]
+[![Watch on GitHub][github-watch-badge]][github-watch-link]
+[![Discord][discord-badge]][discord-link]
 
-## GraphQL Flutter
-
-[![Build Status][build-status-badge]][build-status-link]
-[![Coverage][coverage-badge]][coverage-link]
+# GraphQL Flutter
 
 ## About this project
 
@@ -21,6 +18,9 @@ The project took inspiration from the [Apollo GraphQL client](https://github.com
 
 ## Packages
 
+[![Build Status][build-status-badge]][build-status-link]
+[![Coverage][coverage-badge]][coverage-link]
+
 This is a Monorepo which contains the following packages:
 
 | Package                                       | Pub                                              |
@@ -63,18 +63,20 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind are welcome!
 
-[build-status-badge]: https://circleci.com/gh/zino-app/graphql-flutter/tree/master.svg?style=svg
-[build-status-link]: https://circleci.com/gh/zino-app/graphql-flutter/tree/master
-[coverage-badge]: https://codecov.io/gh/zino-app/graphql-flutter/branch/master/graph/badge.svg
+[build-status-badge]: https://img.shields.io/circleci/build/github/zino-app/graphql-flutter.svg?style=flat-square
+[build-status-link]: https://circleci.com/gh/zino-app/graphql-flutter
+[coverage-badge]: https://img.shields.io/codecov/c/github/zino-app/graphql-flutter.svg?style=flat-square
 [coverage-link]: https://codecov.io/gh/zino-app/graphql-flutter
-[version-badge]: https://img.shields.io/pub/v/graphql_flutter.svg
+[version-badge]: https://img.shields.io/pub/v/graphql_flutter.svg?style=flat-square
 [package-link]: https://pub.dartlang.org/packages/graphql_flutter
-[package-link-client]: https://pub.dartlang.org/packages/graphql/versions/1.0.1
-[license-badge]: https://img.shields.io/github/license/zino-app/graphql-flutter.svg
+[package-link-client]: https://pub.dartlang.org/packages/graphql
+[license-badge]: https://img.shields.io/github/license/zino-app/graphql-flutter.svg?style=flat-square
 [license-link]: https://github.com/zino-app/graphql-flutter/blob/master/LICENSE
-[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
-[prs]: http://makeapullrequest.com
-[github-watch-badge]: https://img.shields.io/github/watchers/zino-app/graphql-flutter.svg?style=social
-[github-watch]: https://github.com/zino-app/graphql-flutter/watchers
-[github-star-badge]: https://img.shields.io/github/stars/zino-app/graphql-flutter.svg?style=social
-[github-star]: https://github.com/zino-app/graphql-flutter/stargazers
+[prs-badge]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square
+[prs-link]: http://makeapullrequest.com
+[github-watch-badge]: https://img.shields.io/github/watchers/zino-app/graphql-flutter.svg?style=flat-square&logo=github&logoColor=ffffff
+[github-watch-link]: https://github.com/zino-app/graphql-flutter/watchers
+[github-star-badge]: https://img.shields.io/github/stars/zino-app/graphql-flutter.svg?style=flat-square&logo=github&logoColor=ffffff
+[github-star-link]: https://github.com/zino-app/graphql-flutter/stargazers
+[discord-badge]: https://img.shields.io/discord/559455668810153989.svg?style=flat-square&logo=discord&logoColor=ffffff
+[discord-link]: https://discord.gg/tXTtBfC
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,6 +1 @@
-include: package:perfectionist/analysis_options.yaml
-
-linter:
-  rules:
-    avoid_as: false
-    flutter_style_todos: false
+include: package:pedantic/analysis_options.yaml