grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move to a non-snapshot version of OkHttp

This commit is contained in:
Manik Surtani 2015-01-16 15:13:58 -08:00 committed by Eric Anderson
parent 02c953e5e0
commit 0ca6584d19
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -32,7 +32,7 @@ subprojects {
// TODO: Unreleased dependencies. // TODO: Unreleased dependencies.
// These must already be installed in the local maven repository. // These must already be installed in the local maven repository.
netty: 'io.netty:netty-codec-http2:5.0.0.Alpha2-SNAPSHOT', netty: 'io.netty:netty-codec-http2:5.0.0.Alpha2-SNAPSHOT',
okhttp: 'com.squareup.okhttp:okhttp:2.2.0-SNAPSHOT', okhttp: 'com.squareup.okhttp:okhttp:2.2.0',
// Test dependencies. // Test dependencies.
junit: 'junit:junit:4.11', junit: 'junit:junit:4.11',

4
okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
View File

@ -45,7 +45,7 @@ import com.squareup.okhttp.internal.spdy.ErrorCode;
import com.squareup.okhttp.internal.spdy.FrameReader; import com.squareup.okhttp.internal.spdy.FrameReader;
import com.squareup.okhttp.internal.spdy.Header; import com.squareup.okhttp.internal.spdy.Header;
import com.squareup.okhttp.internal.spdy.HeadersMode; import com.squareup.okhttp.internal.spdy.HeadersMode;
import com.squareup.okhttp.internal.spdy.Http20Draft15; import com.squareup.okhttp.internal.spdy.Http20Draft16;
import com.squareup.okhttp.internal.spdy.Settings; import com.squareup.okhttp.internal.spdy.Settings;
import com.squareup.okhttp.internal.spdy.Variant; import com.squareup.okhttp.internal.spdy.Variant;
@ -195,7 +195,7 @@ public class OkHttpClientTransport extends AbstractClientTransport {
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
Variant variant = new Http20Draft15(); Variant variant = new Http20Draft16();
frameReader = variant.newReader(source, true); frameReader = variant.newReader(source, true);
frameWriter = new AsyncFrameWriter(variant.newWriter(sink, true), this, executor); frameWriter = new AsyncFrameWriter(variant.newWriter(sink, true), this, executor);
outboundFlow = new OutboundFlowController(this, frameWriter); outboundFlow = new OutboundFlowController(this, frameWriter);

2
pom.xml
View File

@ -137,7 +137,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<okhttp.version>2.2.0-SNAPSHOT</okhttp.version> <okhttp.version>2.2.0</okhttp.version>
<netty.version>5.0.0.Alpha2-SNAPSHOT</netty.version> <netty.version>5.0.0.Alpha2-SNAPSHOT</netty.version>
<jetty.alpn.version>8.0.0.v20140317</jetty.alpn.version> <jetty.alpn.version>8.0.0.v20140317</jetty.alpn.version>
<jetty.alpn.path> <jetty.alpn.path>