Merge branch 'master' into update/bloc-library

Author: felangel

.travis.yml

@@ -1,3 +1,8 @@
+env:
+  global:
+    - FLUTTER_CHANNEL=stable
+    - FLUTTER_VERSION=1.2.1-${FLUTTER_CHANNEL}
+
 jobs:
   include:
 
@@ -8,12 +13,7 @@ jobs:
       before_script:
         - sudo apt-get install -y --no-install-recommends lib32stdc++6 libstdc++6 > /dev/null
 
-        #        - git clone https://github.com/flutter/flutter.git -b stable
-        #        - flutter precache
-
         # install pre-compiled flutter
-        - FLUTTER_CHANNEL=stable
-        - FLUTTER_VERSION=1.2.1-${FLUTTER_CHANNEL}
         - wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_v${FLUTTER_VERSION}.tar.xz && tar xf flutter.tar.xz > /dev/null && rm flutter.tar.xz
         - export PATH="$PATH":"$HOME/.pub-cache/bin"
         - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
@@ -34,11 +34,14 @@ jobs:
       env: bloc_flutter_android
       # Run integration tests on android
       before_install: &before_install_linux
+        - ANDROID_SDK_TOOLS=4333796 # android-28
+        - ANDROID_PLATFORM_SDK=28 # required by flutter
+        - ANDROID_BUILD_TOOLS=28.0.3 # required by flutter
         - sudo apt-get install -y --no-install-recommends lib32stdc++6 libstdc++6 > /dev/null
         # Install the Android SDK Dependency.
         - export ANDROID_HOME=/opt/android-sdk-linux
         - cd /opt
-        - wget -q https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -O android-sdk-tools.zip
+        - wget -q https://dl.google.com/android/repository/sdk-tools-linux-$ANDROID_SDK_TOOLS.zip -O android-sdk-tools.zip
         - unzip -q android-sdk-tools.zip -d ${ANDROID_HOME}
         - rm android-sdk-tools.zip
         - cd -
@@ -48,20 +51,20 @@ jobs:
         - touch ~/.android/repositories.cfg
         # Accept licenses before installing components, no need to echo y for each component
         - yes | sdkmanager --licenses
-        # Platform tools
-        - sdkmanager "emulator" "tools" "platform-tools" > /dev/null
+        # Platform and build tools (including flutter requirements)
+        - sdkmanager "emulator" "tools" "platform-tools" "platforms;android-${ANDROID_PLATFORM_SDK}" "build-tools;${ANDROID_BUILD_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
+        - emulator_version=5264690 #29.0.9.0 (build_id 5537588) ==> 28.0.23.0 (build_id 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)
+        # install older platform and build tools (for emulator)
         - sdkmanager "build-tools;25.0.2" "platforms;android-25" > /dev/null
         # Create and start emulator.
         - EMULATOR_API_LEVEL=22
@@ -71,20 +74,14 @@ jobs:
         - echo no | avdmanager create avd --force -n test -k "system-images;android-$EMULATOR_API_LEVEL;$ANDROID_ABI"
         - $ANDROID_HOME/emulator/emulator -avd test -no-audio -no-window -gpu swiftshader &
 
-        #        - git clone https://github.com/flutter/flutter.git -b stable
-        #        - flutter precache
-
         # install pre-compiled flutter
-        - FLUTTER_CHANNEL=stable
-        - FLUTTER_VERSION=1.2.1-${FLUTTER_CHANNEL}
         - wget --quiet --output-document=flutter.tar.xz https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/linux/flutter_linux_v${FLUTTER_VERSION}.tar.xz && tar xf flutter.tar.xz > /dev/null && rm flutter.tar.xz
         - export PATH="$PATH":"$HOME/.pub-cache/bin"
         - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
         - flutter doctor -v
 
         # Wait for emulator to finish startup.
         - ./scripts/android-wait-for-emulator.sh
-        - adb shell input keyevent 82
         - flutter devices
       script: travis_retry ./scripts/ci.sh ./bloc_flutter
       cache:
@@ -109,12 +106,7 @@ jobs:
         - brew install cocoapods || echo 'ignore exit(1)'
         - brew link --overwrite cocoapods
 
-        #        - git clone https://github.com/flutter/flutter.git -b stable
-        #        - flutter precache
-
         # install pre-compiled flutter
-        - FLUTTER_CHANNEL=stable
-        - FLUTTER_VERSION=1.2.1-${FLUTTER_CHANNEL}
         - wget --quiet --output-document=flutter.zip https://storage.googleapis.com/flutter_infra/releases/${FLUTTER_CHANNEL}/macos/flutter_macos_v${FLUTTER_VERSION}.zip && unzip -qq flutter.zip > /dev/null && rm flutter.zip
         - export PATH="$PATH":"$HOME/.pub-cache/bin"
         - export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH

scripts/android-wait-for-emulator.sh

@@ -13,7 +13,7 @@ until [[ "$bootanim" =~ "stopped" ]]; do
   if [[ "$bootanim" =~ "device not found" || "$bootanim" =~ "device offline"
     || "$bootanim" =~ "running" ]]; then
     let "failcounter += 1"
-    echo "Waiting for emulator to start"
+    echo "Waiting for emulator to start: $failcounter of $timeout_in_sec : status: $bootanim"
     if [[ $failcounter -gt timeout_in_sec ]]; then
       echo "Timeout ($timeout_in_sec seconds) reached; failed to start emulator"
       exit 1