felangel · felangel · Dec 25, 2019 · Nov 27, 2019 · Nov 27, 2019 · Nov 27, 2019
@@ -96,6 +96,7 @@ unlinked_spec.ds
 # Coverage
 coverage/
 .test_coverage.dart
+*.lcov
 
 # Exceptions to above rules.
 !**/ios/**/default.mode1v3

@@ -1,10 +1,15 @@
-language: dart
+language: bash
 os:
-  - linux
+  - osx
+env:
+  - PACKAGE=bloc
+  - PACKAGE=bloc_test
+  - PACKAGE=angular_bloc
+  - PACKAGE=flutter_bloc
 sudo: required
 dist: trusty
 dart:
-  - 2.1.0
+  - 2.6.0
 addons:
   chrome: stable
   apt:
@@ -14,27 +19,18 @@ addons:
       - libstdc++6
       - fonts-droid
 before_script:
-  - git clone https://github.com/flutter/flutter.git -b stable --depth 1
-  - ./flutter/bin/flutter doctor
+  - cd ..
+  - git clone https://github.com/flutter/flutter.git -b beta
+  - export PATH=$PATH:$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin
+  - cd -
+  - flutter doctor
 script:
-  - cd packages/bloc
-  - pub get
-  - pub run test_coverage
-  - cp coverage/lcov.info ../../bloc.lcov
-  - cd ../bloc_test
-  - pub get
-  - pub run test_coverage
-  - cp coverage/lcov.info ../../bloc_test.lcov
-  - cd ../angular_bloc
-  - pub get
-  - pub upgrade
-  - pub global activate webdev
-  - webdev build
-  - pub run build_runner test --fail-on-severe
-  - cd ../flutter_bloc
-  - ../../flutter/bin/flutter test --coverage --coverage-path=../../flutter_bloc.lcov
+  - set -e
+  - ./scripts/ci.sh packages/$PACKAGE
 after_success:
   - bash <(curl -s https://codecov.io/bash)
+matrix:
+  fast_finish: true
 cache:
   directories:
     - $HOME/.pub-cache
@@ -20,19 +20,19 @@ We can then go ahead and replace the contents of `pubspec.yaml` with:
 
 ```yaml
 name: angular_counter
-description: A web app that uses AngularDart Components
+description: A web app that uses angular_bloc
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
-  angular: ^5.0.0
+  angular: ^5.3.0
   angular_components: ^0.13.0
   angular_bloc: ^2.0.0
 
 dev_dependencies:
   angular_test: ^2.0.0
-  build_runner: ">=1.5.0 <2.0.0"
+  build_runner: ">=1.6.2 <2.0.0"
   build_test: ^0.10.2
   build_web_compilers: ">=1.2.0 <3.0.0"
   test: ^1.0.0

@@ -34,12 +34,12 @@ description: Shared Code between AngularDart and Flutter
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
-  meta: ^1.1.7
-  bloc: ^2.0.0
-  equatable: ^0.6.0
+  meta: ^1.1.6
+  bloc: ^3.0.0
+  equatable: ^1.0.0
   http: ^0.12.0
 ```
 
@@ -353,7 +353,7 @@ class GithubSearchBloc extends Bloc<GithubSearchEvent, GithubSearchState> {
     Stream<GithubSearchState> Function(GithubSearchEvent event) next,
   ) {
     return super.transformEvents(
-      (events as Observable<GithubSearchEvent>).debounceTime(
+      events.debounceTime(
         Duration(milliseconds: 500),
       ),
       next,
@@ -425,20 +425,16 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_bloc: ^2.0.0
+  flutter_bloc: ^3.0.0
   url_launcher: ^4.0.3
   common_github_search:
     path: ../common_github_search
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
 flutter:
   uses-material-design: true
 ```
@@ -837,20 +833,20 @@ name: angular_github_search
 description: A web app that uses AngularDart Components
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
-  angular: ^5.0.0
-  angular_components: ^0.9.0
-  angular_bloc: ^2.0.0
+  angular: ^5.3.0
+  angular_components: ^0.13.0
+  angular_bloc: ^3.0.0
   common_github_search:
     path: ../common_github_search
 
 dev_dependencies:
   angular_test: ^2.0.0
-  build_runner: ^0.10.0
+  build_runner: ">=1.6.2 <2.0.0"
   build_test: ^0.10.2
-  build_web_compilers: ^0.4.0
+  build_web_compilers: ">=1.2.0 <3.0.0"
   test: ^1.0.0
 ```
 

@@ -23,23 +23,19 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   firebase_core: ^0.4.0+8
   google_sign_in: ^4.0.0
   firebase_auth: ^0.15.0+1
-  flutter_bloc: ^2.0.0
+  flutter_bloc: ^3.0.0
   equatable: ^1.0.0
   meta: ^1.1.6
   font_awesome_flutter: ^8.4.0
 
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
 flutter:
   uses-material-design: true
   assets:
@@ -1003,14 +999,16 @@ class LoginBloc extends Bloc<LoginEvent, LoginState> {
     Stream<LoginEvent> events,
     Stream<LoginState> Function(LoginEvent event) next,
   ) {
-    final observableStream = events as Observable<LoginEvent>;
-    final nonDebounceStream = observableStream.where((event) {
+    final nonDebounceStream = events.where((event) {
       return (event is! EmailChanged && event is! PasswordChanged);
     });
-    final debounceStream = observableStream.where((event) {
+    final debounceStream = events.where((event) {
       return (event is EmailChanged || event is PasswordChanged);
     }).debounceTime(Duration(milliseconds: 300));
-    return super.transformEvents(nonDebounceStream.mergeWith([debounceStream]), next);
+    return super.transformEvents(
+      nonDebounceStream.mergeWith([debounceStream]),
+      next,
+    );
   }
 
   @override
@@ -1644,14 +1642,16 @@ class RegisterBloc extends Bloc<RegisterEvent, RegisterState> {
     Stream<RegisterEvent> events,
     Stream<RegisterState> Function(RegisterEvent event) next,
   ) {
-    final observableStream = events as Observable<RegisterEvent>;
-    final nonDebounceStream = observableStream.where((event) {
+    final nonDebounceStream = events.where((event) {
       return (event is! EmailChanged && event is! PasswordChanged);
     });
-    final debounceStream = observableStream.where((event) {
+    final debounceStream = events.where((event) {
       return (event is EmailChanged || event is PasswordChanged);
     }).debounceTime(Duration(milliseconds: 300));
-    return super.transformEvents(nonDebounceStream.mergeWith([debounceStream]), next);
+    return super.transformEvents(
+      nonDebounceStream.mergeWith([debounceStream]),
+      next,
+    );
   }
 
   @override

@@ -43,15 +43,15 @@ name: todos_repository
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  cloud_firestore: ^0.12.7
-  rxdart: ^0.22.0
-  equatable: ^0.6.0
-  firebase_core: ^0.4.0+7
+  cloud_firestore: ^0.12.10+2
+  rxdart: ^0.23.0
+  equatable: ^1.0.0
+  firebase_core: ^0.4.0+8
 ```
 
 ?> **Note:** We can immediately see our `todos_repository` has a dependency on `firebase_core` and `cloud_firestore`.
@@ -310,12 +310,12 @@ name: user_repository
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  firebase_auth: ^0.11.1+12
+  firebase_auth: ^0.15.0+1
 ```
 
 ?> **Note:** We can immediately see our `user_repository` has a dependency on `firebase_auth`.
@@ -392,17 +392,17 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_bloc: ^2.0.0
+  flutter_bloc: ^3.0.0
   todos_repository:
     path: todos_repository
   user_repository:
     path: user_repository
-  equatable: ^0.3.0
+  equatable: ^1.0.0
 
 flutter:
   uses-material-design: true

@@ -23,18 +23,14 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_bloc: ^2.0.0
+  flutter_bloc: ^3.0.0
   http: ^0.12.0
-  equatable: ^0.6.0
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
+  equatable: ^1.0.0
 
 flutter:
   uses-material-design: true
@@ -307,7 +303,7 @@ Stream<PostState> transformEvents(
   Stream<PostState> Function(PostEvent event) next,
 ) {
   return super.transformEvents(
-    (events as Observable<PostEvent>).debounceTime(
+    events.debounceTime(
       Duration(milliseconds: 500),
     ),
     next,
@@ -339,7 +335,7 @@ class PostBloc extends Bloc<PostEvent, PostState> {
     Stream<PostState> Function(PostEvent event) next,
   ) {
     return super.transformEvents(
-      (events as Observable<PostEvent>).debounceTime(
+      events.debounceTime(
         Duration(milliseconds: 500),
       ),
       next,

@@ -22,14 +22,14 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.0.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_bloc: ^2.0.0
+  flutter_bloc: ^3.0.0
   meta: ^1.1.6
-  equatable: ^0.6.0
+  equatable: ^1.0.0
 
 dev_dependencies:
   flutter_test:

@@ -23,13 +23,13 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  flutter_bloc: ^2.0.0
-  equatable: ^0.6.0
+  flutter_bloc: ^3.0.0
+  equatable: ^1.0.0
   wave: ^0.0.8
 
 flutter: