Pinned android emulator to 28.0.23 (brianegan#129)

* Installed pinned version of emulator due to https://issuetracker.google.com/issues/130080449

* Pinned emulator version on cirrus as done on travis (just in case)

Author: mmcc007

.cirrus.yml

@@ -36,6 +36,15 @@ task:
   container:
     image: cirrusci/flutter:latest
   allow_failures: $app_arch == "mvu" || $app_arch == "redurx"
+  pin_emulator_script:
+    # Download a pinned version of the emulator since upgrades can cause issues
+    - ${ANDROID_HOME}/emulator/emulator -version
+    - emulator_version=5264690
+    - curl -fo emulator.zip "https://dl.google.com/android/repository/emulator-linux-$emulator_version.zip"
+    - rm -rf "${ANDROID_HOME}/emulator"
+    - unzip -q emulator.zip -d "${ANDROID_HOME}"
+    - rm -f emulator.zip
+    - ${ANDROID_HOME}/emulator/emulator -version
   install_images_script: sdkmanager "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
   create_device_script:
     echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"

.travis.yml

@@ -1,7 +1,7 @@
 jobs:
   include:
 
-    - stage: Unit Testing
+    - stage: Testing
       language: generic
       os: linux
       env: All unit and widget tests
@@ -25,8 +25,8 @@ jobs:
         directories:
           - $HOME/.pub-cache
 
-    - &integration-test-staging
-      stage: Integration Testing
+    - &integration-test
+      stage: Testing
       sudo: true
       dist: trusty
       language: generic
@@ -51,6 +51,16 @@ jobs:
         # Platform tools
         - sdkmanager "emulator" "tools" "platform-tools" > /dev/null
         - sdkmanager --list | head -15
+
+        # Download a pinned version of the emulator since upgrades can cause issues
+        - ${ANDROID_HOME}/emulator/emulator -version
+        - emulator_version=5264690
+        - curl -fo emulator.zip "https://dl.google.com/android/repository/emulator-linux-$emulator_version.zip"
+        - rm -rf "${ANDROID_HOME}/emulator"
+        - unzip -q emulator.zip -d "${ANDROID_HOME}"
+        - rm -f emulator.zip
+        - ${ANDROID_HOME}/emulator/emulator -version
+
         # install older packages (for emulator)
         - sdkmanager "build-tools;25.0.2" "platforms;android-25" > /dev/null
         # Create and start emulator.
@@ -82,7 +92,7 @@ jobs:
           - $HOME/.pub-cache
           - $HOME/.gradle
 
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       # use oldest flutter supported version of xcode
       osx_image: xcode8.0
@@ -115,131 +125,131 @@ jobs:
         directories:
           - $HOME/.pub-cache
 
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: built_redux_android
       script: travis_retry ./scripts/ci.sh ./built_redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: built_redux_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./built_redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: bloc_library_android
       script: travis_retry ./scripts/ci.sh ./bloc_library
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: bloc_library_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./bloc_library
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: firestore_redux_android
       script: travis_retry ./scripts/ci.sh ./firestore_redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: firestore_redux_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./firestore_redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: frideos_library_android
       script: travis_retry ./scripts/ci.sh ./frideos_library
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: frideos_library_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./frideos_library      
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: inherited_widget_android
       script: travis_retry ./scripts/ci.sh ./inherited_widget
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: inherited_widget_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./inherited_widget
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: mvc_android
       script: travis_retry ./scripts/ci.sh ./mvc
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: mvc_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./mvc
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: mvi_flutter_android
       script: travis_retry ./scripts/ci.sh ./mvi_flutter
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: mvi_flutter_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./mvi_flutter
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: mvu_android
       script: travis_retry ./scripts/ci.sh ./mvu
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: mvu_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./mvu
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: redurx_android
       script: travis_retry ./scripts/ci.sh ./redurx
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: redurx_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./redurx
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: redux_android
       script: travis_retry ./scripts/ci.sh ./redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: redux_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./redux
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: scoped_model_android
       script: travis_retry ./scripts/ci.sh ./scoped_model
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: scoped_model_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./scoped_model
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: simple_bloc_flutter_android
       script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: simple_bloc_flutter_ios
       before_install: *before_install_osx
       script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: linux
       env: vanilla_android
       script: travis_retry ./scripts/ci.sh ./vanilla
-    - <<: *integration-test-staging
+    - <<: *integration-test
       os: osx
       osx_image: xcode8.0
       env: vanilla_ios

bloc_library/lib/blocs/tab/tab_bloc.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by the MIT license that can be found
 // in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:bloc_library/blocs/tab/tab.dart';
 import 'package:bloc_library/models/models.dart';

bloc_library/lib/blocs/todos/todos_bloc.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by the MIT license that can be found
 // in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:bloc/bloc.dart';
 import 'package:meta/meta.dart';
 import 'package:bloc_library/blocs/todos/todos.dart';

bloc_library/test/filtered_todos_bloc_test.dart

@@ -4,7 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:todos_app_core/todos_app_core.dart';
-import 'package:scoped_model/scoped_model.dart';
 
 import 'package:mvc/src/todo_list_model.dart';
 import 'package:mvc/src/Controller.dart';

mvc/lib/src/widgets/filter_button.dart

@@ -7,10 +7,6 @@ import 'package:flutter/material.dart';
 
 import 'package:todos_app_core/todos_app_core.dart';
 
-import 'package:scoped_model/scoped_model.dart';
-import 'package:mvc/src/models.dart';
-import 'package:mvc/src/todo_list_model.dart';
-
 import 'package:mvc/src/Controller.dart';
 
 class StatsCounter extends StatelessWidget {

mvc/lib/src/widgets/stats_counter.dart

@@ -5,7 +5,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:todos_app_core/todos_app_core.dart';
-import 'package:scoped_model_sample/models.dart';
 
 class TodoItem extends StatelessWidget {
   final DismissDirectionCallback onDismissed;

mvc/lib/src/widgets/todo_item.dart

@@ -4,10 +4,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:todos_app_core/todos_app_core.dart';
-import 'package:scoped_model/scoped_model.dart';
-import 'package:mvc/src/models.dart';
 import 'package:mvc/src/screens/detail_screen.dart';
-import 'package:mvc/src/todo_list_model.dart';
 import 'package:mvc/src/widgets/todo_item.dart';
 
 import 'package:mvc/src/Controller.dart';

mvc/lib/src/widgets/todo_list.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by the MIT license that can be found
 // in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:scoped_model_sample/models.dart';
 import 'package:scoped_model_sample/todo_list_model.dart';
 import 'package:test/test.dart';