Merge pull request #74 from isuPatches/develop

2.0.0-BETA1
isuPatches · Jul 20, 2017 · 3619077 · 3619077
2 parents 0a3cc80 + 063f988
commit 3619077
Show file tree

Hide file tree

Showing 163 changed files with 18,061 additions and 5,887 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ android:
     - tools
     - build-tools-25.0.3
     - android-22
-    - android-25
+    - android-26
     - sys-img-armeabi-v7a-android-22
     - extra-android-m2repository
     - extra-android-support
@@ -21,4 +21,4 @@ before_script:
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
 
-script: travis_wait 30 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace
+script: travis_wait 60 ./gradlew clean connectedAndroidTest -PdisablePreDex --stacktrace