[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 377a3f555c -s ours

am skip reason: Merged-In Ic9a8a0ef59723baa08b44ad9db0dc5c695ba9578 with SHA-1 35aef1ba39 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/okhttp/+/15546966

Change-Id: I726f92bc13ec0f637e9e2f843d8544d72d11f64a
tree: 639b7105d88707c56681b42e879c6ba129998b11
  1. .buildscript/
  2. android/
  3. benchmarks/
  4. mockwebserver/
  5. okcurl/
  6. okhttp/
  7. okhttp-android-support/
  8. okhttp-android-util-log/
  9. okhttp-apache/
  10. okhttp-hpacktests/
  11. okhttp-logging-interceptor/
  12. okhttp-testing-support/
  13. okhttp-tests/
  14. okhttp-urlconnection/
  15. okhttp-ws/
  16. okhttp-ws-tests/
  17. okio/
  18. repackaged/
  19. samples/
  20. srcgen/
  21. website/
  22. .gitignore
  23. .travis.yml
  24. Android.bp
  25. BUG-BOUNTY.md
  26. CHANGELOG.md
  27. checkstyle.xml
  28. CONTRIBUTING.md
  29. deploy_website.sh
  30. LICENSE.txt
  31. METADATA
  32. MODULE_LICENSE_APACHE2
  33. OWNERS
  34. pom.xml
  35. PREUPLOAD.cfg
  36. README.android
  37. README.md
README.md

OkHttp

An HTTP & SPDY client for Android and Java applications. For more information see the website and the wiki.

Download

Download the latest JAR or grab via Maven:

<dependency>
  <groupId>com.squareup.okhttp</groupId>
  <artifactId>okhttp</artifactId>
  <version>2.6.0</version>
</dependency>

or Gradle:

compile 'com.squareup.okhttp:okhttp:2.6.0'

Snapshots of the development version are available in Sonatype's snapshots repository.

MockWebServer

A library for testing HTTP, HTTPS, HTTP/2.0, and SPDY clients.

MockWebServer coupling with OkHttp is essential for proper testing of SPDY and HTTP/2.0 so that code can be shared.

Download

Download the latest JAR or grab via Maven:

<dependency>
  <groupId>com.squareup.okhttp</groupId>
  <artifactId>mockwebserver</artifactId>
  <version>2.6.0</version>
  <scope>test</scope>
</dependency>

or Gradle:

testCompile 'com.squareup.okhttp:mockwebserver:2.6.0'

License

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

   http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.