diff --git a/.travis.yml b/.travis.yml
index 173b3f416..1361075ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,20 @@
 language: android
 jdk: openjdk7
-env:
-  global:
-    - ADB_INSTALL_TIMEOUT=8
+
 android:
   components:
     - build-tools-23.0.1
     - android-23
     - extra
     - addon
-    - sys-img-armeabi-v7a-android-19
+    - sys-img-armeabi-v7a-android-21
+
 before_script:
-  - echo no | android create avd --force -n test -t android-19 --abi armeabi-v7a -s "480x800"
+  - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a -s "480x800"
   - emulator -avd test -no-skin -no-audio -no-window &
   - android-wait-for-emulator
   - adb shell input keyevent 82 &
+
 script:
   - ./gradlew connectedAndroidTest
   - cat app/build/reports/androidTests/connected/*html | awk '/<pre>/ { on=1 } /<\/pre>/ { on = 0 } { if(on) print }'
diff --git a/build.gradle b/build.gradle
index f4d8c542e..5e38f58a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.1.0-alpha2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760d..d57051703 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
diff --git a/libs/drag-sort-listview b/libs/drag-sort-listview
index 318d69cf6..54ca667d4 160000
--- a/libs/drag-sort-listview
+++ b/libs/drag-sort-listview
@@ -1 +1 @@
-Subproject commit 318d69cf6b2adc287cf8944bb847dd7139c60376
+Subproject commit 54ca667d4cfb0e38d0c9df816360059ac0675afe