diff --git a/Tophe-Ion/build.gradle b/Tophe-Ion/build.gradle index 297884d..d986506 100644 --- a/Tophe-Ion/build.gradle +++ b/Tophe-Ion/build.gradle @@ -36,7 +36,7 @@ android { dependencies { def artifactSupportV4 = 'com.android.support:support-v4:21.0.3' - def artifactIon = 'com.koushikdutta.ion:ion:2.0.7' + def artifactIon = 'com.koushikdutta.ion:ion:2.1.6' def artifactTophe = 'co.tophe:tophe:1.0.1' def androidAsyncProject = ':AndroidAsync:AndroidAsync' diff --git a/Tophe-Ion/src/main/java/co/tophe/ion/HttpEngineIon.java b/Tophe-Ion/src/main/java/co/tophe/ion/HttpEngineIon.java index f7e0b2c..03b325e 100644 --- a/Tophe-Ion/src/main/java/co/tophe/ion/HttpEngineIon.java +++ b/Tophe-Ion/src/main/java/co/tophe/ion/HttpEngineIon.java @@ -1,12 +1,5 @@ package co.tophe.ion; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map.Entry; -import java.util.concurrent.ExecutionException; - -import org.apache.http.protocol.HTTP; - import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -25,11 +18,21 @@ import com.koushikdutta.async.parser.JSONObjectParser; import com.koushikdutta.async.parser.StringParser; import com.koushikdutta.async.stream.ByteBufferListInputStream; -import com.koushikdutta.ion.*; +import com.koushikdutta.ion.Ion; +import com.koushikdutta.ion.ProgressCallback; +import com.koushikdutta.ion.Response; import com.koushikdutta.ion.builder.Builders; import com.koushikdutta.ion.builder.LoadBuilder; import com.koushikdutta.ion.future.ResponseFuture; +import org.apache.http.protocol.HTTP; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Type; +import java.util.Map.Entry; +import java.util.concurrent.ExecutionException; + import co.tophe.AbstractHttpEngine; import co.tophe.HttpConfig; import co.tophe.HttpException; @@ -240,6 +243,11 @@ protected void transform(ByteBufferList result) throws Exception { public void write(DataSink sink, InputStream value, CompletedCallback completed) { throw new AssertionError("not implemented"); } + + @Override + public Type getType() { + return InputStream.class; + } }; private static final AsyncParser STRING_ASYNC_PARSER = new StringParser(); private static final AsyncParser JSON_OBJECT_ASYNC_PARSER = new JSONObjectParser(); @@ -291,6 +299,11 @@ protected void transform(InputStream result) throws Exception { @Override public void write(DataSink sink, P value, CompletedCallback completed) { } + + @Override + public Type getType() { + return InputStream.class; + } }; } } diff --git a/build.gradle b/build.gradle index 674e7ce..a1c3b1c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.2.3' } }