diff --git a/.travis.yml b/.travis.yml index 58111bb5c..c2243e4d1 100755 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ before_install: - export PATH=$GRADLE_HOME/bin:$PATH # just to test gradle version, against our provided one - gradle -v - # newest android SDK 22.6.3 - - wget http://dl.google.com/android/android-sdk_r22.6.3-linux.tgz - - tar -zxf android-sdk_r22.6.3-linux.tgz + # newest android SDK 22.6.2 + - wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz + - tar -zxf android-sdk_r22.6.2-linux.tgz - export ANDROID_HOME=`pwd`/android-sdk-linux - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools # manually set sdk.dir variable, according to local paths diff --git a/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java b/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java index 2e2f68c97..9bfd473a1 100755 --- a/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java +++ b/library/src/main/java/com/loopj/android/http/AsyncHttpClient.java @@ -81,7 +81,6 @@ import java.util.WeakHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.ThreadPoolExecutor; import java.util.zip.GZIPInputStream; @@ -331,10 +330,10 @@ public void setCookieStore(CookieStore cookieStore) { * Overrides the threadpool implementation used when queuing/pooling requests. By default, * Executors.newFixedThreadPool() is used. * - * @param threadPool an instance of {@link ThreadPoolExecutor} to use for queuing/pooling + * @param threadPool an instance of {@link ExecutorService} to use for queuing/pooling * requests. */ - public void setThreadPool(ThreadPoolExecutor threadPool) { + public void setThreadPool(ExecutorService threadPool) { this.threadPool = threadPool; }